Ver a proveniência

[统计][添加][增加导出待缴商户]

release_toaliyun_real
luozukai há 7 anos
ascendente
cometimento
c7c7c7b6d9
5 ficheiros alterados com 14 adições e 6 eliminações
  1. +0
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java
  2. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java
  4. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 0
- 3
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java Ver ficheiro

@@ -2,7 +2,6 @@ package com.iformall.controller;


import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.po.WxMerchantSubsidy; import com.iformall.domain.po.WxMerchantSubsidy;
import com.iformall.domain.vo.WxMerchantSubsidyVo; import com.iformall.domain.vo.WxMerchantSubsidyVo;
@@ -14,8 +13,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

import java.util.Date;
import java.util.Map; import java.util.Map;


@RestController @RestController


+ 12
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java Ver ficheiro

@@ -206,9 +206,21 @@ public class WxCoupon extends BaseEntity {
@Transient @Transient
private Long merchantId; private Long merchantId;


@io.swagger.annotations.ApiModelProperty(value="投放渠道id",name="couponChannelId")
@Transient
private Long couponChannelId;

//营销分析 //营销分析
private WxCouponStatisVo wxCouponStatisVo; private WxCouponStatisVo wxCouponStatisVo;


public Long getCouponChannelId() {
return couponChannelId;
}

public void setCouponChannelId(Long couponChannelId) {
this.couponChannelId = couponChannelId;
}

public WxCouponStatisVo getWxCouponStatisVo() { public WxCouponStatisVo getWxCouponStatisVo() {
return wxCouponStatisVo; return wxCouponStatisVo;
} }


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java Ver ficheiro

@@ -6,7 +6,6 @@ import com.iformall.domain.po.WxMsgConfig;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;

import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient; import javax.persistence.Transient;
@@ -84,6 +83,7 @@ public class WxMsg extends BaseMsg{


//用于mq发送消息 //用于mq发送消息
private WxMsgConfig wxMsgConfig; private WxMsgConfig wxMsgConfig;
//coupon精准投放
private WxCouponInject couponInject; private WxCouponInject couponInject;


@Transient @Transient


+ 0
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java Ver ficheiro

@@ -21,7 +21,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.NumberFormat; import java.text.NumberFormat;


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Ver ficheiro

@@ -803,7 +803,7 @@
</select> </select>


<select id="findByMerchant" parameterType="com.iformall.domain.po.WxCoupon" resultType="com.iformall.domain.po.WxCoupon"> <select id="findByMerchant" parameterType="com.iformall.domain.po.WxCoupon" resultType="com.iformall.domain.po.WxCoupon">
select c.*,wcc.target_ad targetAd from wx_coupon c inner join wx_coupon_channel wcc
select c.*,wcc.target_ad targetAd,wcc.id couponChannelId from wx_coupon c inner join wx_coupon_channel wcc
on wcc.coupon_id = c.id on wcc.coupon_id = c.id
left join wx_coupon_merchant wc on wc.product_id = c.id where 1=1 left join wx_coupon_merchant wc on wc.product_id = c.id where 1=1
<if test="merchantId != null"> <if test="merchantId != null">


Carregando…
Cancelar
Guardar