diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java index 826cdf8a5..f7e468b63 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java @@ -36,6 +36,7 @@ public class WxLevelMerchant implements Serializable { @io.swagger.annotations.ApiModelProperty(value="折扣率(0-100折扣)",name="discount") private Integer discount; + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxLevelMerchantCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxLevelMerchantCVo.java index d65721d7b..cb3b9bdf4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxLevelMerchantCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxLevelMerchantCVo.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import javax.persistence.Id; +import javax.persistence.Transient; import java.io.Serializable; import java.util.List; @@ -34,4 +35,8 @@ public class WxLevelMerchantCVo implements Serializable { @io.swagger.annotations.ApiModelProperty(value="折扣",name="discount") private Integer discount; + @Transient + @io.swagger.annotations.ApiModelProperty(value = "客服电话", name = "linkLinePhone") + private String linkLinePhone; + } diff --git a/mallinkService/src/main/resources/mapper/WxLevelMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelMerchantMapper.xml index f0d859c96..649b0783a 100644 --- a/mallinkService/src/main/resources/mapper/WxLevelMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLevelMerchantMapper.xml @@ -69,6 +69,9 @@ + + + m.id,m.name,m.link_phone, - lm.discount + lm.discount,m.link_line_phone