From bcb41c4f09e20333217d1bbc063561a755d37363 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 12 Oct 2019 10:35:03 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E5=88=B8][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=9F=A5=E8=AF=A2=E5=8F=AF=E4=BB=A5=E6=8D=A2?= =?UTF-8?q?=E8=B4=AD=E7=9A=84=E7=A7=AF=E5=88=86=E5=88=B8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/WxCouponChannel.java | 4 ++++ .../src/main/resources/mapper/WxCouponChannelMapper.xml | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index fb5cb91c5..9cd9818c6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -88,6 +88,10 @@ public class WxCouponChannel extends BaseEntity { @TableField(exist = false) private Long merchantId; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value = "用户积分", name = "userCredit") + private Integer userCredit; + public String getWeappPath() { if(type == null) return "pages/index/index"; diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 282ec1180..63e426d54 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -91,6 +91,11 @@ and c.`support_transfer` = #{supportTransfer} + + and c.`credit_price` <= #{userCredit} + + + and cc.id in