| @@ -118,6 +118,11 @@ public class WxCouponChannel implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "小程序二维码scene", name = "weaAppScene") | @io.swagger.annotations.ApiModelProperty(value = "小程序二维码scene", name = "weaAppScene") | ||||
| private String weaAppScene; | private String weaAppScene; | ||||
| /**积分售价(适用于类型10,11)**/ | |||||
| @Transient | |||||
| @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") | |||||
| private Integer creditPrice; | |||||
| public String getTenantId() { | public String getTenantId() { | ||||
| return tenantId; | return tenantId; | ||||
| @@ -227,7 +232,15 @@ public class WxCouponChannel implements Serializable { | |||||
| this.supportTransfer = supportTransfer; | 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) | if(type == null) | ||||
| return "pages/index/index"; | return "pages/index/index"; | ||||
| if(!type.equals(EnumCouponType.COUPON_GROUP.getCode())) { | if(!type.equals(EnumCouponType.COUPON_GROUP.getCode())) { | ||||
| @@ -120,7 +120,7 @@ | |||||
| <include refid="allColumns" />, | <include refid="allColumns" />, | ||||
| c.remain_inventory,c.inventory,c.cover_img,c.title,c.sub_title,c.sale_price, | 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.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 | |||||
| </sql> | </sql> | ||||
| <resultMap id="CouponChannelVoMap" type="com.iformall.domain.vo.WxCouponChannelVo"> | <resultMap id="CouponChannelVoMap" type="com.iformall.domain.vo.WxCouponChannelVo"> | ||||