|
|
|
@@ -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<String,Integer> couponCount = wxCouponOrderMapper.findCreateDateCouponOrderCount(paramMap); |
|
|
|
if (null != couponCount) { |
|
|
|
for (Iterator<String> it = couponCount.keySet().iterator();it.hasNext();) { |
|
|
|
String date = it.next(); |
|
|
|
if (!dateList.contains(date)){ |
|
|
|
dateList.add(date); |
|
|
|
List<Map<String,Object>> couponCountList = wxCouponOrderMapper.findCreateDateCouponOrderCount(paramMap); |
|
|
|
Map<String,Integer> couponCount = new HashMap<String,Integer>(); |
|
|
|
if (null != couponCountList) { |
|
|
|
for (int i = 0; i < couponCountList.size();i++) { |
|
|
|
Map<String,Object> 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<String,Integer> couponUserCount = wxCouponOrderMapper.findCreateDateCouponOrderUserCount(paramMap); |
|
|
|
if (null != couponUserCount) { |
|
|
|
for (Iterator<String> it = couponUserCount.keySet().iterator();it.hasNext();) { |
|
|
|
String date = it.next(); |
|
|
|
if (!dateList.contains(date)){ |
|
|
|
dateList.add(date); |
|
|
|
List<Map<String,Object>> couponUserCountList = wxCouponOrderMapper.findCreateDateCouponOrderUserCount(paramMap); |
|
|
|
Map<String,Integer> couponUserCount = new HashMap<String,Integer>(); |
|
|
|
if (null != couponUserCountList) { |
|
|
|
for (int i = 0; i < couponUserCountList.size();i++) { |
|
|
|
Map<String,Object> 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<String,Integer> verfiyCount = wxCouponOrderMapper.findCreateDateCouponOrderCount(verfiyParamMap); |
|
|
|
if (null != verfiyCount) { |
|
|
|
for (Iterator<String> it = verfiyCount.keySet().iterator();it.hasNext();) { |
|
|
|
String date = it.next(); |
|
|
|
if (!dateList.contains(date)){ |
|
|
|
dateList.add(date); |
|
|
|
List<Map<String,Object>> verfiyCountList = wxCouponOrderMapper.findCreateDateCouponOrderCount(verfiyParamMap); |
|
|
|
Map<String,Integer> verfiyCount = new HashMap<String,Integer>(); |
|
|
|
if (null != verfiyCountList) { |
|
|
|
for (int i = 0; i < verfiyCountList.size();i++) { |
|
|
|
Map<String,Object> 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<String,Integer> verfiyUserCount = wxCouponOrderMapper.findCreateDateCouponOrderUserCount(verfiyParamMap); |
|
|
|
if (null != verfiyUserCount) { |
|
|
|
for (Iterator<String> it = verfiyUserCount.keySet().iterator();it.hasNext();) { |
|
|
|
String date = it.next(); |
|
|
|
if (!dateList.contains(date)){ |
|
|
|
dateList.add(date); |
|
|
|
List<Map<String,Object>> verfiyUserCountList = wxCouponOrderMapper.findCreateDateCouponOrderUserCount(verfiyParamMap); |
|
|
|
Map<String,Integer> verfiyUserCount = new HashMap<String,Integer>(); |
|
|
|
if (null != verfiyUserCountList) { |
|
|
|
for (int i = 0; i < verfiyUserCountList.size();i++) { |
|
|
|
Map<String,Object> 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); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|