From 6bc98c5af01f9d008c9fb2fef0878256d33dfd1d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 30 Aug 2019 17:50:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=95=86=E6=88=B7=E5=8F=8A=E5=95=86?= =?UTF-8?q?=E9=93=BA=E5=AF=BC=E5=87=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxMerchantTradeDailyController.java | 2 +- .../resources/mapper/WxMerchantMapper.xml | 20 +++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index c29c55730..1faca02ad 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -102,7 +102,7 @@ public class WxMerchantTradeDailyController extends BaseController { if (null == wxMerchantTradeDaily) { wxMerchantTradeDaily = new WxMerchantTradeDaily(); } - + wxMerchantTradeDaily.setTenantId(getTenantId()); wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.MerchantId_DESC); wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 45f4416c6..f60055550 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -131,9 +131,21 @@ #{idItem} - - - + + + and 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 m.tenant_id=#{tenantId} and s.is_del=0 + + and m.business_id in (${businessForRule}) + + + and s.`floor` in (${floorForRule}) + + ) + order by ${sortColumns} @@ -141,7 +153,7 @@