From dbc458f2fd22de799ea74c526c48047f93f1327d Mon Sep 17 00:00:00 2001
From: shiyang <wtt@qq.com>
Date: Sat, 9 Oct 2021 14:05:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96-=E5=AD=95=E6=9C=9F-=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=AA=E5=AD=95=E5=A6=87=E6=88=B7=E7=B1=8D=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8A=E9=9D=A2=E6=90=9C=E7=B4=A2=E9=A1=B9=E4=B9=9F?=
 =?UTF-8?q?=E8=A6=81=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mainOrm/master/CouponMapper.xml    | 15 ++++++++++++++-
 .../operate/web/controller/OrgCouponController.java       |  9 ++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
index 0cca93e..6188010 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -775,7 +775,20 @@
                 #{key}
             </foreach>
         </if>
-
+<!-- 隆化居住地筛选参数 -->
+        <if test="provinceId != null">
+            and d.province_id = #{provinceId}
+        </if>
+        <if test="cityId != null">
+            and d.city_id = #{cityId}
+        </if>
+        <if test="areaId != null">
+            and d.area_id = #{areaId}
+        </if>
+        <if test="streetId != null">
+            and d.street_id = #{streetId}
+        </if>
+<!-- ################################## -->
         <if test="coupon_order != null">
             and b.coupon_order = #{coupon_order}
         </if>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java
index 40c0833..a962796 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java
@@ -33,11 +33,18 @@ public class OrgCouponController extends BaseController {
     @RequestMapping(value = "/coupon/info", method = RequestMethod.GET)
     public BaseObjectResponse orgCouponInfo(HttpServletRequest request, Date startDate, Date endDate, Integer type,
                                             String couponType, String doctor,
-                                            Integer page, Integer limit, String key) {
+                                            Integer page, Integer limit, String key,
+                                            Integer provinceId, Integer cityId, Integer areaId, Integer streetId) {
         String hospitalId = autoMatchFacade.getHospitalId(getUserId(request));
         Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate,
                 "endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "type", type,
                 "couponType", couponType, "currentPage", page, "pageSize", limit, "doctor", doctor, "key", key);
+        //隆化居住地筛选参数
+        param.put("provinceId", provinceId);
+        param.put("cityId", cityId);
+        param.put("areaId", areaId);
+        param.put("streetId", streetId);
+
         return orgCouponService.orgCouponInfo(param);
     }
 
-- 
1.8.3.1