From 88b6cc1c757e530e9c050ed34571dae7cd107bf6 Mon Sep 17 00:00:00 2001 From: litao Date: Fri, 12 May 2017 15:23:49 +0800 Subject: [PATCH] =?UTF-8?q?etl=E9=A1=B9=E7=9B=AE=E5=A4=9A=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/CouponController.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java index df0e3f4..1ba7324 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java @@ -7,7 +7,6 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.permission.service.CouponService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -31,9 +30,6 @@ public class CouponController extends BaseController { @Autowired AutoMatchFacade autoMatchFacade; - @Value("${or.code.url}") - private String url; - /** * 创建用户产检券 * @param userId @@ -58,7 +54,7 @@ public class CouponController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/{userId}/{hospitalId}") @ResponseBody public BaseObjectResponse list(@PathVariable String userId, @PathVariable String hospitalId) { - return couponService.findList(userId, hospitalId, url); + return couponService.findList(userId, hospitalId); } @@ -77,12 +73,12 @@ public class CouponController extends BaseController { * @return */ @RequestMapping(method = RequestMethod.PUT, value = "/use/{code}/{hospitalId}") -// @TokenRequired + @TokenRequired @ResponseBody public BaseObjectResponse testUse(@PathVariable String code, @PathVariable String hospitalId, HttpServletRequest request) { -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); -// return couponService.use(code, hospitalId, loginState.getId()); - return couponService.use(hospitalId, code, 110); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return couponService.use(code, hospitalId, loginState.getId()); +// return couponService.use(hospitalId, code, 110); } -- 1.8.3.1