From bc62c343b4a659c6a897e291db0ff9161959ee34 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 14 Dec 2020 15:44:34 +0800 Subject: [PATCH] bug --- .../com/iformall/domain/po/WxMerchant.java | 8 ++++ .../resources/mapper/WxMerchantMapper.xml | 37 +++++++++++++------ 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 23be5e82a..a8fc1969b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -290,4 +290,12 @@ public class WxMerchant extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "1已关联合同", name = "hasContract") @TableField(exist = false) private Integer hasContract; + + @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") + @TableField(exist = false) + private Long building; + + @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") + @TableField(exist = false) + private Long floor; } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 15e159bea..5ad51c895 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -201,34 +201,34 @@ @@ -345,6 +345,21 @@ #{idItem} + + and m.id in( + select ms.merchant_id from (select merchant_id,shop_id from wx_merchant_shop where is_del=0) ms + inner join wx_merchant m on ms.merchant_id = m.id + inner join wx_shop s on s.id=ms.shop_id + where s.is_del=0 + + and s.`building`= #{building} + + + and s.`floor` = #{floor} + + ) + + order by ${sortColumns}