|
|
|
@@ -158,7 +158,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
params.put("startTime", addDay(-30)); |
|
|
|
params.put("endTime", addDay(1)); |
|
|
|
//停车发券数 停车发券被核销数 核销发券数 核销发券被核销数 |
|
|
|
// TODO DELETE sceneDataMap |
|
|
|
wxCouponActionLogMapper.updateCreateTimeMd(params); |
|
|
|
List<MarkingSceneDataReportTVo> sceneList = wxCouponActionLogMapper.getSceneDataMap(params); |
|
|
|
|
|
|
|
//停车发券被核销数 |
|
|
|
@@ -207,13 +207,12 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
MarkingSceneDataReportVo msdVo = new MarkingSceneDataReportVo(); |
|
|
|
msdVo.setXTime(tj); |
|
|
|
Optional<MarkingSceneDataReportTVo> carStop = sceneList.stream().filter(c -> c.getXTime().equals(tj) && c.getChannelType() == EnumCouponSendSendType.CAR_STOP.getCode()).findFirst(); |
|
|
|
if(!carStop.isPresent()) { |
|
|
|
if (!carStop.isPresent()) { |
|
|
|
msdVo.setParkSendCount(0); |
|
|
|
} else { |
|
|
|
MarkingSceneDataReportTVo tvo = carStop.get(); |
|
|
|
msdVo.setParkSendCount(tvo.getCount()); |
|
|
|
} |
|
|
|
|
|
|
|
Optional<MarkingSceneDataReportTVo> couponVerify = sceneList.stream().filter(c -> c.getXTime().equals(tj) && c.getChannelType() == EnumCouponSendSendType.COUPON_VERIFY.getCode()).findFirst(); |
|
|
|
if(!couponVerify.isPresent()) { |
|
|
|
msdVo.setVerifySendCount(0); |
|
|
|
@@ -237,6 +236,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
MarkingSceneDataReportTVo tvo = orderSend.get(); |
|
|
|
msdVo.setOrderSendCount(tvo.getCount()); |
|
|
|
} |
|
|
|
|
|
|
|
msdVo.setTotal(msdVo.getParkSendCount() + |
|
|
|
msdVo.getVerifySendCount() + |
|
|
|
msdVo.getMicroPaySendCount() + |
|
|
|
|