| @@ -36,6 +36,7 @@ public class WxLevelMerchant implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="折扣率(0-100折扣)",name="discount") | @io.swagger.annotations.ApiModelProperty(value="折扣率(0-100折扣)",name="discount") | ||||
| private Integer discount; | private Integer discount; | ||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Transient; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -34,4 +35,8 @@ public class WxLevelMerchantCVo implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="折扣",name="discount") | @io.swagger.annotations.ApiModelProperty(value="折扣",name="discount") | ||||
| private Integer discount; | private Integer discount; | ||||
| @Transient | |||||
| @io.swagger.annotations.ApiModelProperty(value = "客服电话", name = "linkLinePhone") | |||||
| private String linkLinePhone; | |||||
| } | } | ||||
| @@ -69,6 +69,9 @@ | |||||
| <result column="discount" jdbcType="INTEGER" property="discount"/> | <result column="discount" jdbcType="INTEGER" property="discount"/> | ||||
| <result column="link_line_phone" property="linkLinePhone"/> | |||||
| <collection column="{merchantId=id}" property="shopVoList" | <collection column="{merchantId=id}" property="shopVoList" | ||||
| ofType="com.iformall.domain.vo.WxShopVo" | ofType="com.iformall.domain.vo.WxShopVo" | ||||
| javaType="java.util.List" | javaType="java.util.List" | ||||
| @@ -78,7 +81,7 @@ | |||||
| <sql id="allCVoColumns"> | <sql id="allCVoColumns"> | ||||
| m.id,m.name,m.link_phone, | m.id,m.name,m.link_phone, | ||||
| lm.discount | |||||
| lm.discount,m.link_line_phone | |||||
| </sql> | </sql> | ||||
| <sql id="allCVoDynamicWhereConditions"> | <sql id="allCVoDynamicWhereConditions"> | ||||