From d6ae7439191efd367c9bafc9490c3d3a24a7496b Mon Sep 17 00:00:00 2001 From: hanxueda Date: Mon, 15 Apr 2019 19:55:43 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E6=96=B0=E5=A2=9E]:?= =?UTF-8?q?=E6=8A=95=E6=94=BE=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E5=94=AE=E4=BB=B7=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxCouponChannel.java | 15 ++++++++++++++- .../resources/mapper/WxCouponChannelMapper.xml | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) 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 1b92944b4..1a4c40331 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -118,6 +118,11 @@ public class WxCouponChannel implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "小程序二维码scene", name = "weaAppScene") private String weaAppScene; + /**积分售价(适用于类型10,11)**/ + @Transient + @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") + private Integer creditPrice; + public String getTenantId() { return tenantId; @@ -227,7 +232,15 @@ public class WxCouponChannel implements Serializable { this.supportTransfer = supportTransfer; } - public String getWeaAppPath() { + public Integer getCreditPrice() { + return creditPrice; + } + + public void setCreditPrice(Integer creditPrice) { + this.creditPrice = creditPrice; + } + + public String getWeaAppPath() { if(type == null) return "pages/index/index"; if(!type.equals(EnumCouponType.COUPON_GROUP.getCode())) { diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 30c322ab9..675aff071 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -120,7 +120,7 @@ , c.remain_inventory,c.inventory,c.cover_img,c.title,c.sub_title,c.sale_price, c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type,c.support_transfer,c.press_limit_num,c.auto_refund, - c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days + c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.credit_price