From 84f5eaad9b1ebfc213388180fc298e55728001ba Mon Sep 17 00:00:00 2001
From: hejiayang <296714699@qq.com>
Date: Sat, 6 Dec 2025 20:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD=E5=8F=8Abug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StClientMemberTransactionRecordMapper.xml | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml
index 09824e0..0beef99 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml
@@ -38,7 +38,7 @@
         a.id,
         a.serial_no as serialNo,
         a.order_no as orderNo,
-        c.realname as userName,
+        IF(a.member_id = a.pay_member_id,c.realname,CONCAT(c.realname,'-',pay.realname)) as userName,
         sboi.serial_no as cardCode,
         sboi.business_model AS businessModel,
         pay.realname as payUserName,
@@ -67,8 +67,8 @@
         LEFT JOIN st_client_member_balance AS b ON a.member_id = b.member_id
         LEFT JOIN st_bbzx_order_info AS sboi ON sboi.order_no = a.order_no
         LEFT JOIN st_base_restaurant AS br ON br.id = a.canteen_id
-        LEFT JOIN sys_user_sub AS c ON a.member_id = c.id
-        LEFT JOIN sys_user_sub AS pay ON a.pay_member_id = pay.id
+        LEFT JOIN sys_user_sub AS c ON  a.pay_member_id = c.id
+        LEFT JOIN sys_user_sub AS pay ON a.member_id = pay.id
         LEFT JOIN sys_pay_depart direct_depart ON pay.depart_ids = direct_depart.id AND direct_depart.del_flag = '0'
         LEFT JOIN sys_pay_depart parent_depart ON direct_depart.parent_id = parent_depart.id AND parent_depart.del_flag = '0'
         WHERE a.is_del = 0
@@ -140,8 +140,8 @@
             <if test="vo.dinnerType != null and vo.dinnerType != ''">
                 LEFT JOIN st_bbzx_order_info sboi ON a.order_no = sboi.order_no
             </if>
-            LEFT JOIN sys_user_sub AS c ON a.member_id = c.id
-        LEFT JOIN sys_user_sub AS pay ON a.pay_member_id = pay.id
+            LEFT JOIN sys_user_sub AS c ON  a.pay_member_id = c.id
+            LEFT JOIN sys_user_sub AS pay ON a.member_id = pay.id
         WHERE a.is_del = 0
         <if test="vo.startTime != null and vo.endTime !=''">
             <choose>
@@ -176,9 +176,7 @@
             and c.work_no like CONCAT('%',#{vo.workNo,jdbcType=VARCHAR},'%')
         </if>
         <if test="vo.userName != null and vo.userName != ''">
-            and (c.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%') or
-            pay.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%')
-            )
+            and  c.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%')
         </if>
         <if test="vo.canteenId != null and vo.canteenId != ''">
             and a.canteen_id = #{vo.canteenId}
@@ -194,7 +192,7 @@
             a.id,
             a.serial_no as serialNo,
             a.order_no as orderNo,
-            IF(a.member_id = a.pay_member_id,pay.realname,CONCAT(pay.realname,'-',c.realname)) as userName,
+            IF(a.member_id = a.pay_member_id,c.realname,CONCAT(c.realname,'-',pay.realname)) as userName,
             c.phone,
             c.work_no as workNo,
             a.status,
@@ -212,8 +210,8 @@
         <if test="vo.dinnerType != null and vo.dinnerType != ''">
             LEFT JOIN st_bbzx_order_info sboi ON a.order_no = sboi.order_no
         </if>
-        LEFT JOIN sys_user_sub AS c ON a.member_id = c.id
-        LEFT JOIN sys_user_sub AS pay ON a.pay_member_id = pay.id
+        LEFT JOIN sys_user_sub AS c ON  a.pay_member_id = c.id
+        LEFT JOIN sys_user_sub AS pay ON a.member_id = pay.id
         WHERE a.is_del = 0
         <if test="vo.startTime != null and vo.endTime !=''">
             <choose>
@@ -248,9 +246,7 @@
             and c.work_no like CONCAT('%',#{vo.workNo,jdbcType=VARCHAR},'%')
         </if>
         <if test="vo.userName != null and vo.userName != ''">
-            and (c.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%') or
-            pay.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%')
-            )
+            and c.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%')
         </if>
         <if test="vo.canteenId != null and vo.canteenId != ''">
             and a.canteen_id = #{vo.canteenId}