diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java index bd0e34f6a..97e018038 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java @@ -7,7 +7,6 @@ import javax.persistence.Id; import javax.persistence.Transient; import java.io.Serializable; import java.math.BigDecimal; -import java.text.DecimalFormat; import java.util.Date; import java.util.List; @JsonIgnoreProperties(value = {"handler"}) @@ -55,6 +54,9 @@ public class WxCouponCVo extends WxCoupon implements Serializable { @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") private List merchantVoList; + @io.swagger.annotations.ApiModelProperty(value = "是否支持转送(0:不支持,1支持)", name = "supportTransfer") + private Integer supportTransfer; + public Long getCouponId() { return couponId; } @@ -125,4 +127,13 @@ public class WxCouponCVo extends WxCoupon implements Serializable { this.priceStr = priceStr; } + @Override + public Integer getSupportTransfer() { + return supportTransfer; + } + + @Override + 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 c510e418c..4440f952e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -150,6 +150,7 @@ cc.id,cc.coupon_id,cc.target_ad,cc.begin_time,cc.end_time, c.tenant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business + c.support_transfer @@ -182,7 +183,9 @@ - + + + + + select c.* from ( select id,tenant_id,0 coupon_id,0 coupon_type,expired_time,`status`as coupon_order_status,create_date,update_date,'' cover_img,title,'' sub_title,'' detail,0 unit, '' remark,amount,remain_amount as remaining_amount,0 support_transfer @@ -683,7 +685,8 @@ union - select + select + from wx_coupon_order co inner join wx_coupon c on co.coupon_id = c.id inner join wx_card_info a on co.id=a.id @@ -707,6 +710,7 @@ #{sItem} + ) c order by ${sortColumns}