| @@ -2401,12 +2401,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||
| paramMap.put("startCreateDateTimes", startTime.getTime()); | |||
| paramMap.put("endCreateDateTimes", endTime.getTime()); | |||
| List<Map<String,Object>> couponCountList = wxCouponOrderMapper.findCreateDateCouponOrderCount(paramMap); | |||
| Map<String,Integer> couponCount = new HashMap<String,Integer>(); | |||
| Map<String,Long> couponCount = new HashMap<String,Long>(); | |||
| 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"); | |||
| Long count = (Long)map.get("count"); | |||
| if ((!StringUtils.isBlank(date)) && null != count) { | |||
| if(!dateList.contains(date)) { | |||
| dateList.add(date); | |||
| @@ -2418,12 +2418,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||
| //券领取人数 | |||
| List<Map<String,Object>> couponUserCountList = wxCouponOrderMapper.findCreateDateCouponOrderUserCount(paramMap); | |||
| Map<String,Integer> couponUserCount = new HashMap<String,Integer>(); | |||
| Map<String,Long> couponUserCount = new HashMap<String,Long>(); | |||
| 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"); | |||
| Long count = (Long)map.get("count"); | |||
| if ((!StringUtils.isBlank(date)) && null != count) { | |||
| if(!dateList.contains(date)) { | |||
| dateList.add(date); | |||
| @@ -2441,12 +2441,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||
| verfiyParamMap.put("updateStartTime", startTime); | |||
| verfiyParamMap.put("updateEndTime", endTime); | |||
| List<Map<String,Object>> verfiyCountList = wxCouponOrderMapper.findCreateDateCouponOrderCount(verfiyParamMap); | |||
| Map<String,Integer> verfiyCount = new HashMap<String,Integer>(); | |||
| Map<String,Long> verfiyCount = new HashMap<String,Long>(); | |||
| 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"); | |||
| Long count = (Long)map.get("count"); | |||
| if ((!StringUtils.isBlank(date)) && null != count) { | |||
| if(!dateList.contains(date)) { | |||
| dateList.add(date); | |||
| @@ -2458,12 +2458,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||
| //券核销人数 | |||
| List<Map<String,Object>> verfiyUserCountList = wxCouponOrderMapper.findCreateDateCouponOrderUserCount(verfiyParamMap); | |||
| Map<String,Integer> verfiyUserCount = new HashMap<String,Integer>(); | |||
| Map<String,Long> verfiyUserCount = new HashMap<String,Long>(); | |||
| 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"); | |||
| Long count = (Long)map.get("count"); | |||
| if ((!StringUtils.isBlank(date)) && null != count) { | |||
| if(!dateList.contains(date)) { | |||
| dateList.add(date); | |||
| @@ -2479,25 +2479,25 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||
| String date = dateList.get(i); | |||
| MarkingCouponDataReportVo vo = new MarkingCouponDataReportVo(); | |||
| if (null != couponCount && couponCount.containsKey(date)) { | |||
| vo.setCouponCount(couponCount.get(date)); | |||
| vo.setCouponCount(couponCount.get(date).intValue()); | |||
| }else { | |||
| vo.setCouponCount(0); | |||
| } | |||
| if (null != couponUserCount && couponUserCount.containsKey(date)) { | |||
| vo.setCouponUserCount(couponUserCount.get(date));; | |||
| vo.setCouponUserCount(couponUserCount.get(date).intValue());; | |||
| }else { | |||
| vo.setCouponUserCount(0); | |||
| } | |||
| if (null != verfiyCount && verfiyCount.containsKey(date)) { | |||
| vo.setVerifyCount(verfiyCount.get(date)); | |||
| vo.setVerifyCount(verfiyCount.get(date).intValue()); | |||
| }else { | |||
| vo.setVerifyCount(0); | |||
| } | |||
| if (null != verfiyUserCount && verfiyUserCount.containsKey(date)) { | |||
| vo.setVerifyUserCount(verfiyUserCount.get(date)); | |||
| vo.setVerifyUserCount(verfiyUserCount.get(date).intValue()); | |||
| }else { | |||
| vo.setVerifyUserCount(0); | |||
| } | |||