diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java index 12e84ab64..dd19a6a04 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java @@ -15,6 +15,8 @@ public interface WxCouponActionLogMapper extends CommonMapper sceneDataMap(HashMap params); // will be deleted + void updateCreateTimeMd(HashMap params); + List getSceneDataMap(HashMap params); List sceneDataMapJoinCouponOrder(HashMap params); 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 c11425bb5..8c9f75339 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -158,7 +158,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); //停车发券数 停车发券被核销数 核销发券数 核销发券被核销数 - // TODO DELETE sceneDataMap + wxCouponActionLogMapper.updateCreateTimeMd(params); List sceneList = wxCouponActionLogMapper.getSceneDataMap(params); //停车发券被核销数 @@ -207,13 +207,12 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { MarkingSceneDataReportVo msdVo = new MarkingSceneDataReportVo(); msdVo.setXTime(tj); Optional carStop = sceneList.stream().filter(c -> c.getXTime().equals(tj) && c.getChannelType() == EnumCouponSendSendType.CAR_STOP.getCode()).findFirst(); - if(!carStop.isPresent()) { + if (!carStop.isPresent()) { msdVo.setParkSendCount(0); } else { MarkingSceneDataReportTVo tvo = carStop.get(); msdVo.setParkSendCount(tvo.getCount()); } - Optional couponVerify = sceneList.stream().filter(c -> c.getXTime().equals(tj) && c.getChannelType() == EnumCouponSendSendType.COUPON_VERIFY.getCode()).findFirst(); if(!couponVerify.isPresent()) { msdVo.setVerifySendCount(0); @@ -237,6 +236,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { MarkingSceneDataReportTVo tvo = orderSend.get(); msdVo.setOrderSendCount(tvo.getCount()); } + msdVo.setTotal(msdVo.getParkSendCount() + msdVo.getVerifySendCount() + msdVo.getMicroPaySendCount() + diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml index a95022773..8b1aa838e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml @@ -110,6 +110,12 @@ order by create_time_md desc + + update wx_coupon_action_log + set create_time_md = DATE_FORMAT(create_time,'%m/%d') where tenant_id = #{tenantId}; + + +