|
|
|
@@ -311,9 +311,14 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
vo.setxTime(temp.getXTime()); |
|
|
|
if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())) { |
|
|
|
vo.setSendCount(temp.getParkSendCount()); |
|
|
|
}else{ |
|
|
|
}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 { |
|
|
|
vo.setSendCount(0); |
|
|
|
} |
|
|
|
|
|
|
|
list.add(vo); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -341,7 +346,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
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{ |
|
|
|
} else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())){ |
|
|
|
//核销发券被核销数 |
|
|
|
params.clear(); |
|
|
|
params.put("tenantId", tenantId); |
|
|
|
@@ -378,7 +383,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
params.put("type", EnumOrderType.MICROPAY.getCode()); |
|
|
|
List<MarkingSceneDataVo> markingSceneDataVos = wxOrderMapper.queryForSceneRepotyHistory(params); |
|
|
|
triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getxTime, p -> p.getTriggerCount())); |
|
|
|
} else { |
|
|
|
} else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())) { |
|
|
|
//获取核销数 |
|
|
|
params.clear(); |
|
|
|
params.put("tenantId", tenantId); |
|
|
|
|