| @@ -21,6 +21,11 @@ public class WxCouponSendVo extends WxCouponSend implements Serializable{ | |||||
| /*剩余库存**/ | /*剩余库存**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory") | @io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory") | ||||
| private Integer remainInventory; | private Integer remainInventory; | ||||
| /**限领张数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity") | |||||
| private Integer useLimitQuantity; | |||||
| /*总库存**/ | /*总库存**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") | @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") | ||||
| private Integer inventory; | private Integer inventory; | ||||
| @@ -67,4 +72,12 @@ public class WxCouponSendVo extends WxCouponSend implements Serializable{ | |||||
| public void setMerchantName(String merchantName) { | public void setMerchantName(String merchantName) { | ||||
| this.merchantName = merchantName; | this.merchantName = merchantName; | ||||
| } | } | ||||
| public Integer getUseLimitQuantity() { | |||||
| return useLimitQuantity; | |||||
| } | |||||
| public void setUseLimitQuantity(Integer useLimitQuantity) { | |||||
| this.useLimitQuantity = useLimitQuantity; | |||||
| } | |||||
| } | } | ||||
| @@ -15,6 +15,7 @@ | |||||
| <result column="merchant_name" jdbcType="VARCHAR" property="merchantName" /> | <result column="merchant_name" jdbcType="VARCHAR" property="merchantName" /> | ||||
| <result column="remain_inventory" jdbcType="INTEGER" property="remainInventory"/> | <result column="remain_inventory" jdbcType="INTEGER" property="remainInventory"/> | ||||
| <result column="inventory" jdbcType="INTEGER" property="inventory"/> | <result column="inventory" jdbcType="INTEGER" property="inventory"/> | ||||
| <result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/> | |||||
| <result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate"/> | <result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate"/> | ||||
| <result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/> | <result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/> | ||||
| </resultMap> | </resultMap> | ||||
| @@ -28,7 +29,7 @@ | |||||
| else | else | ||||
| '[多商户通用]' | '[多商户通用]' | ||||
| end) as merchant_name, | end) as merchant_name, | ||||
| c.remain_inventory, c.inventory, c.valid_start_date, c.valid_end_date | |||||
| c.remain_inventory, c.use_limit_quantity, c.inventory, c.valid_start_date, c.valid_end_date | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||