From 1f81266c407d146a936fe73fb72ba38b82a66968 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Tue, 7 Nov 2017 17:21:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/ReportServiceImpl.java | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) 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 3aa7a38..a708f17 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 @@ -905,18 +905,25 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService for (Map map : couponReport) { List sendUserIds = (List) map.get("sendUserIds"); + if(CollectionUtils.isNotEmpty(sendUserIds)) { + int addSendcount = couponMapper.findMulitPatientCount(sendUserIds); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ + map.put("coupon_send_count", ((Long) map.get("coupon_send_count")) + addSendcount); + for (int i = 0; i < addSendcount; i++) { + sendUserIds.add(UUID.randomUUID().toString()); + } + } + List usedUserIds = (List) map.get("usedUserIds"); - int addSendcount = couponMapper.findMulitPatientCount(sendUserIds); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ + if(CollectionUtils.isNotEmpty(usedUserIds)) { 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()); + map.put("coupon_used_count", (((Long) map.get("coupon_used_count")) + addUsedcount) ); + for (int i = 0; i < addUsedcount; i++) { + usedUserIds.add(UUID.randomUUID().toString()); + } } + + + } return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", couponReportMap, "reportModel", reportModal); -- 1.8.3.1