| @@ -13,6 +13,7 @@ import com.iformall.enums.EnumCouponSendSendType; | |||||
| import com.iformall.enums.EnumCouponType; | import com.iformall.enums.EnumCouponType; | ||||
| import com.iformall.mapper.*; | import com.iformall.mapper.*; | ||||
| import com.iformall.service.MarkingDataReportService; | import com.iformall.service.MarkingDataReportService; | ||||
| import com.iformall.utils.DateUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -122,11 +123,33 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { | |||||
| List<MarkingCouponDataReportVo> couponDatalist = wxCouponOrderMapper.couponDataMap(params); | List<MarkingCouponDataReportVo> couponDatalist = wxCouponOrderMapper.couponDataMap(params); | ||||
| //查询券领取人数 | //查询券领取人数 | ||||
| String startdate = DateUtils.getTimeBefore(29, new Date()); | |||||
| String enddate = DateUtils.getTimeBefore(1,new Date()); | |||||
| List<String> tjTimeList = DateUtils.getTjTimeList(startdate, enddate, "0"); | |||||
| List<String> tjList = tjTimeList.stream().map(d -> d.substring(5).replace("-", "/")).collect(Collectors.toList()); | |||||
| List<MarkingCouponDataReportVo> couponTempDatalist =new LinkedList<>(); | |||||
| for(String tj:tjList){ | |||||
| Optional<MarkingCouponDataReportVo> first = couponDatalist.stream().filter(c -> c.getCreateTime().equals(tj)).findFirst(); | |||||
| if(!first.isPresent()){ | |||||
| MarkingCouponDataReportVo markingCouponDataReportVo = new MarkingCouponDataReportVo(); | |||||
| markingCouponDataReportVo.setCreateTime(tj); | |||||
| markingCouponDataReportVo.setCouponCount(0); | |||||
| markingCouponDataReportVo.setCouponUserCount(0); | |||||
| markingCouponDataReportVo.setVerifyCount(0); | |||||
| markingCouponDataReportVo.setVerifyUserCount(0); | |||||
| couponTempDatalist.add(markingCouponDataReportVo); | |||||
| continue; | |||||
| } | |||||
| couponTempDatalist.add(first.get()); | |||||
| } | |||||
| HashMap<String, Object> returnMap = new HashMap<>(); | HashMap<String, Object> returnMap = new HashMap<>(); | ||||
| returnMap.put("couponUpDay", couponUpDay);//比昨日提升 | returnMap.put("couponUpDay", couponUpDay);//比昨日提升 | ||||
| returnMap.put("couponUpWeek", couponUpWeek);//比上周提升 | returnMap.put("couponUpWeek", couponUpWeek);//比上周提升 | ||||
| returnMap.put("todayCouponCount", todayCouponCount);//今日领取数 | returnMap.put("todayCouponCount", todayCouponCount);//今日领取数 | ||||
| returnMap.put("couponDataMap", couponDatalist); | |||||
| returnMap.put("couponDataMap", couponTempDatalist); | |||||
| return returnMap; | return returnMap; | ||||
| } | } | ||||