diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MarkingSceneDataReportVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/MarkingSceneDataReportVo.java index ca6caa7e7..12bca30f4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MarkingSceneDataReportVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MarkingSceneDataReportVo.java @@ -13,6 +13,7 @@ public class MarkingSceneDataReportVo { private int verifySendCount; // 核销发放 private int microPaySendCount; // B端刷卡支付发放 private int orderSendCount; // 购买发放数 + private int merchantSendCount; // 商户发放数 private int parkCount; // 停车核销数 private int verifyCount; // 核销核销数 private int microPayCount; // 核销核销数 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 e9c45dbc6..d746c80b4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -188,7 +188,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //处理数据 wxCouponActionLogService.updateCreateTimeMd(tenantEntity); - Map sceneMap = wxCouponActionLogService.getSceneDataMap(tenantEntity,addDay(-30),addDay(1)); + Map sceneMap = wxCouponActionLogService.getSceneDataMap(tenantEntity,addDay(-30),addDay(1));//2,3,4,5,7 String startdate = DateUtils.getTimeBefore(30, new Date()); String enddate = DateUtils.getTimeBefore(1,new Date()); @@ -206,12 +206,15 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { Integer count4 = sceneMap.get(tj + "_" + EnumCouponSendSendType.B_MICROPAY.getCode()); msdVo.setMicroPaySendCount(count4==null?0:count4); Integer count5 = sceneMap.get(tj + "_" + EnumCouponSendSendType.C_ORDER.getCode()); - msdVo.setMicroPaySendCount(count5==null?0:count5); + msdVo.setOrderSendCount(count5==null?0:count5); + Integer count6 = sceneMap.get(tj + "_" + EnumCouponSendSendType.MERCHANT.getCode()); + msdVo.setMerchantSendCount(count6==null?0:count6); msdVo.setTotal(msdVo.getParkSendCount() + msdVo.getVerifySendCount() + msdVo.getMicroPaySendCount() + - msdVo.getOrderSendCount()); + msdVo.getOrderSendCount() + + msdVo.getMerchantSendCount()); tempDatalist.add(msdVo); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml index 557d7b6e1..413734aee 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml @@ -134,11 +134,23 @@ and `parent_tenant_id` = #{parentTenantId} - ) as orderSendCount + ) as orderSendCount, + (select Count(*) from ( + SELECT * from wx_coupon_action_log${tenantEntity.shardTableSuffix} + ) c + where DATE_FORMAT(create_time,'%m/%d')=xTime + and c.channel_type=7 + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + ) as merchantSendCount from ( SELECT * from wx_coupon_action_log${tenantEntity.shardTableSuffix} ) wx_coupon_action_log - where channel_type in (2,3,4,5) + where channel_type in (2,3,4,5,7) and `tenant_id` = #{tenantId} @@ -154,7 +166,7 @@ select COUNT(*) FROM wx_coupon_action_log - where `channel_type` != 0 - and `channel_type` != 1 + where channel_type in (2,3,4,5,7) and `tenant_id` = #{tenantId} and `create_time` >= #{startTime} and `create_time` <= #{endTime}