diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java index c075d23..4e6f457 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java @@ -115,7 +115,7 @@ public interface CouponMapper { Integer findUnUsedPeopleInfoCount(Map param); - List> findMulitPatienInfo(List sendUserIds); + List> findMulitPatienInfo(Map param); List> findUserSendInfoByUids(Map uids); 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 5fe190c..aa7a484 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -682,15 +682,18 @@ - 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 - + #{uid} + + and create_date > #{startDate} + order by create_date desc ) a group by a.ymd, a.user_id ) a group by a.user_id 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 a6f00e3..9606584 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 @@ -1284,7 +1284,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService List sendUserIds = (List) map.get("sendUserIds"); List sendUserIds2 = new ArrayList<>(); if(CollectionUtils.isNotEmpty(sendUserIds)) { - List> mulitPatienInfo = couponMapper.findMulitPatienInfo(sendUserIds); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ +// List> mulitPatienInfo = couponMapper.findMulitPatienInfo(sendUserIds); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ + List> mulitPatienInfo = couponMapper.findMulitPatienInfo(CollectionUtils.createMap("userIds", sendUserIds, "startDate", param.get("startDate"))); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ for (Map m : mulitPatienInfo) { Long count = (Long) m.get("count"); sendUserIds2.add((String) m.get("user_id")); @@ -1301,7 +1302,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService List usedUserIds = (List) map.get("usedUserIds"); List usedUserIds2 = new ArrayList<>(); if(CollectionUtils.isNotEmpty(usedUserIds)) { - List> mulitPatienInfo = couponMapper.findMulitPatienInfo(usedUserIds); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ + List> mulitPatienInfo = couponMapper.findMulitPatienInfo(CollectionUtils.createMap("userIds", usedUserIds, "startDate", param.get("startDate"))); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ for (Map m : mulitPatienInfo) { Long count = (Long) m.get("count"); usedUserIds2.add((String) m.get("user_id"));