diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index 0153247fe..137ada341 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -1,11 +1,11 @@ package com.iformall.domain.po; -import javax.persistence.*; -import java.util.*; -import javax.persistence.Transient; -import java.util.List; import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.Date; +import java.util.List; @Table(name = "wx_coupon_send") public class WxCouponSend implements Serializable { @@ -73,6 +73,16 @@ public class WxCouponSend implements Serializable { @Transient protected int sendCount; + @io.swagger.annotations.ApiModelProperty(value = "1是0否", name = "是否发送短信1是0否") + private Integer sendSms; + + public Integer getSendSms() { + return sendSms; + } + + public void setSendSms(Integer sendSms) { + this.sendSms = sendSms; + } public String getTenantId() { return tenantId; @@ -145,7 +155,7 @@ public class WxCouponSend implements Serializable { ,SendType_ASC("`send_type` ASC"),SendType_DESC("`send_type` DESC") ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") + ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC"), SendSms_ASC("`send_sms` ASC"), SendSms_DESC("`send_sms` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index df27907ce..f4e1e8ac5 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -18,6 +18,9 @@ + + + @@ -29,7 +32,7 @@ else '[多商户通用]' end) as merchant_name, - c.remain_inventory, c.use_limit_quantity, 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,cs.send_sms @@ -80,6 +83,10 @@ #{idItem} + + and cs.send_sms = #{sendSms} + + order by ${sortColumns}