From 809e670847d0d44f124ec9ae178e20979702435f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 20 Mar 2025 10:53:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=88=97=E8=A1=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=85=85=E5=80=BC=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/account/dto/shopuser/ShopUserDTO.java    | 12 ++++++++++++
 .../src/main/resources/mapper/ShopUserMapper.xml     |  5 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java
index 22153606f..d01d71712 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java
@@ -4,12 +4,24 @@ import com.czg.account.entity.ShopUser;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 /**
  * @author Administrator
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class ShopUserDTO extends ShopUser {
+    /**
+     * 优惠券数量
+     */
     private Long couponNum;
+    /**
+     * 订单数量
+     */
     private Long orderNumber;
+    /**
+     * 充值金额
+     */
+    private BigDecimal rechargeAmount;
 }
diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
index d9285937f..6b12b4311 100644
--- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
@@ -50,12 +50,13 @@
     </select>
     <select id="selectPageByKeyAndIsVip" resultType="com.czg.account.dto.shopuser.ShopUserDTO">
         SELECT
-            a.*, count(c.id) couponNum, count(d.id) orderNumber
+            a.*, count(c.id) couponNum, count(d.id) orderNumber, IFNULL(sum(f.amount), 0) rechargeAmount
         FROM
             tb_shop_user a
                 LEFT JOIN tb_user_info b ON b.id = a.user_id
                 left join tb_shop_activate_coupon_record c on c.shop_user_id=a.id and c.`status`=0
-        left join tb_order_info as d on d.user_id=a.user_id
+        left join tb_order_info as d on d.user_id=a.user_id and d.shop_id=a.shop_id
+        left join tb_shop_user_flow as f on f.user_id=a.user_id and f.shop_id=a.shop_id and f.biz_code in ('cashIn', 'wechatIn', 'alipayIn')
 
         where a.shop_id=#{shopId}
             <if test="isVip != null">