diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index 52a36e9d7..40a150764 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -58,8 +58,8 @@ public interface WxCouponOrderMapper extends CommonMapper { //营销报表 券数据图表 //List couponDataMap(HashMap params); - HashMap findCreateDateCouponOrderCount(HashMap params); - HashMap findCreateDateCouponOrderUserCount(HashMap params); + List> findCreateDateCouponOrderCount(HashMap params); + List> findCreateDateCouponOrderUserCount(HashMap params); //营销报表 券数据报表 List couponDataList(HashMap params); //返回日期格式yy-MM-dd diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 03efe6527..bd35f1740 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -2400,23 +2400,35 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { paramMap.put("parentTenantId", tenantEntity.getParentTenantId()); paramMap.put("startCreateDateTimes", startTime.getTime()); paramMap.put("endCreateDateTimes", endTime.getTime()); - Map couponCount = wxCouponOrderMapper.findCreateDateCouponOrderCount(paramMap); - if (null != couponCount) { - for (Iterator it = couponCount.keySet().iterator();it.hasNext();) { - String date = it.next(); - if (!dateList.contains(date)){ - dateList.add(date); + List> couponCountList = wxCouponOrderMapper.findCreateDateCouponOrderCount(paramMap); + Map couponCount = new HashMap(); + if (null != couponCountList) { + for (int i = 0; i < couponCountList.size();i++) { + Map map = couponCountList.get(i); + String date = (String)map.get("createTime"); + Integer count = (Integer)map.get("count"); + if ((!StringUtils.isBlank(date)) && null != count) { + if(!dateList.contains(date)) { + dateList.add(date); + } + couponCount.put(date, count); } } } //券领取人数 - Map couponUserCount = wxCouponOrderMapper.findCreateDateCouponOrderUserCount(paramMap); - if (null != couponUserCount) { - for (Iterator it = couponUserCount.keySet().iterator();it.hasNext();) { - String date = it.next(); - if (!dateList.contains(date)){ - dateList.add(date); + List> couponUserCountList = wxCouponOrderMapper.findCreateDateCouponOrderUserCount(paramMap); + Map couponUserCount = new HashMap(); + if (null != couponUserCountList) { + for (int i = 0; i < couponUserCountList.size();i++) { + Map map = couponUserCountList.get(i); + String date = (String)map.get("createTime"); + Integer count = (Integer)map.get("count"); + if ((!StringUtils.isBlank(date)) && null != count) { + if(!dateList.contains(date)) { + dateList.add(date); + } + couponUserCount.put(date, count); } } } @@ -2428,23 +2440,35 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { verfiyParamMap.put("couponOrderStatus", 1); verfiyParamMap.put("updateStartTime", startTime); verfiyParamMap.put("updateEndTime", endTime); - Map verfiyCount = wxCouponOrderMapper.findCreateDateCouponOrderCount(verfiyParamMap); - if (null != verfiyCount) { - for (Iterator it = verfiyCount.keySet().iterator();it.hasNext();) { - String date = it.next(); - if (!dateList.contains(date)){ - dateList.add(date); + List> verfiyCountList = wxCouponOrderMapper.findCreateDateCouponOrderCount(verfiyParamMap); + Map verfiyCount = new HashMap(); + if (null != verfiyCountList) { + for (int i = 0; i < verfiyCountList.size();i++) { + Map map = verfiyCountList.get(i); + String date = (String)map.get("createTime"); + Integer count = (Integer)map.get("count"); + if ((!StringUtils.isBlank(date)) && null != count) { + if(!dateList.contains(date)) { + dateList.add(date); + } + verfiyCount.put(date, count); } } } //券核销人数 - Map verfiyUserCount = wxCouponOrderMapper.findCreateDateCouponOrderUserCount(verfiyParamMap); - if (null != verfiyUserCount) { - for (Iterator it = verfiyUserCount.keySet().iterator();it.hasNext();) { - String date = it.next(); - if (!dateList.contains(date)){ - dateList.add(date); + List> verfiyUserCountList = wxCouponOrderMapper.findCreateDateCouponOrderUserCount(verfiyParamMap); + Map verfiyUserCount = new HashMap(); + if (null != verfiyUserCountList) { + for (int i = 0; i < verfiyUserCountList.size();i++) { + Map map = verfiyUserCountList.get(i); + String date = (String)map.get("createTime"); + Integer count = (Integer)map.get("count"); + if ((!StringUtils.isBlank(date)) && null != count) { + if(!dateList.contains(date)) { + dateList.add(date); + } + verfiyUserCount.put(date, count); } } }