jiangjiazhi / regional-platform | GitLab

Commit bfae75b518d513c824da9f8ec1a80aa9db6d74e9

Authored by litao over 8 years ago

1 parent f73a8158a7

Exists in master and in 6 other branches

二维码获取类型抽取

Showing 3 changed files with 3 additions and 6 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ScanController.java

...	...	@@ -24,7 +24,6 @@
24	24	import org.slf4j.Logger;
25	25	import org.slf4j.LoggerFactory;
26	26	import org.springframework.beans.factory.annotation.Autowired;
27		-import org.springframework.beans.factory.annotation.Value;
28	27	import org.springframework.data.domain.Sort;
29	28	import org.springframework.data.mongodb.core.MongoTemplate;
30	29	import org.springframework.data.mongodb.core.query.Criteria;
...	...	@@ -63,6 +62,7 @@
63	62	@Autowired
64	63	private WeixinQrcodeConfigService weixinQrcodeConfigService;
65	64
	65	+ @Autowired
66	66	private CouponMapper couponMapper;
67	67
68	68	@Autowired

...	...	@@ -40,7 +40,7 @@
40	40	private String url;
41	41
42	42	@Value("${or.code.create.type}")
43		- private Integer type;
	43	+ private String type;
44	44
45	45	@Autowired
46	46	private MongoTemplate mongoTemplate;
...	...	@@ -74,7 +74,7 @@
74	74	@RequestMapping(method = RequestMethod.GET, value = "/{userId}/{hospitalId}")
75	75	@ResponseBody
76	76	public BaseObjectResponse list(@PathVariable String userId, @PathVariable String hospitalId) {
77		- return couponService.findList(userId, hospitalId, url, type);
	77	+ return couponService.findList(userId, hospitalId, url, Integer.parseInt(type));
78	78	}
79	79
80	80

...	...	@@ -20,9 +20,6 @@
20	20	@Autowired
21	21	private CouponService couponService;
22	22
23		- @Value("${or.code.create.type}")
24		- private Integer type;
25		-
26	23	/**
27	24	* @auther HuJiaqi
28	25	* @createTime 2017年01月10日 16时23分