From 8657f3758fa1acef3445f82b82f81fdba5e0c1db Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Sep 2025 11:29:00 +0800
Subject: [PATCH] feat(member): 更新会员公司ID逻辑 - 从API DTO中提取公司ID - 验证并转换公司编码为内部ID - 设置会员关联的公司ID - 优化公司信息查询逻辑 - 修复公司ID更新问题 - 确保会员信息正确绑定公司关系

---
 src/main/resources/mapper/modules/MallRefundMapper.xml |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallRefundMapper.xml b/src/main/resources/mapper/modules/MallRefundMapper.xml
index 7af7708..5bb7a9b 100644
--- a/src/main/resources/mapper/modules/MallRefundMapper.xml
+++ b/src/main/resources/mapper/modules/MallRefundMapper.xml
@@ -20,23 +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.*,
+               b.order_time orderTime,
                b.order_no orderNo,
                b.status,
+               c.id itemId,
                c.goods_name goodsName,
-               c.cnt
+               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