|
|
|
@@ -566,7 +566,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
if (markingCouponDataReportDto.getStartTime() != null) |
|
|
|
params1.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); |
|
|
|
if (markingCouponDataReportDto.getEndTime() != null) |
|
|
|
params1.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); |
|
|
|
params1.put("endTime", markingCouponDataReportDto.getEndTime()); |
|
|
|
PageHelper.startPage(pageIndex, pageSize); |
|
|
|
List<TouchUsersReportVo> wxUserVisitList = wxUserVisitMapper.touchUsersReportList(params1); |
|
|
|
|
|
|
|
@@ -580,7 +580,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
if (markingCouponDataReportDto.getStartTime() != null) |
|
|
|
params2.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); |
|
|
|
if (markingCouponDataReportDto.getEndTime() != null) |
|
|
|
params2.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); |
|
|
|
params2.put("endTime", markingCouponDataReportDto.getEndTime()); |
|
|
|
List<TouchUsersReportVo> couponDatalist = wxCouponOrderMapper.touchUsersReportList(params2); |
|
|
|
|
|
|
|
Map<String,TouchUsersReportVo> visitMap = couponDatalist.stream().collect(Collectors.toMap(TouchUsersReportVo::getxTime, p -> p)); |
|
|
|
|