From 388cde304a4c0e1de16a8162bc4d22c899def9d7 Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Mon, 15 May 2017 11:30:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81url=E6=8F=90?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/permission/service/CouponService.java    | 2 +-
 .../lyms/platform/permission/service/impl/CouponServiceImpl.java    | 6 +-----
 .../com/lyms/platform/operate/web/controller/CouponController.java  | 6 +++++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java
index 016476e..2b0326a 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java
@@ -15,7 +15,7 @@ public interface CouponService{
 
     BaseObjectResponse validate(String code, Integer type, String hospitalId);
 
-    BaseObjectResponse findList(String userId, String hospitalId);
+    BaseObjectResponse findList(String userId, String hospitalId, String url);
 
     BaseObjectResponse use(String hospitalId, String code, Integer userId);
 
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 48cc019..eeb8c40 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
@@ -18,7 +18,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;
@@ -37,9 +36,6 @@ public class CouponServiceImpl implements CouponService {
 
     private Logger logger = LoggerFactory.getLogger(CouponServiceImpl.class);
 
-    @Value("${or.code.url}")
-    private String url;
-
     /** 1 = 孕妇 */
     private static final String PREGNANT_WOMAN = "1";
 
@@ -395,7 +391,7 @@ public class CouponServiceImpl implements CouponService {
     }
 
     @Override
-    public BaseObjectResponse findList(String userId, String hospitalId) {
+    public BaseObjectResponse findList(String userId, String hospitalId, String url) {
         Map<String, Object> param = new HashMap<>();
         param.put("userId", userId);
         param.put("hospitalId", hospitalId);
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 9f804bc..69e14fa 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,6 +7,7 @@ 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;
@@ -30,6 +31,9 @@ public class CouponController extends BaseController {
     @Autowired
     AutoMatchFacade autoMatchFacade;
 
+    @Value("${or.code.url}")
+    private String url;
+
     /**
      * 创建用户产检券
      * @param userId
@@ -54,7 +58,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);
+        return couponService.findList(userId, hospitalId, url);
     }
 
 
-- 
1.8.3.1