From 83c984dcfda18d111af27666414415eba376e063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Mon, 31 Jul 2023 15:30:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=AE=A2=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/TbPlussMerchantOrderMapper.xml  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantOrderMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantOrderMapper.xml
index 11e4a06..e1762b7 100644
--- a/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantOrderMapper.xml
+++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantOrderMapper.xml
@@ -708,7 +708,6 @@
   </update>
 
   <select id="selectByUserId" resultType="com.chaozhanggui.dao.system.model.TaskOrderSum">
-
     SELECT
       d.user_id AS userId,
       IFNULL( sum( b.consumeFee ), 0 ) AS consumeFee
@@ -719,8 +718,17 @@
         FROM
           tb_pluss_user_promotion p
         WHERE
-            p.parent_user_id IN ( SELECT user_id FROM tb_pluss_user_promotion WHERE (is_extend = 4 or is_extend=1))) d
+            p.parent_user_id IN (
+            SELECT
+              user_id
+            FROM
+              tb_pluss_user_promotion )
+          and (p.is_extend =4 or p.is_extend=1)
+          and p.type_code='MC'
+      ) d
         LEFT JOIN view_base_order b ON d.user_id = b.userId
+        left join tb_pluss_merchant_base_info i on d.user_id=i.userId
+    where i.merchantType=1
     GROUP BY
       d.user_id
     </select>