|
|
|
@@ -192,7 +192,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
params1.put("tenantId", tenantId); |
|
|
|
params1.put("startTime", getFirstDayOfMonth()); |
|
|
|
params1.put("endTime", addDay(1)); |
|
|
|
params1.put("channelType", EnumCouponSendSendType.CAR_STOP);//停车 |
|
|
|
params1.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode());//停车 |
|
|
|
List<MarkingSceneDataReportVo> list1 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params1); |
|
|
|
Map<String, Integer> parkCountMap = list1.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); |
|
|
|
//核销发券被核销数 |
|
|
|
@@ -200,7 +200,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
params2.put("tenantId", tenantId); |
|
|
|
params2.put("startTime", getFirstDayOfMonth()); |
|
|
|
params2.put("endTime", addDay(1)); |
|
|
|
params2.put("channelType", EnumCouponSendSendType.COUPON_VERIFY);//核销 |
|
|
|
params2.put("channelType", EnumCouponSendSendType.COUPON_VERIFY.getCode());//核销 |
|
|
|
List<MarkingSceneDataReportVo> list2 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params2); |
|
|
|
Map<String, Integer> verifyCountMap = list2.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); |
|
|
|
// B端刷卡支付被核销数 |
|
|
|
@@ -209,8 +209,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
params3.put("tenantId", tenantId); |
|
|
|
params3.put("startTime", getFirstDayOfMonth()); |
|
|
|
params3.put("endTime", addDay(1)); |
|
|
|
params3.put("channelType", EnumCouponSendSendType.B_MICROPAY);//B端刷卡支付 |
|
|
|
List<MarkingSceneDataReportVo> list3 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params2); |
|
|
|
params3.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode());//B端刷卡支付 |
|
|
|
List<MarkingSceneDataReportVo> list3 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params3); |
|
|
|
Map<String, Integer> microPayCountMap = list2.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); |
|
|
|
|
|
|
|
for (MarkingSceneDataReportVo vo : list) { |
|
|
|
@@ -228,20 +228,23 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
for(String tj:tjList){ |
|
|
|
Optional<MarkingSceneDataReportVo> first = list.stream().filter(c -> c.getXTime().equals(tj)).findFirst(); |
|
|
|
if(!first.isPresent()){ |
|
|
|
MarkingSceneDataReportVo markingSceneDataReportVo = new MarkingSceneDataReportVo(); |
|
|
|
markingSceneDataReportVo.setXTime(tj); |
|
|
|
markingSceneDataReportVo.setCarCount(0); |
|
|
|
markingSceneDataReportVo.setParkCount(0); |
|
|
|
markingSceneDataReportVo.setVerifyCount(0); |
|
|
|
markingSceneDataReportVo.setMicroPayCount(0); |
|
|
|
markingSceneDataReportVo.setTempCount(0); |
|
|
|
markingSceneDataReportVo.setParkSendCount(0); |
|
|
|
markingSceneDataReportVo.setVerifySendCount(0); |
|
|
|
markingSceneDataReportVo.setMicroPaySendCount(0); |
|
|
|
tempDatalist.add(markingSceneDataReportVo); |
|
|
|
MarkingSceneDataReportVo msdVo = new MarkingSceneDataReportVo(); |
|
|
|
msdVo.setXTime(tj); |
|
|
|
msdVo.setCarCount(0); |
|
|
|
msdVo.setParkCount(0); |
|
|
|
msdVo.setVerifyCount(0); |
|
|
|
msdVo.setMicroPayCount(0); |
|
|
|
msdVo.setTempCount(0); |
|
|
|
msdVo.setParkSendCount(0); |
|
|
|
msdVo.setVerifySendCount(0); |
|
|
|
msdVo.setMicroPaySendCount(0); |
|
|
|
msdVo.setTotal(0); |
|
|
|
tempDatalist.add(msdVo); |
|
|
|
continue; |
|
|
|
} |
|
|
|
tempDatalist.add(first.get()); |
|
|
|
MarkingSceneDataReportVo msdVo = first.get(); |
|
|
|
msdVo.setTotal(msdVo.getParkSendCount() + msdVo.getVerifySendCount() + msdVo.getMicroPaySendCount()); |
|
|
|
tempDatalist.add(msdVo); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@@ -332,7 +335,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
params.put("startTime", convertDate(markingCouponDataReportDto.getStartTime())); |
|
|
|
if (markingCouponDataReportDto.getEndTime() != null) |
|
|
|
params.put("endTime", convertDateAndAdd(convertDate(markingCouponDataReportDto.getEndTime()), 1)); |
|
|
|
params.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode()); |
|
|
|
params.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode()); |
|
|
|
List<MarkingSceneDataReportVo> list1 = wxCouponActionLogMapper.sceneDataJoinCouponOrderList(params); |
|
|
|
countMap = list1.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); |
|
|
|
} else{ |
|
|
|
|