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 7d158b0..ee3effa 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 @@ -114,4 +114,6 @@ public interface CouponMapper { List findUnUsedPeopleInfo(Map param); Integer findUnUsedPeopleInfoCount(Map param); + + int findMulitPatientCount(List sendUserIds); } 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 89c40ed..b201ad3 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -646,4 +646,19 @@ ) a + + + \ No newline at end of file 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 b9c2963..3aa7a38 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 @@ -902,6 +902,23 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService couponReportMap.add(m); } // return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", couponReportMap, "reportModel", reportModel); + + for (Map map : couponReport) { + List sendUserIds = (List) map.get("sendUserIds"); + List usedUserIds = (List) map.get("usedUserIds"); + int addSendcount = couponMapper.findMulitPatientCount(sendUserIds); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ + int addUsedcount = couponMapper.findMulitPatientCount(usedUserIds); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ + map.put("coupon_send_count", ((Integer) map.get("coupon_send_count")) + addSendcount); + map.put("coupon_used_count", ((Integer) map.get("coupon_used_count")) + addUsedcount); + + for (int i = 0; i < addSendcount; i++) { + sendUserIds.add(UUID.randomUUID().toString()); + } + for (int i = 0; i < addUsedcount; i++) { + usedUserIds.add(UUID.randomUUID().toString()); + } + } + return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", couponReportMap, "reportModel", reportModal); }