|
|
@@ -390,7 +390,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); |
|
|
params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); |
|
|
List<MarkingSceneDataVo> markingSceneDataVos = wxCarCmdLogMapper.queryForSceneRepotyHistoryCar(params); |
|
|
List<MarkingSceneDataVo> markingSceneDataVos = wxCarCmdLogMapper.queryForSceneRepotyHistoryCar(params); |
|
|
|
|
|
|
|
|
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getTriggerCount())); |
|
|
|
|
|
|
|
|
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); |
|
|
} else if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.B_MICROPAY.getCode())){ // B端刷卡支付发券 |
|
|
} else if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.B_MICROPAY.getCode())){ // B端刷卡支付发券 |
|
|
//获取B端刷卡数 |
|
|
//获取B端刷卡数 |
|
|
params.clear(); |
|
|
params.clear(); |
|
|
@@ -401,7 +401,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); |
|
|
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); |
|
|
params.put("type", EnumOrderType.MICROPAY.getCode()); |
|
|
params.put("type", EnumOrderType.MICROPAY.getCode()); |
|
|
List<MarkingSceneDataVo> markingSceneDataVos = wxOrderMapper.queryForSceneRepotyHistory(params); |
|
|
List<MarkingSceneDataVo> markingSceneDataVos = wxOrderMapper.queryForSceneRepotyHistory(params); |
|
|
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getTriggerCount())); |
|
|
|
|
|
|
|
|
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); |
|
|
} else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())) { |
|
|
} else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())) { |
|
|
//获取核销数 |
|
|
//获取核销数 |
|
|
params.clear(); |
|
|
params.clear(); |
|
|
@@ -411,7 +411,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
if (markingCouponDataReportDto.getEndTime() != null) |
|
|
if (markingCouponDataReportDto.getEndTime() != null) |
|
|
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); |
|
|
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); |
|
|
List<MarkingSceneDataVo> markingSceneDataVos = wxCouponOrderMapper.queryForSceneRepotyHistoryVerified(params); |
|
|
List<MarkingSceneDataVo> markingSceneDataVos = wxCouponOrderMapper.queryForSceneRepotyHistoryVerified(params); |
|
|
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getTriggerCount())); |
|
|
|
|
|
|
|
|
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); |
|
|
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.C_ORDER.getCode())) { |
|
|
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.C_ORDER.getCode())) { |
|
|
//购买发券数 |
|
|
//购买发券数 |
|
|
params.clear(); |
|
|
params.clear(); |
|
|
@@ -421,13 +421,13 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
if (markingCouponDataReportDto.getEndTime() != null) |
|
|
if (markingCouponDataReportDto.getEndTime() != null) |
|
|
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); |
|
|
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); |
|
|
List<MarkingSceneDataVo> markingSceneDataVos = wxCouponOrderMapper.queryForSceneRepotyHistoryOrdered(params); |
|
|
List<MarkingSceneDataVo> markingSceneDataVos = wxCouponOrderMapper.queryForSceneRepotyHistoryOrdered(params); |
|
|
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getTriggerCount())); |
|
|
|
|
|
|
|
|
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); |
|
|
} |
|
|
} |
|
|
NumberFormat nf = NumberFormat.getPercentInstance(); |
|
|
NumberFormat nf = NumberFormat.getPercentInstance(); |
|
|
nf.setMinimumFractionDigits(2); |
|
|
nf.setMinimumFractionDigits(2); |
|
|
for (MarkingSceneDataVo vo : list) { |
|
|
for (MarkingSceneDataVo vo : list) { |
|
|
vo.setVerifiedCount(countMap.get(vo.getXTime()) == null ? 0 : countMap.get(vo.getXTime())); |
|
|
|
|
|
vo.setTriggerCount(triggerCountMap.get(vo.getXTime()) == null ? 0 : triggerCountMap.get(vo.getXTime())); |
|
|
|
|
|
|
|
|
vo.setVerifiedCount(countMap.get(vo.getXtime()) == null ? 0 : countMap.get(vo.getXtime())); |
|
|
|
|
|
vo.setTriggerCount(triggerCountMap.get(vo.getXtime()) == null ? 0 : triggerCountMap.get(vo.getXtime())); |
|
|
if(vo.getSendCount()==0){ |
|
|
if(vo.getSendCount()==0){ |
|
|
vo.setVerifiedPercent("--"); |
|
|
vo.setVerifiedPercent("--"); |
|
|
}else { |
|
|
}else { |
|
|
@@ -444,20 +444,18 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); |
|
|
MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); |
|
|
markingCouponDataReportDto.setTenantId(tenantId); |
|
|
markingCouponDataReportDto.setTenantId(tenantId); |
|
|
|
|
|
|
|
|
//if (StringUtils.isNotBlank(startDate)) |
|
|
|
|
|
//markingCouponDataReportDto.setStartTime(startDate); |
|
|
|
|
|
// if (StringUtils.isNotBlank(endDate)) |
|
|
|
|
|
//markingCouponDataReportDto.setEndTime(endDate); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Date starttime = DateUtils.stringToDate(startDate); |
|
|
|
|
|
markingCouponDataReportDto.setStartTime(starttime); |
|
|
|
|
|
Date endtime = DateUtils.stringToDate(endDate, "yyyy-MM-dd 23:59:59"); |
|
|
|
|
|
markingCouponDataReportDto.setEndTime(endtime); |
|
|
|
|
|
|
|
|
List<String> days = DateUtils.getTjTimeList(startDate.substring(0,10),endDate.substring(0,10),"0"); |
|
|
List<String> days = DateUtils.getTjTimeList(startDate.substring(0,10),endDate.substring(0,10),"0"); |
|
|
TreeMap<String, Object> historyMap = new TreeMap<>(); |
|
|
TreeMap<String, Object> historyMap = new TreeMap<>(); |
|
|
|
|
|
|
|
|
//停车发券 |
|
|
//停车发券 |
|
|
// params.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode()); |
|
|
|
|
|
// markingCouponDataReportDto.setCouponType(); |
|
|
|
|
|
|
|
|
markingCouponDataReportDto.setChannelType(EnumCouponSendSendType.CAR_STOP.getCode()); |
|
|
List<MarkingSceneDataVo> carStopList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); |
|
|
List<MarkingSceneDataVo> carStopList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); |
|
|
Map<String, Integer> countMap = carStopList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getSendCount())); |
|
|
|
|
|
|
|
|
Map<String, Integer> countMap = carStopList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getSendCount())); |
|
|
for (String date:days) { |
|
|
for (String date:days) { |
|
|
historyMap.put(date.substring(5,date.length()).replace("-","/"),"0"); |
|
|
historyMap.put(date.substring(5,date.length()).replace("-","/"),"0"); |
|
|
} |
|
|
} |
|
|
@@ -468,9 +466,9 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
result.put("carStopHistory",historyMap); |
|
|
result.put("carStopHistory",historyMap); |
|
|
|
|
|
|
|
|
//核销发券 |
|
|
//核销发券 |
|
|
// params.put("channelType", EnumCouponSendSendType.COUPON_VERIFY.getCode()); |
|
|
|
|
|
|
|
|
markingCouponDataReportDto.setChannelType(EnumCouponSendSendType.COUPON_VERIFY.getCode()); |
|
|
List<MarkingSceneDataVo> couponVerifyList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); |
|
|
List<MarkingSceneDataVo> couponVerifyList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); |
|
|
countMap = couponVerifyList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getSendCount())); |
|
|
|
|
|
|
|
|
countMap = couponVerifyList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getSendCount())); |
|
|
historyMap = new TreeMap<>(); |
|
|
historyMap = new TreeMap<>(); |
|
|
for (String date:days) { |
|
|
for (String date:days) { |
|
|
historyMap.put(date.substring(5,date.length()).replace("-","/"),"0"); |
|
|
historyMap.put(date.substring(5,date.length()).replace("-","/"),"0"); |
|
|
@@ -482,9 +480,9 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
result.put("couponVerifyHistory",historyMap); |
|
|
result.put("couponVerifyHistory",historyMap); |
|
|
|
|
|
|
|
|
//交易发券 |
|
|
//交易发券 |
|
|
//params.put("channelType", EnumCouponSendSendType.C_ORDER.getCode()); |
|
|
|
|
|
|
|
|
markingCouponDataReportDto.setChannelType(EnumCouponSendSendType.C_ORDER.getCode()); |
|
|
List<MarkingSceneDataVo> orderList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); |
|
|
List<MarkingSceneDataVo> orderList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); |
|
|
countMap = orderList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getSendCount())); |
|
|
|
|
|
|
|
|
countMap = orderList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getSendCount())); |
|
|
historyMap = new TreeMap<>(); |
|
|
historyMap = new TreeMap<>(); |
|
|
for (String date:days) { |
|
|
for (String date:days) { |
|
|
historyMap.put(date.substring(5,date.length()).replace("-","/"),"0"); |
|
|
historyMap.put(date.substring(5,date.length()).replace("-","/"),"0"); |
|
|
@@ -496,9 +494,9 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
result.put("orderHistory",historyMap); |
|
|
result.put("orderHistory",historyMap); |
|
|
|
|
|
|
|
|
//收银台发券 |
|
|
//收银台发券 |
|
|
// params.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode()); |
|
|
|
|
|
|
|
|
markingCouponDataReportDto.setChannelType(EnumCouponSendSendType.B_MICROPAY.getCode()); |
|
|
List<MarkingSceneDataVo> micropayList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); |
|
|
List<MarkingSceneDataVo> micropayList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); |
|
|
countMap = micropayList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getSendCount())); |
|
|
|
|
|
|
|
|
countMap = micropayList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getSendCount())); |
|
|
historyMap = new TreeMap<>(); |
|
|
historyMap = new TreeMap<>(); |
|
|
for (String date:days) { |
|
|
for (String date:days) { |
|
|
historyMap.put(date.substring(5,date.length()).replace("-","/"),"0"); |
|
|
historyMap.put(date.substring(5,date.length()).replace("-","/"),"0"); |
|
|
|