|
|
|
@@ -123,7 +123,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
List<MarkingCouponDataReportVo> couponDatalist = wxCouponOrderMapper.couponDataMap(params); |
|
|
|
//查询券领取人数 |
|
|
|
|
|
|
|
String startdate = DateUtils.getTimeBefore(29, new Date()); |
|
|
|
String startdate = DateUtils.getTimeBefore(30, 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()); |
|
|
|
@@ -205,7 +205,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
vo.setVerifyCount(verifyCountMap.get(vo.getxTime()) == null ? 0 : verifyCountMap.get(vo.getxTime())); |
|
|
|
} |
|
|
|
|
|
|
|
String startdate = DateUtils.getTimeBefore(29, new Date()); |
|
|
|
String startdate = DateUtils.getTimeBefore(30, 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()); |
|
|
|
|