From ec00cb3e936147ae1c080cbb5d723ef368a3d2da Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 10 Oct 2025 16:51:02 +0800
Subject: [PATCH] fix(mapper): 调整对话记录查询条件 - 移除了AiMemberTalkItemMapper中对state=1的限制 - 在AiMemberTalkMapper中增加了state=1的过滤条件 - 优化了对话记录的查询逻辑,确保数据准确性 - 统一了前后端对于对话状态的处理方式 - 提高了查询效率,减少了不必要的数据加载 - 保证了对话列表按创建时间倒序排列的正确性

---
 src/main/resources/mapper/modules/MallRefundMapper.xml |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallRefundMapper.xml b/src/main/resources/mapper/modules/MallRefundMapper.xml
index 96814b7..5bb7a9b 100644
--- a/src/main/resources/mapper/modules/MallRefundMapper.xml
+++ b/src/main/resources/mapper/modules/MallRefundMapper.xml
@@ -4,8 +4,11 @@
 
     <select id="selectByItemIdAndOrderIdAndState" resultType="cc.mrbird.febs.mall.entity.MallRefundEntity">
 
-        select a.* from mall_refund a
-            where item_id=#{itemId} and order_id=#{orderId} and state=#{state}
+        select a.*,
+        c.cnt
+        from mall_refund a
+        inner join mall_order_info b on a.order_id = b.id
+        inner join mall_order_item c on a.item_id = c.id
         <where>
             <if test="itemId != null and itemId != ''">
                 and a.item_id = #{itemId}
@@ -17,16 +20,34 @@
                 and a.state = #{state}
             </if>
         </where>
-
+        order by a.CREATED_TIME desc
     </select>
 
     <select id="getOrderRefundListInPage" resultType="cc.mrbird.febs.mall.entity.MallRefundEntity">
-        select a.* from mall_refund a
+        select a.*,
+               b.order_time orderTime,
+               b.order_no orderNo,
+               b.status,
+               c.id itemId,
+               c.goods_name goodsName,
+               c.cnt,
+               d.name refundMemberName,
+               d.phone refundMemberPhone
+        from mall_refund a
+        inner join mall_order_info b on a.order_id = b.id
+        inner join mall_order_item c on a.item_id = c.id
+        inner join mall_member d on a.member_id = d.id
         <where>
             <if test="record != null" >
                 <if test="record.state!=null and record.state!=''">
                     and a.state = #{record.state}
                 </if>
+                <if test="record.refundMemberName!=null and record.refundMemberName!=''">
+                    and d.name like concat('%',#{record.refundMemberName},'%')
+                </if>
+                <if test="record.refundMemberPhone!=null and record.refundMemberPhone!=''">
+                    and d.phone like concat('%',#{record.refundMemberPhone},'%')
+                </if>
             </if>
         </where>
         order by a.CREATED_TIME desc

--
Gitblit v1.9.1