From 14c144140a89cdbc0eeefec0d897dd2b5861e144 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 6 Nov 2019 15:04:39 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E4=BC=9A=E5=91=98=E6=B6=88?= =?UTF-8?q?=E8=B4=B9=E5=88=97=E8=A1=A8][=E4=BF=AE=E6=94=B9][=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=8A=E8=AF=A6=E6=83=85]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxMerchantMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index b6570dc67..e6234698e 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -429,11 +429,11 @@ ifnull(consume.consumeCount,0) consumeCount,ifnull(consume.consumeCountP,0) as consumeCountP, ifnull(consume.tradeAmt,0) tradeAmt FROM wx_merchant m - left join (select count(co.c_user_id) AS consumeCount, - count(DISTINCT co.c_user_id) AS consumeCountP,sum(co.coupon_price) AS tradeAmt, m.id as merchant_id from + left join (select count(co.c_user_id) AS consumeCountP, + count(DISTINCT co.c_user_id) AS consumeCount,sum(co.coupon_price) AS tradeAmt, m.id as merchant_id from wx_coupon_order co left join (select m.id,mbu.id as b_user_id from wx_merchant m - left join wx_merchant_b_user mbu on m.id=mbu.merchant_id) m + left join wx_merchant_b_user mbu on m.id=mbu.merchant_id where status=0) m on co.b_user_id=m.b_user_id WHERE co.coupon_order_status = 1 @@ -471,7 +471,7 @@ and o.tenant_id=#{tenantId} and o.b_user_id in( - select id from wx_merchant_b_user where merchant_id=#{id} + select id from wx_merchant_b_user where status=0 and merchant_id=#{id} )