diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index da6989bbf..44c4811df 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -106,7 +106,7 @@ fm: exception: false exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 1 - open: true + open: false logging: level: diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java index 070eb7e7e..c63da00aa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -4,8 +4,6 @@ import com.iformall.common.SortColumn; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.persistence.Transient; import java.io.Serializable; import java.lang.reflect.Field; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java index def8d2b2e..681eb130c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java @@ -75,6 +75,9 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { @Transient private String priceStr; + @Transient + private String qrCode; + @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") private List merchantVoList; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java index 17fcea827..2643b8a34 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java @@ -4,9 +4,7 @@ import com.iformall.domain.po.WxCoupon; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import javax.persistence.Transient; -import java.io.Serializable; /** * @author luozukai diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 768f11b8e..dc70338a1 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -157,12 +157,14 @@ - + + + select + ,mer.qr_code from wx_coupon_channel cc join wx_coupon_merchant cm on cm.product_id = cc.coupon_id @@ -182,6 +185,7 @@ and cm.merchant_id=#{merchantId} left join wx_coupon c on cc.coupon_id = c.id + left join wx_merchant mer on cm.merchant_id = mer.id where cc.`target_ad` in (1,2,5,6,7) and cc.status=#{status}