From 533abf320d5104dd10d80ae981ef52cc49fe0f24 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 19 Sep 2019 16:44:14 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF][=E6=96=B0=E5=A2=9E]:=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=A5=BC=E5=B1=82=E6=A5=BC=E5=BA=A7=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=95=86=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/vo/WxMerchantVo.java | 8 ++++++++ .../src/main/resources/mapper/WxMerchantMapper.xml | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java index ad7ff0dcf..1e4bf9a59 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -39,6 +39,14 @@ public class WxMerchantVo { @io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName") private String floorName; + + @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") + private Long building; + + @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") + private Long floor; + + @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") private Integer isPublic; diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index f60055550..7020e4f88 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -332,6 +332,16 @@ select FROM wx_merchant m + + join wx_merchant_shop ms on ms.merchant_id=m.id + join wx_shop s on ms.shop_id=s.id + + and s.building = #{building} + + + and s.floor = #{floor} + + left join wx_business bu on bu.id = m.business_id where 1=1 and m.is_del=0