diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java index 9895b87f7..19c50b861 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java @@ -2,7 +2,6 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; -import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMerchantSubsidy; import com.iformall.domain.vo.WxMerchantSubsidyVo; @@ -14,8 +13,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - -import java.util.Date; import java.util.Map; @RestController diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index b003a6611..8d17a5d5d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -206,9 +206,21 @@ public class WxCoupon extends BaseEntity { @Transient private Long merchantId; + @io.swagger.annotations.ApiModelProperty(value="投放渠道id",name="couponChannelId") + @Transient + private Long couponChannelId; + //营销分析 private WxCouponStatisVo wxCouponStatisVo; + public Long getCouponChannelId() { + return couponChannelId; + } + + public void setCouponChannelId(Long couponChannelId) { + this.couponChannelId = couponChannelId; + } + public WxCouponStatisVo getWxCouponStatisVo() { return wxCouponStatisVo; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java index b65df2c0a..38c7e9b84 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java @@ -6,7 +6,6 @@ import com.iformall.domain.po.WxMsgConfig; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -84,6 +83,7 @@ public class WxMsg extends BaseMsg{ //用于mq发送消息 private WxMsgConfig wxMsgConfig; + //coupon精准投放 private WxCouponInject couponInject; @Transient diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 5bce4e772..535ebe196 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -21,7 +21,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.NumberFormat; diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index c021c9572..b9e96f149 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -803,7 +803,7 @@