From e471320bc696b80c1e3d5f8389486a7fe917af42 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Fri, 17 Nov 2017 15:15:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mainOrm/master/CouponMapper.xml  | 17 +++++++++++------
 .../operate/web/service/impl/ReportServiceImpl.java     |  4 +++-
 2 files changed, 14 insertions(+), 7 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 cc24e71..c6e0d87 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -685,19 +685,24 @@
     <select id="findMulitPatienInfo" parameterType="map" resultType="map">
         select count(1) as count, a.user_id as user_id from (
             select a.ymd, a.user_id from (
-                select DATE_FORMAT(create_date, '%Y-%m-%d') as ymd, user_id
-                from coupon_info
-                where user_id in
+                select DATE_FORMAT(a.create_date, '%Y-%m-%d') as ymd, a.user_id
+                from coupon_info a, coupon_template b, coupon_type c
+                where a.user_id in
                 <foreach collection="userIds" open="(" close=")" separator="," item="uid">
                     #{uid}
                 </foreach>
                 <if test="startDate != null">
-                    and create_date >= #{startDate}
+                    and a.create_date >= #{startDate}
                 </if>
                 <if test="endDate != null">
-                    and create_date <![CDATA[ < ]]> #{endDate}
+                    and a.create_date <![CDATA[ < ]]> #{endDate}
                 </if>
-                order by create_date desc
+                and a.coupon_template_id = b.id and b.type_id = c.id
+                and c.type in
+                <foreach collection="couponType" open="(" close=")" separator="," item="type">
+                    #{type}
+                </foreach>
+                order by a.create_date desc
             ) a group by a.ymd, a.user_id
         ) a group by a.user_id
     </select>
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 e3d96eb..ac6ddcd 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
@@ -1285,7 +1285,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             List<String> sendUserIds2 = new ArrayList<>();
             if(CollectionUtils.isNotEmpty(sendUserIds)) {
 //                List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(sendUserIds);   /** 查询需要添加人数的总数,  例如A发了两次优惠券 那么这里返回需要加的值为1 */
-                List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(CollectionUtils.createMap("userIds", sendUserIds, "startDate", param.get("startDate"), "endDate", param.get("endDate")));   /** 查询需要添加人数的总数,  例如A发了两次优惠券 那么这里返回需要加的值为1 */
+                param.put("userIds", sendUserIds);
+                List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(param);   /** 查询需要添加人数的总数,  例如A发了两次优惠券 那么这里返回需要加的值为1 */
+                System.out.println(sendUserIds);
                 for (Map<String, Object> m : mulitPatienInfo) {
                     Long count = (Long) m.get("count");
                     sendUserIds2.add((String) m.get("user_id"));
-- 
1.8.3.1