diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 0c4ed4aa9..da268bd84 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -662,7 +662,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { if (markingCouponDataReportDto.getEndTime() != null) markingCouponDataReportDto.setEndTime(markingCouponDataReportDto.getEndTime()); PageHelper.startPage(pageIndex, pageSize); - List wxUserVisitList = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); + //获取领取人数 //获取领取量 @@ -674,17 +674,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params2.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) params2.put("endTime", markingCouponDataReportDto.getEndTime()); - List couponDatalist = wxCouponOrderMapper.touchUsersReportList(params2); - - Map visitMap = couponDatalist.stream().collect(Collectors.toMap(TouchUsersReportVo::getXTime, p -> p)); - for (TouchUsersReportVo temp:wxUserVisitList) { - if(visitMap.get(temp.getXTime())!=null){ - temp.setCouponCount(visitMap.get(temp.getXTime()).getCouponCount()); - temp.setUserCount(visitMap.get(temp.getXTime()).getUserCount()); - temp.setVerifyCount(visitMap.get(temp.getXTime()).getVerifyCount()); - temp.setVerifyUserCount(visitMap.get(temp.getXTime()).getVerifyUserCount()); - } - } + List wxUserVisitList = wxCouponOrderMapper.touchUsersReportList(params2); return new PageInfo<>(wxUserVisitList); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 198826595..fc7d92ff1 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -149,39 +149,14 @@