From 753728e3ea9e0e5128dd25bcd8b42fe49f1b0b8f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 19 Feb 2019 16:03:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=8F=8A?= =?UTF-8?q?=E5=88=B8=E9=A2=91=E9=81=93][=E4=BF=AE=E6=94=B9][=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8F=AF=E8=BD=AC=E8=B5=A0=E5=AD=97=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/vo/WxCouponChannelVo.java | 11 ++++++++++ .../iformall/domain/vo/WxOrderCouponVo.java | 20 +++++++++++++++++++ .../mapper/WxCouponChannelMapper.xml | 6 ++++-- .../main/resources/mapper/WxOrderMapper.xml | 3 ++- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java index 1efbdecb1..824bad5c5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java @@ -67,6 +67,9 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { @Transient private Integer gameWeight; + @io.swagger.annotations.ApiModelProperty(value = "是否可转赠", name = "supportTransfer") + private Integer supportTransfer; + public Integer getGameWeight() { return gameWeight; } @@ -195,4 +198,12 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { public void setMerchantVoList(List merchantVoList) { this.merchantVoList = merchantVoList; } + + public Integer getSupportTransfer() { + return supportTransfer; + } + + public void setSupportTransfer(Integer supportTransfer) { + this.supportTransfer = supportTransfer; + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java index 07bf6d0d4..9475f6950 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java @@ -111,6 +111,10 @@ public class WxOrderCouponVo { @io.swagger.annotations.ApiModelProperty(value="卡券来源",name="sendChannelType") private Integer sendChannelType; + @io.swagger.annotations.ApiModelProperty(value = "是否可转赠", name = "supportTransfer") + private Integer supportTransfer; + + public Long getOrderNumber() { return orderNumber; } @@ -272,4 +276,20 @@ public class WxOrderCouponVo { public void setSendChannelType(Integer sendChannelType) { this.sendChannelType = sendChannelType; } + + public Long getcUserId() { + return cUserId; + } + + public void setcUserId(Long cUserId) { + this.cUserId = cUserId; + } + + public Integer getSupportTransfer() { + return supportTransfer; + } + + public void setSupportTransfer(Integer supportTransfer) { + this.supportTransfer = supportTransfer; + } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index a9790b5ed..4da19c3fa 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -106,7 +106,7 @@ , - c.remain_inventory,c.inventory,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type + c.remain_inventory,c.inventory,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type,c.support_transfer @@ -132,7 +132,9 @@ - + + + o.id,o.order_number,o.tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.detail,c.remark, - co.id as coupon_order_id,co.coupon_order_status + co.id as coupon_order_id,co.coupon_order_status,c.support_transfer @@ -210,6 +210,7 @@ +