From 03f742cdabcfc07eb6a46bb9dbf07b79e166c70b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 11 Apr 2019 19:23:43 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF][=E4=BF=AE=E6=94=B9][=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=A4=9A=E5=95=86=E9=93=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/mapper/WxShopMapper.java | 4 ++ .../mapper/WxCouponMerchantMapper.xml | 21 +----- .../resources/mapper/WxMerchantMapper.xml | 67 +++++++------------ .../main/resources/mapper/WxShopMapper.xml | 19 ++++++ 4 files changed, 49 insertions(+), 62 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java index 833f2368a..4dd3b3bf6 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java @@ -28,4 +28,8 @@ public interface WxShopMapper extends CommonMapper { int hasShopNumber(WxShop wxShop); List findListWithMerchantMap(WxShop record); + + List findShopVoList(Map map); + + } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml index 5c67b05db..7be8f398d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml @@ -80,30 +80,11 @@ + select="com.iformall.mapper.WxShopMapper.findShopVoList"> - - - - - - - - - - - select FROM wx_merchant m - left join wx_merchant_shop ms on ms.merchant_id = m.id and ms.is_del = 0 - left join wx_shop s on ms.shop_id = s.id - left join wx_mall_building mb on s.building = mb.id - left join wx_mall_floor mf on s.floor = mf.id + left join wx_merchant_shop ms on ms.merchant_id = m.id + where ms.is_del = 0 and m.`tenant_id` = #{tenantId} @@ -156,16 +135,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +