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 03f9f7af1..d65721d7b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxLevelMerchantCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxLevelMerchantCVo.java @@ -1,10 +1,13 @@ package com.iformall.domain.vo; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import javax.persistence.Id; import java.io.Serializable; +import java.util.List; +@JsonIgnoreProperties(value = {"handler"}) @Data public class WxLevelMerchantCVo implements Serializable { private static final long serialVersionUID = 6687964942922444531L; @@ -17,6 +20,7 @@ public class WxLevelMerchantCVo implements Serializable { private String merchantName; @io.swagger.annotations.ApiModelProperty(value="商户联系方式",name="linkPhone") private String merchantLinkPhone; + @io.swagger.annotations.ApiModelProperty(value="商铺编号",name="shopNumber") private String shopNumber; @io.swagger.annotations.ApiModelProperty(value="楼座",name="buildingName") @@ -24,6 +28,9 @@ public class WxLevelMerchantCVo implements Serializable { @io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName") private String floorName; + @io.swagger.annotations.ApiModelProperty(value = "店铺列表", name = "shopVoList") + private List shopVoList; + @io.swagger.annotations.ApiModelProperty(value="折扣",name="discount") private Integer discount; diff --git a/mallinkService/src/main/resources/mapper/WxLevelMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelMerchantMapper.xml index dede7d7c5..f0d859c96 100644 --- a/mallinkService/src/main/resources/mapper/WxLevelMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLevelMerchantMapper.xml @@ -1,119 +1,114 @@ - - - - - - - - - - + + + + + + + + + + `id`,`tenant_id`,`merchant_id`,`level_id`,`create_date`,`discount` - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` = #{tenantId} - - - - - and `merchant_id` = #{merchantId} - - - - - and `level_id` = #{levelId} - - - - - and `create_date` = #{createDate} - - - - - and `discount` = #{discount} - - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - - - - - - - - - - + + where 1 = 1 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + + and `merchant_id` = #{merchantId} + + + + and `level_id` = #{levelId} + + + + and `create_date` = #{createDate} + + + + and `discount` = #{discount} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + + + + + + + + + + + + m.id,m.name,m.link_phone, - s.shop_number, - mb.building_name, - mf.floor_name, lm.discount - - where 1 = 1 + + where 1 = 1 - - and lm.tenant_id = #{tenantId} - + + and lm.tenant_id = #{tenantId} + - - and lm.merchant_id = #{merchantId} - + + and lm.merchant_id = #{merchantId} + - - and lm.level_id = #{levelId} + + and lm.level_id = #{levelId} + - + + and lm.discount = #{discount} + - - and lm.discount = #{discount} - - - order by ${sortColumns} - + order by ${sortColumns} + - +