From eb7e5b08a666544717df86bb9013ff26de48d59e Mon Sep 17 00:00:00 2001
From: shiyang <shiyang@lymsh.com>
Date: Sun, 27 Mar 2022 23:22:16 +0800
Subject: [PATCH] update

---
 .../src/main/resources/mainOrm/master/CouponMapper.xml       | 10 ++++++++--
 .../platform/operate/web/service/impl/ReportServiceImpl.java | 12 ++++++++----
 2 files changed, 16 insertions(+), 6 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 7f9571a..d6a63c1 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -357,7 +357,9 @@
     </select>
 
     <select id="findUsedInfo2ids" parameterType="map" resultType="string">
-        select a.user_id as ids
+        Select a.user_id
+        from (
+        select a.user_id , b.coupon_order, b.type, a.used_hospital_id
         from coupon_info a, (
         select a.id, a.coupon_order, b.type, d.hospital_id
         from coupon_template a, coupon_type b, hospital_coupon_template_group d
@@ -377,7 +379,11 @@
         <if test="endDate != null">
             and a.use_date <![CDATA[ < ]]> #{endDate}
         </if>
-
+        group by a.user_id ,b.coupon_order, b.type, a.used_hospital_id
+        )a
+        where
+        a.coupon_order = #{coupon_order}
+        and a.type = #{_type}
     </select>
 
     <select id="findUsedUserIds" parameterType="map" resultType="string">
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index 8b5c0e6..7d95486 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -2710,9 +2710,12 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
 
                             //秦皇岛年龄筛选 <35 岁(大于等于35需要减1次)
                             if(null!=param.get("age")) {
-                                Map<String,Object> map=param;
-                                map.put("hospitalId", Arrays.asList(info.get("used_hospital_id")));
-                                List<String> couponUsedTypeInfoIds = couponMapper.findUsedInfo2ids(map);
+                                Map<String,Object> param2=new HashedMap();
+                                param2.putAll(param);
+                                param2.put("hospitalId", Arrays.asList(info.get("used_hospital_id")));
+                                param2.put("type_", info.get("type"));
+                                param2.put("coupon_order", info.get("coupon_order"));
+                                List<String> couponUsedTypeInfoIds = couponMapper.findUsedInfo2ids(param2);
                                 for (String id : couponUsedTypeInfoIds) {
                                     PersonModel personModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(id)), PersonModel.class);
                                     if (null != personModel) {
@@ -3137,7 +3140,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             //秦皇岛年龄筛选 <35 岁(大于等于35需要移除，这里需要重新组装数据)
             List<Map<String, Object>> couponInfo2=new ArrayList<>();
             if(null!=param.get("age")) {
-                Map<String,Object> param2=param;
+                Map<String,Object> param2=new HashedMap();
+                param2.putAll(param);
                 param2.put("needPage",false);
                 couponInfo2=couponMapper.couponInfo2(param2);
                 Iterator<Map<String, Object>> iterator = couponInfo2.iterator();
-- 
1.8.3.1