From 1fc8fde81cbf79ebe95e927f9099cf94c2ccc6e5 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 17:39:04 +0800
Subject: [PATCH] refactor(mall): 优化退款流程和逻辑

---
 src/main/resources/mapper/modules/MallMemberMapper.xml |   36 +++++++++++++++++-------------------
 1 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index f5daff9..34db249 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -503,24 +503,23 @@
                     SELECT
                     count(c.id)
                     FROM
-                    mall_order_info c
+                    mall_achieve_record c
                     where a.id = c.member_id
-                    AND c.STATUS = 4
                 ) orderCnt,
-                ifnull(
-                    (
-                        SELECT
-                            sum(b.amount)
-                        FROM
-                            mall_order_info b
-                        where a.id = b.member_id
-                        AND b.STATUS = 4
-                    ),
-                0) amount
+                (
+                    SELECT
+                    sum(b.amount, 0)
+                    FROM
+                    mall_achieve_record b
+                    where a.id = b.member_id
+                ) amount
         FROM mall_member a
         <where>
             and find_in_set(#{record.inviteId}, a.referrer_ids)
             <if test="record != null" >
+                <if test="record.memberName != null and record.memberName != ''">
+                    and a.name like concat('%',  #{record.memberName},'%')
+                </if>
                 <if test="record.startTime != null and record.startTime != ''">
                     and a.CREATED_TIME &gt;= #{record.startTime}
                 </if>
@@ -536,20 +535,19 @@
 
     <select id="selectSalePage" resultType="cc.mrbird.febs.mall.vo.sale.ApiSaleListInfoVo">
         SELECT
-            (
-                SELECT
-                c.order_no
-                FROM
-                mall_order_info c
-                where a.order_id = c.id
-            ) orderNo,
+            c.name memberName,
             a.CREATED_TIME createdTime,
             a.cost_amount costAmount,
             a.amount amount
         FROM mall_achieve_record a
+        left join mall_order_info b on a.order_id = b.id
+        left join mall_member c on b.member_id = c.id
         <where>
             and a.member_id = #{record.memberId}
             <if test="record != null" >
+                <if test="record.memberName != null and record.memberName != ''">
+                    and c.name like concat('%',  #{record.memberName},'%')
+                </if>
                 <if test="record.startTime != null and record.startTime != ''">
                     and a.CREATED_TIME &gt;= #{record.startTime}
                 </if>

--
Gitblit v1.9.1