From c4cd748b7da44327c6e5cd824a5e80c2c5dea85f Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 15 Nov 2018 16:09:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=9C=BA=E6=99=AF=E8=90=A5=E9=94=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE][=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MarkingDataReportServiceImpl.java | 37 ++++++++++--------- .../mapper/WxCouponActionLogMapper.xml | 2 +- 2 files changed, 21 insertions(+), 18 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 232dfbc0f..95017bc52 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -192,7 +192,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params1.put("tenantId", tenantId); params1.put("startTime", getFirstDayOfMonth()); params1.put("endTime", addDay(1)); - params1.put("channelType", EnumCouponSendSendType.CAR_STOP);//停车 + params1.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode());//停车 List list1 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params1); Map parkCountMap = list1.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); //核销发券被核销数 @@ -200,7 +200,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params2.put("tenantId", tenantId); params2.put("startTime", getFirstDayOfMonth()); params2.put("endTime", addDay(1)); - params2.put("channelType", EnumCouponSendSendType.COUPON_VERIFY);//核销 + params2.put("channelType", EnumCouponSendSendType.COUPON_VERIFY.getCode());//核销 List list2 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params2); Map verifyCountMap = list2.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); // B端刷卡支付被核销数 @@ -209,8 +209,8 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params3.put("tenantId", tenantId); params3.put("startTime", getFirstDayOfMonth()); params3.put("endTime", addDay(1)); - params3.put("channelType", EnumCouponSendSendType.B_MICROPAY);//B端刷卡支付 - List list3 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params2); + params3.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode());//B端刷卡支付 + List list3 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params3); Map microPayCountMap = list2.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); for (MarkingSceneDataReportVo vo : list) { @@ -228,20 +228,23 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { for(String tj:tjList){ Optional first = list.stream().filter(c -> c.getXTime().equals(tj)).findFirst(); if(!first.isPresent()){ - MarkingSceneDataReportVo markingSceneDataReportVo = new MarkingSceneDataReportVo(); - markingSceneDataReportVo.setXTime(tj); - markingSceneDataReportVo.setCarCount(0); - markingSceneDataReportVo.setParkCount(0); - markingSceneDataReportVo.setVerifyCount(0); - markingSceneDataReportVo.setMicroPayCount(0); - markingSceneDataReportVo.setTempCount(0); - markingSceneDataReportVo.setParkSendCount(0); - markingSceneDataReportVo.setVerifySendCount(0); - markingSceneDataReportVo.setMicroPaySendCount(0); - tempDatalist.add(markingSceneDataReportVo); + MarkingSceneDataReportVo msdVo = new MarkingSceneDataReportVo(); + msdVo.setXTime(tj); + msdVo.setCarCount(0); + msdVo.setParkCount(0); + msdVo.setVerifyCount(0); + msdVo.setMicroPayCount(0); + msdVo.setTempCount(0); + msdVo.setParkSendCount(0); + msdVo.setVerifySendCount(0); + msdVo.setMicroPaySendCount(0); + msdVo.setTotal(0); + tempDatalist.add(msdVo); continue; } - tempDatalist.add(first.get()); + MarkingSceneDataReportVo msdVo = first.get(); + msdVo.setTotal(msdVo.getParkSendCount() + msdVo.getVerifySendCount() + msdVo.getMicroPaySendCount()); + tempDatalist.add(msdVo); } @@ -332,7 +335,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params.put("startTime", convertDate(markingCouponDataReportDto.getStartTime())); if (markingCouponDataReportDto.getEndTime() != null) params.put("endTime", convertDateAndAdd(convertDate(markingCouponDataReportDto.getEndTime()), 1)); - params.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode()); + params.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode()); List list1 = wxCouponActionLogMapper.sceneDataJoinCouponOrderList(params); countMap = list1.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); } else{ diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml index 9b78a215b..df851733e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml @@ -101,7 +101,7 @@ select DATE_FORMAT(create_date,'%m/%d') AS xTime,COUNT(wx_coupon_order.id) as tempCount from wx_coupon_action_log left join wx_coupon_order on wx_coupon_action_log.coupon_order_id=wx_coupon_order.id where wx_coupon_action_log.tenant_id=#{tenantId} - and wx_coupon_order.coupon_order_status = 1 + ----- and wx_coupon_order.coupon_order_status = 1 ---- and wx_coupon_action_log.create_time >= #{startTime} and wx_coupon_action_log.create_time <= #{endTime} and wx_coupon_action_log.channel_type = #{channelType}