diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
index 26fa601b7..692cd5442 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
@@ -66,76 +66,76 @@ public class WxCoupon implements Serializable {
@Transient
private String merchantParams;
- /*租户ID**/
+ /**租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
- /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/
- @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type")
+ /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,7.类储值卡,8.砍价券,9.团购券)**/
+ @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,7.类储值卡,8.砍价券,9.团购券)",name="type")
private Integer type;
- /*封面图**/
+ /**封面图**/
@io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg")
private String coverImg;
- /*券名称**/
+ /**券名称**/
@io.swagger.annotations.ApiModelProperty(value="券名称",name="title")
private String title;
- /*副标题**/
+ /**副标题**/
@io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle")
private String subTitle;
- /*售价(适用于类型2,3,4,5)**/
- @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5)",name="salePrice")
+ /**售价(适用于类型2,3,4,5, 6, 7, 8, 9)**/
+ @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5, 6, 7, 8, 9)",name="salePrice")
private Integer salePrice;
- /*使用条件金额(适用于类型1,2,3,4)**/
+ /**使用条件金额(适用于类型1,2,3,4)**/
@io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice")
private Integer usePrice;
- /*限领张数**/
+ /**限领张数**/
@io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity")
private Integer useLimitQuantity;
- /*1.主动领取2.定向投放**/
+ /**1.主动领取2.定向投放**/
@io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType")
private Integer sendType;
- /*有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)**/
+ /**有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)**/
@io.swagger.annotations.ApiModelProperty(value="有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)",name="validType")
private Integer validType;
- /*有效日期-开始**/
+ /**有效日期-开始**/
@io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate")
private Date validStartDate;
- /*有效日期-结束**/
+ /**有效日期-结束**/
@io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate")
private Date validEndDate;
- /*自领取之日几日有效,(停车券当天有效)**/
+ /**自领取之日几日有效,(停车券当天有效)**/
@io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays")
private Integer validDays;
- /*须知**/
+ /**须知**/
@io.swagger.annotations.ApiModelProperty(value="须知",name="detail")
private String detail;
- /*面额**/
+ /**面额**/
@io.swagger.annotations.ApiModelProperty(value="面额",name="price")
private Integer price;
- /*单位**/
+ /**单位**/
@io.swagger.annotations.ApiModelProperty(value="单位(0:rmb分 1:小时)",name="unit")
private Integer unit;
- /*剩余库存**/
+ /**剩余库存**/
@io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory")
private Integer remainInventory;
- /*总库存**/
+ /**总库存**/
@io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory")
private Integer inventory;
- /*购买须知**/
+ /**购买须知**/
@io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark")
private String remark;
- /*状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)**/
+ /**状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)**/
@io.swagger.annotations.ApiModelProperty(value="状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)",name="status")
private Integer status;
- /*创建时间**/
+ /**创建时间**/
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;
- /*更新时间**/
+ /**更新时间**/
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;
- /*业态**/
+ /**业态**/
@io.swagger.annotations.ApiModelProperty(value="业态",name="business")
private Integer business;
- /*是否支持转送(0:不支持,1支持)**/
+ /**是否支持转送(0:不支持,1支持)**/
@io.swagger.annotations.ApiModelProperty(value="是否支持转送(0:不支持,1支持)",name="supportTransfer")
private Integer supportTransfer;
/**补贴类型(0:不支持, 1:微信支付立减与折扣, 2:线下结算, 3:微信付款到银行卡 )**/
@@ -145,6 +145,14 @@ public class WxCoupon implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="补贴额",name="subsidyNum")
private Integer subsidyNum;
+ /**砍价/团购限制人数**/
+ @io.swagger.annotations.ApiModelProperty(value="砍价/团购限制人数",name="pressLimitNum")
+ private Integer pressLimitNum;
+
+ /**砍价限制时间**/
+ @io.swagger.annotations.ApiModelProperty(value="砍价限制时间",name="pressLimitHours")
+ private Integer pressLimitHours;
+
public String getTenantId() {
return tenantId;
}
@@ -385,6 +393,21 @@ public class WxCoupon implements Serializable {
this.subsidyNum = subsidyNum;
}
+ public Integer getPressLimitNum() {
+ return pressLimitNum;
+ }
+
+ public void setPressLimitNum(Integer pressLimitNum) {
+ this.pressLimitNum = pressLimitNum;
+ }
+
+ public Integer getPressLimitHours() {
+ return pressLimitHours;
+ }
+
+ public void setPressLimitHours(Integer pressLimitHours) {
+ this.pressLimitHours = pressLimitHours;
+ }
public static enum Field
{
diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
index bca5a8da5..140fcbfbd 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
@@ -29,12 +29,15 @@
+
+
`id`,`tenant_id`,`type`,`cover_img`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`,
`valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`,
- `remark`,`status`,`create_date`,`update_date`,`business`,`support_transfer`,`subsidy_num`,`subsidy_type`
+ `remark`,`status`,`create_date`,`update_date`,`business`,`support_transfer`,`subsidy_num`,`subsidy_type`,
+ `press_limit_num`, `press_limit_hours`
@@ -148,6 +151,14 @@
and `subsidy_num` = #{subsidyNum}
+
+ and `press_limit_num` = #{pressLimitNum}
+
+
+
+ and `press_limit_hours` = #{pressLimitHours}
+
+
and id in
@@ -275,6 +286,14 @@
and `subsidy_num` = #{subsidyNum}
+
+ and `press_limit_num` = #{pressLimitNum}
+
+
+
+ and `press_limit_hours` = #{pressLimitHours}
+
+
and id in
@@ -402,6 +421,14 @@
and `subsidy_num` = #{subsidyNum}
+
+ and `press_limit_num` = #{pressLimitNum}
+
+
+
+ and `press_limit_hours` = #{pressLimitHours}
+
+
and id in
@@ -446,6 +473,8 @@
+
+