From 842b9646b5799bc373c82a28c72ac961ea9298e8 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 4 Dec 2018 12:12:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=8F=91=E5=88=B8=E6=95=B0=E6=8D=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MarkingDataReportServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 64c64d8fa..c5cb91207 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -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 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 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);