diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java index 84a3f053a..aa843bf37 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -9,6 +9,7 @@ import com.iformall.domain.po.WxCouponSend; import com.iformall.enums.EnumCouponSendStatus; import com.iformall.enums.EnumCouponSendType; import com.iformall.enums.EnumCouponStatus; +import com.iformall.service.WxCouponActionLogService; import com.iformall.service.WxCouponSendService; import com.iformall.service.WxCouponService; import io.swagger.annotations.ApiImplicitParam; @@ -31,6 +32,8 @@ public class WxCouponSendController extends BaseController { private WxCouponSendService wxCouponSendService; @Autowired private WxCouponService wxCouponService; + @Autowired + private WxCouponActionLogService wxCouponActionLogService; @ApiOperation("分页列表接口") @GetMapping("list") @@ -42,6 +45,10 @@ public class WxCouponSendController extends BaseController { wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); final PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); + + for (WxCouponSend cs:page.getList()) + cs.setSendCount(wxCouponActionLogService.getCountByChannelId(getTenantId(), cs.getSendType(), cs.getId())); + return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index a094be30f..2c3ec2672 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -74,6 +74,12 @@ public class WxCouponSend implements Serializable { /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + + /*场景发券计数**/ + @Transient + protected int sendCount; + + public String getTenantId() { return tenantId; } @@ -141,7 +147,13 @@ public class WxCouponSend implements Serializable { updateDate = _updateDate; } + public int getSendCount() { + return sendCount; + } + public void setSendCount(int sendCount) { + this.sendCount = sendCount; + } public static enum Field { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java index bb267a4ba..ef4d9d768 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java @@ -25,10 +25,8 @@ public interface WxCouponActionLogMapper extends CommonMapper sceneDataList(HashMap params); List sceneDataJoinCouponOrderList(HashMap params); - - - - - + + int getCountByChannelId(@Param("tenantId")String tenantId,@Param("channelType") int channelType,@Param("channelId")Long channelId); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java index be6237dd8..6ef78390c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java @@ -37,13 +37,11 @@ public interface WxCouponActionLogService { */ void deleteById(Long id); + void addOne(String tenantId,Long couponId,Long coupon_order_id,int channelType,Long channelId); - - - - - + + int getCountByChannelId(String tenantId, int channelType, Long channelId); } 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 f9052feee..8e0d06150 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -8,6 +8,7 @@ import com.iformall.domain.vo.MarkingCouponDataReportVo; import com.iformall.domain.vo.MarkingSceneDataReportVo; import com.iformall.domain.vo.MarkingSceneDataVo; import com.iformall.domain.vo.TouchUsersReportVo; +import com.iformall.enums.EnumCouponSendSendType; import com.iformall.enums.EnumCouponType; import com.iformall.mapper.*; import com.iformall.service.MarkingDataReportService; @@ -163,7 +164,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params1.put("tenantId", tenantId); params1.put("startTime", getFirstDayOfMonth()); params1.put("endTime", addDay(1)); - params1.put("channelType", 3);//停车 + params1.put("channelType", EnumCouponSendSendType.CAR_STOP);//停车 List list1 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params1); Map parkCountMap = list1.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getxTime, p -> p.getTempCount())); //核销发券被核销数 @@ -171,7 +172,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params2.put("tenantId", tenantId); params2.put("startTime", getFirstDayOfMonth()); params2.put("endTime", addDay(1)); - params2.put("channelType", 4);//核销 + params2.put("channelType", EnumCouponSendSendType.COUPON_VERIFY);//核销 List list2 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params2); Map verifyCountMap = list2.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getxTime, p -> p.getTempCount())); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java index 1151fb6b3..b4fd31849 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java @@ -59,5 +59,9 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService { saveOrUpdate(actionLog); } + @Override + public int getCountByChannelId(String tenantId, int channelType, Long channelId) { + return wxCouponActionLogMapper.getCountByChannelId(tenantId, channelType, channelId); + } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml index 64f7235cc..1d0705ee3 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml @@ -73,36 +73,66 @@ + + + +