From 6ef51c92b3c63c73d1aab3a0391cb76b7431e548 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 25 Jan 2019 11:00:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8F=91=E5=88=B8][=E6=96=B0=E5=A2=9E]:?= =?UTF-8?q?=E5=8F=91=E5=88=B8=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=99=90=E9=A2=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/vo/WxCouponSendVo.java | 13 +++++++++++++ .../main/resources/mapper/WxCouponSendMapper.xml | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java index 1468dfaaa..ed760f3ba 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java @@ -21,6 +21,11 @@ public class WxCouponSendVo extends WxCouponSend implements Serializable{ /*剩余库存**/ @io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory") private Integer remainInventory; + + /**限领张数**/ + @io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity") + private Integer useLimitQuantity; + /*总库存**/ @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") private Integer inventory; @@ -67,4 +72,12 @@ public class WxCouponSendVo extends WxCouponSend implements Serializable{ public void setMerchantName(String merchantName) { this.merchantName = merchantName; } + + public Integer getUseLimitQuantity() { + return useLimitQuantity; + } + + public void setUseLimitQuantity(Integer useLimitQuantity) { + this.useLimitQuantity = useLimitQuantity; + } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index 2a05c53d3..56cf63396 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -15,6 +15,7 @@ + @@ -28,7 +29,7 @@ else '[多商户通用]' 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