Commit 88b6cc1c757e530e9c050ed34571dae7cd107bf6
1 parent
0469326a83
Exists in
master
and in
6 other branches
etl项目多环境配置增加
Showing 1 changed file with 5 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java
View file @
88b6cc1
... | ... | @@ -7,7 +7,6 @@ |
7 | 7 | import com.lyms.platform.operate.web.facade.AutoMatchFacade; |
8 | 8 | import com.lyms.platform.permission.service.CouponService; |
9 | 9 | import org.springframework.beans.factory.annotation.Autowired; |
10 | -import org.springframework.beans.factory.annotation.Value; | |
11 | 10 | import org.springframework.stereotype.Controller; |
12 | 11 | import org.springframework.web.bind.annotation.PathVariable; |
13 | 12 | import org.springframework.web.bind.annotation.RequestMapping; |
... | ... | @@ -31,9 +30,6 @@ |
31 | 30 | @Autowired |
32 | 31 | AutoMatchFacade autoMatchFacade; |
33 | 32 | |
34 | - @Value("${or.code.url}") | |
35 | - private String url; | |
36 | - | |
37 | 33 | /** |
38 | 34 | * 创建用户产检券 |
39 | 35 | * @param userId |
... | ... | @@ -58,7 +54,7 @@ |
58 | 54 | @RequestMapping(method = RequestMethod.GET, value = "/{userId}/{hospitalId}") |
59 | 55 | @ResponseBody |
60 | 56 | public BaseObjectResponse list(@PathVariable String userId, @PathVariable String hospitalId) { |
61 | - return couponService.findList(userId, hospitalId, url); | |
57 | + return couponService.findList(userId, hospitalId); | |
62 | 58 | } |
63 | 59 | |
64 | 60 | |
65 | 61 | |
... | ... | @@ -77,12 +73,12 @@ |
77 | 73 | * @return |
78 | 74 | */ |
79 | 75 | @RequestMapping(method = RequestMethod.PUT, value = "/use/{code}/{hospitalId}") |
80 | -// @TokenRequired | |
76 | + @TokenRequired | |
81 | 77 | @ResponseBody |
82 | 78 | public BaseObjectResponse testUse(@PathVariable String code, @PathVariable String hospitalId, HttpServletRequest request) { |
83 | -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
84 | -// return couponService.use(code, hospitalId, loginState.getId()); | |
85 | - return couponService.use(hospitalId, code, 110); | |
79 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
80 | + return couponService.use(code, hospitalId, loginState.getId()); | |
81 | +// return couponService.use(hospitalId, code, 110); | |
86 | 82 | } |
87 | 83 | |
88 | 84 |