|
|
|
@@ -315,6 +315,11 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); |
|
|
|
queryDto.setEndTime(convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); |
|
|
|
} |
|
|
|
|
|
|
|
//TODO 商户发券数据,下个版本需求 |
|
|
|
if(Objects.equals(markingCouponDataReportDto.getType(),EnumCouponSendSendType.MERCHANT.getCode())) { |
|
|
|
markingCouponDataReportDto.setType(null); |
|
|
|
} |
|
|
|
//停车发券数 停车发券被核销数, 核销发券数 核销发券被核销数, B端刷卡支付发券数 刷卡支付发券被核销数 |
|
|
|
PageHelper.startPage(pageIndex, pageSize); |
|
|
|
List<MarkingSceneDataVo> list; |
|
|
|
@@ -331,6 +336,9 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.C_ORDER.getCode())){ |
|
|
|
queryDto.setChannelType(EnumCouponSendSendType.C_ORDER.getCode()); |
|
|
|
list = wxCouponActionLogMapper.sceneDataList(queryDto); |
|
|
|
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.MERCHANT.getCode())){ |
|
|
|
queryDto.setChannelType(markingCouponDataReportDto.getType()); |
|
|
|
list = wxCouponActionLogMapper.sceneDataList(queryDto); |
|
|
|
}else{ |
|
|
|
PageHelper.clearPage(); |
|
|
|
list = new ArrayList<>(); |
|
|
|
@@ -382,6 +390,17 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
params.put("channelType", EnumCouponSendSendType.C_ORDER.getCode()); |
|
|
|
List<MarkingSceneDataReportVo> list4 = wxCouponActionLogMapper.sceneDataJoinCouponOrderList(params); |
|
|
|
countMap = list4.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); |
|
|
|
} else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.MERCHANT.getCode())){ |
|
|
|
//购买发数 |
|
|
|
params.clear(); |
|
|
|
params.put("tenantId", tenantId); |
|
|
|
if (markingCouponDataReportDto.getStartTime() != null) |
|
|
|
params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); |
|
|
|
if (markingCouponDataReportDto.getEndTime() != null) |
|
|
|
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); |
|
|
|
params.put("channelType", markingCouponDataReportDto.getType()); |
|
|
|
List<MarkingSceneDataReportVo> list5 = wxCouponActionLogMapper.sceneDataJoinCouponOrderList(params); |
|
|
|
countMap = list5.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); |
|
|
|
} |
|
|
|
|
|
|
|
Map<String, Integer> triggerCountMap = new HashMap<>(); |
|
|
|
@@ -429,6 +448,17 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); |
|
|
|
List<MarkingSceneDataVo> markingSceneDataVos = wxCouponOrderMapper.queryForSceneRepotyHistoryOrdered(params); |
|
|
|
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); |
|
|
|
}else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.MERCHANT.getCode())) { |
|
|
|
//购买发券数 |
|
|
|
params.clear(); |
|
|
|
params.put("tenantId", tenantId); |
|
|
|
if (markingCouponDataReportDto.getStartTime() != null) |
|
|
|
params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); |
|
|
|
if (markingCouponDataReportDto.getEndTime() != null) |
|
|
|
params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); |
|
|
|
params.put("channelType", markingCouponDataReportDto.getType()); |
|
|
|
List<MarkingSceneDataVo> markingSceneDataVos = wxCouponOrderMapper.queryForSceneRepotyMechantHistoryOrdered(params); |
|
|
|
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); |
|
|
|
} |
|
|
|
NumberFormat nf = NumberFormat.getPercentInstance(); |
|
|
|
nf.setMinimumFractionDigits(2); |
|
|
|
|