From b3194b83dc3f0a2d49f1526592e13956d6b930a4 Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Wed, 10 Jul 2024 10:12:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E5=85=85=E5=80=BC=E9=87=91=E9=A2=9Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/TbMShopUserMapper.java     | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java
index fe7f49b6..5ab665a9 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java
@@ -16,19 +16,23 @@ import java.util.Map;
 */
 public interface TbMShopUserMapper extends BaseMapper<TbMShopUser> {
     @Select("<script>" +
-            "SELECT " +
-            "COUNT(*) userTotal, " +
-            "ifnull(SUM( " +
-            "IFNULL( b.charge_amount, 0 )), 0) chageTotal\n" +
-            "FROM\n" +
-            "tb_shop_user AS a\n" +
-            "LEFT JOIN tb_user_info AS b ON a.user_id = b.id\n" +
-            "WHERE\n" +
-            " a.shop_id = #{shopId}\n" +
+            "SELECT \n" +
+            "    COUNT(DISTINCT a.id) AS userTotal, \n" +
+            "    COALESCE(SUM(flow.total_amount), 0) AS chageTotal, \n" +
+            "    COALESCE(SUM(a.amount), 0) AS balanceTotal \n" +
+            "FROM \n" +
+            "    tb_shop_user AS a\n" +
+            "    LEFT JOIN (\n" +
+            "        SELECT shop_user_id, SUM(amount) AS total_amount \n" +
+            "        FROM tb_shop_user_flow \n" +
+            "        WHERE biz_code IN ('cashMemberIn','scanMemberIn') \n" +
+            "        GROUP BY shop_user_id\n" +
+            "    ) AS flow ON flow.shop_user_id = a.id\n" +
+            "WHERE \n" +
+            "    a.shop_id = #{shopId} \n" +
             "<if test=\"isVip !=null\">\n" +
             "            and a.is_vip=#{isVip}\n" +
             "</if>" +
-
             "</script>")
     Map<String, Object> selectUserSummary(@Param("shopId") String shopId, @Param("isVip") Integer isVip);