From a914fcacc77773e12d1e9221134779a6f419c5a4 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 29 Aug 2018 14:24:39 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF][=E4=BF=AE=E6=94=B9]:=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=B7=B2=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E5=88=B8=E7=A0=81=E5=92=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/domain/vo/WxOrderCVo.java | 20 ++++++++++++++++++- .../main/resources/mapper/WxOrderMapper.xml | 9 +++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxOrderCVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxOrderCVo.java index 4c8d4a504..eab3cbddb 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/WxOrderCVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxOrderCVo.java @@ -85,6 +85,13 @@ public class WxOrderCVo extends WxCouponOrder{ private Date updateDate; + /*券ID-产品ID将来的产品都会放在coupon表里**/ + @io.swagger.annotations.ApiModelProperty(value="券包中券ID",name="couponOrderId") + private Long couponOrderId; + /*0: 未使用 1: 已核销 2:已过期 3:已退款**/ + @io.swagger.annotations.ApiModelProperty(value="0: 未使用 1: 已核销 2:已过期 3:已退款",name="couponOrderStatus") + private Integer couponOrderStatus; + /* 券类型信息 */ /*商户id**/ /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ @@ -179,7 +186,6 @@ public class WxOrderCVo extends WxCouponOrder{ public Long getCouponId() { return couponId; } - public void setCouponId(Long _couponId) { this.couponId = _couponId; } @@ -221,6 +227,18 @@ public class WxOrderCVo extends WxCouponOrder{ updateDate = _updateDate; } + public Long getCouponOrderId() { + return couponOrderId; + } + public void setCouponOrderId(Long _couponOrderId) { + this.couponOrderId = _couponOrderId; + } + public Integer getCouponOrderStatus() { + return couponOrderStatus; + } + public void setCouponOrderStatus(Integer _couponOrderStatus) { + couponOrderStatus = _couponOrderStatus; + } public Integer getType() { return type; diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 9c69380ba..50ac00a0f 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -138,7 +138,8 @@ co.type,co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price,co.detail,co.remark, m.img_url,m.name,m.link_phone,m.status, s.addr,s.shop_number,s.baidu_poi, - mb.building_name,mf.floor_name + mb.building_name,mf.floor_name, + c.id as coupon_order_id,c.coupon_order_status @@ -167,6 +168,9 @@ + + + @@ -199,7 +203,8 @@