|
|
|
@@ -185,7 +185,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
params3.put("tenantId", tenantId); |
|
|
|
params3.put("startTime", addDay(-30)); |
|
|
|
params3.put("endTime", addDay(1)); |
|
|
|
params3.put("channelType", EnumCouponSendSendType.C_ORDER.getCode());//B端刷卡支付 |
|
|
|
params3.put("channelType", EnumCouponSendSendType.C_ORDER.getCode());//买券 |
|
|
|
List<MarkingSceneDataReportVo> list4 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params4); |
|
|
|
Map<String, Integer> OrderCountMap = list4.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); |
|
|
|
|
|
|
|
@@ -204,8 +204,10 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
|
|
|
|
for(String tj:tjList){ |
|
|
|
Optional<MarkingSceneDataReportVo> first = list.stream().filter(c -> c.getXTime().equals(tj)).findFirst(); |
|
|
|
|
|
|
|
MarkingSceneDataReportVo msdVo; |
|
|
|
if(!first.isPresent()){ |
|
|
|
MarkingSceneDataReportVo msdVo = new MarkingSceneDataReportVo(); |
|
|
|
msdVo = new MarkingSceneDataReportVo(); |
|
|
|
msdVo.setXTime(tj); |
|
|
|
msdVo.setCarCount(0); |
|
|
|
msdVo.setParkCount(0); |
|
|
|
@@ -218,14 +220,13 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
msdVo.setMicroPaySendCount(0); |
|
|
|
msdVo.setOrderSendCount(0); |
|
|
|
msdVo.setTotal(0); |
|
|
|
tempDatalist.add(msdVo); |
|
|
|
continue; |
|
|
|
} else { |
|
|
|
msdVo = first.get(); |
|
|
|
msdVo.setTotal(msdVo.getParkSendCount() + |
|
|
|
msdVo.getVerifySendCount() + |
|
|
|
msdVo.getMicroPaySendCount() + |
|
|
|
msdVo.getOrderSendCount()); |
|
|
|
} |
|
|
|
MarkingSceneDataReportVo msdVo = first.get(); |
|
|
|
msdVo.setTotal(msdVo.getParkSendCount() + |
|
|
|
msdVo.getVerifySendCount() + |
|
|
|
msdVo.getMicroPaySendCount() + |
|
|
|
msdVo.getOrderSendCount()); |
|
|
|
tempDatalist.add(msdVo); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -285,27 +286,25 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); |
|
|
|
//停车发券数 停车发券被核销数, 核销发券数 核销发券被核销数, B端刷卡支付发券数 刷卡支付发券被核销数 |
|
|
|
PageHelper.startPage(pageIndex, pageSize); |
|
|
|
List<MarkingSceneDataReportVo> templist = wxCouponActionLogMapper.sceneDataList(params); |
|
|
|
|
|
|
|
List<MarkingSceneDataVo> list = new ArrayList<>(); |
|
|
|
for (MarkingSceneDataReportVo temp: templist) { |
|
|
|
MarkingSceneDataVo vo = new MarkingSceneDataVo(); |
|
|
|
vo.setxTime(temp.getXTime()); |
|
|
|
if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())) { |
|
|
|
vo.setSendCount(temp.getParkSendCount()); |
|
|
|
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.B_MICROPAY.getCode())) { |
|
|
|
vo.setSendCount(temp.getMicroPaySendCount()); |
|
|
|
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())){ |
|
|
|
vo.setSendCount(temp.getVerifySendCount()); |
|
|
|
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.C_ORDER.getCode())){ |
|
|
|
vo.setSendCount(temp.getOrderSendCount()); |
|
|
|
}else { |
|
|
|
vo.setSendCount(0); |
|
|
|
} |
|
|
|
List<MarkingSceneDataVo> list; |
|
|
|
|
|
|
|
list.add(vo); |
|
|
|
if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())) { |
|
|
|
params.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode()); |
|
|
|
list = wxCouponActionLogMapper.sceneDataList(params); |
|
|
|
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.B_MICROPAY.getCode())) { |
|
|
|
params.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode()); |
|
|
|
list = wxCouponActionLogMapper.sceneDataList(params); |
|
|
|
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())){ |
|
|
|
params.put("channelType", EnumCouponSendSendType.COUPON_VERIFY.getCode()); |
|
|
|
list = wxCouponActionLogMapper.sceneDataList(params); |
|
|
|
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.C_ORDER.getCode())){ |
|
|
|
params.put("channelType", EnumCouponSendSendType.C_ORDER.getCode()); |
|
|
|
list = wxCouponActionLogMapper.sceneDataList(params); |
|
|
|
}else { |
|
|
|
list = new ArrayList<MarkingSceneDataVo>(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Map<String, Integer> countMap = new HashMap<>(); |
|
|
|
|
|
|
|
if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ //停车 |
|
|
|
|