| @@ -71,7 +71,7 @@ public class WxCoupon implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)**/ | /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)",name="type") | |||||
| @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,10.积分券,11积分停车券,100.消费卡)",name="type") | |||||
| private Integer type; | private Integer type; | ||||
| /**封面图**/ | /**封面图**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | ||||
| @@ -159,6 +159,14 @@ public class WxCoupon implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="砍价限制时间",name="pressLimitHours") | @io.swagger.annotations.ApiModelProperty(value="砍价限制时间",name="pressLimitHours") | ||||
| private Integer pressLimitHours; | private Integer pressLimitHours; | ||||
| /**积分售价(适用于类型10,11)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") | |||||
| private Integer creditPrice; | |||||
| /**过期退积分(0:正常,1不退)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="过期退积分(0:正常,1不退)",name="autoRefund") | |||||
| private Integer creditRefund; | |||||
| @Transient | @Transient | ||||
| private String merchantParams; | private String merchantParams; | ||||
| @@ -453,6 +461,22 @@ public class WxCoupon implements Serializable { | |||||
| this.targetAd = targetAd; | this.targetAd = targetAd; | ||||
| } | } | ||||
| public Integer getCreditPrice() { | |||||
| return creditPrice; | |||||
| } | |||||
| public void setCreditPrice(Integer creditPrice) { | |||||
| this.creditPrice = creditPrice; | |||||
| } | |||||
| public Integer getCreditRefund() { | |||||
| return creditRefund; | |||||
| } | |||||
| public void setCreditRefund(Integer creditRefund) { | |||||
| this.creditRefund = creditRefund; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||