diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index 5352fb3b7..73ce1f601 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -119,6 +119,10 @@ public class WxCouponOrderCVo extends WxCouponOrder { @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; + /*卡券来源**/ + @io.swagger.annotations.ApiModelProperty(value="卡券来源",name="sendChannelType") + private Integer sendChannelType; + /*发券商户信息*/ @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") private List merchantVoList; @@ -269,5 +273,11 @@ public class WxCouponOrderCVo extends WxCouponOrder { merchantName = _name; } + public Integer getSendChannelType() { + return sendChannelType; + } + public void setSendChannelType(Integer sendChannelType) { + this.sendChannelType = sendChannelType; + } } 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 d8ed80429..0153bacf8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java @@ -104,6 +104,9 @@ public class WxOrderCouponVo { @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") private List merchantVoList; + /*卡券来源**/ + @io.swagger.annotations.ApiModelProperty(value="卡券来源",name="sendChannelType") + private Integer sendChannelType; public Long getOrderNumber() { return orderNumber; @@ -251,4 +254,11 @@ public class WxOrderCouponVo { remark = _remark; } + public Integer getSendChannelType() { + return sendChannelType; + } + + public void setSendChannelType(Integer sendChannelType) { + this.sendChannelType = sendChannelType; + } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index bc7e10121..501dee210 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -507,8 +507,9 @@ co.id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, - c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit - + c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit, + cal.channel_type as send_channel_type + co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, @@ -541,6 +542,8 @@ + + select - from wx_coupon_order co,wx_coupon c + from wx_coupon c,wx_coupon_order co + left join wx_coupon_action_log cal on cal.coupon_order_id = co.id where 1=1 and co.coupon_id = c.id and co.coupon_type != 5 and co.coupon_type != 7 diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index f435368fd..8d0283c13 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -133,7 +133,8 @@ o.id,o.order_number,o.tenant_id,o.c_user_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, - c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit + c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit, + cal.channel_type as send_channel_type @@ -170,6 +171,7 @@ + select - from wx_order o,wx_coupon c - where o.product_id = c.id + from wx_order o,wx_coupon c,wx_coupon_order co + left join wx_coupon_action_log cal on cal.coupon_order_id = co.id + where co.order_id = o.id + and o.product_id = c.id and o.c_user_id = #{cUserId}