diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java index 5c2d1fa..27963b9 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java @@ -24,7 +24,6 @@ import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; @@ -63,6 +62,7 @@ public class CouponServiceImpl implements CouponService { @Autowired private WeixinQrcodeConfigService weixinQrcodeConfigService; + @Autowired private CouponMapper couponMapper; @Autowired 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 690e045..63a4bc8 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 @@ -40,7 +40,7 @@ public class CouponController extends BaseController { private String url; @Value("${or.code.create.type}") - private Integer type; + private String type; @Autowired private MongoTemplate mongoTemplate; @@ -74,7 +74,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, type); + return couponService.findList(userId, hospitalId, url, Integer.parseInt(type)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ScanController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ScanController.java index 9f1dc33..823890b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ScanController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ScanController.java @@ -20,9 +20,6 @@ public class ScanController extends BaseController { @Autowired private CouponService couponService; - @Value("${or.code.create.type}") - private Integer type; - /** * @auther HuJiaqi * @createTime 2017年01月10日 16时23分