From 4614ed1f199e9f7f843a5df9cc3dcdd914de446a Mon Sep 17 00:00:00 2001
From: hejiayang <296714699@qq.com>
Date: Sat, 6 Dec 2025 20:13:50 +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

---
 .../xml/StClientMemberTransactionRecordMapper.xml   | 13 +++++++++----
 .../StClientMemberLevelDeductRuleServiceImpl.java   |  4 ++++
 2 files changed, 13 insertions(+), 4 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 8faa3a8..09824e0 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
@@ -141,6 +141,7 @@
                 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
         WHERE a.is_del = 0
         <if test="vo.startTime != null and vo.endTime !=''">
             <choose>
@@ -175,7 +176,9 @@
             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},'%')
+            and (c.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%') or
+            pay.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%')
+            )
         </if>
         <if test="vo.canteenId != null and vo.canteenId != ''">
             and a.canteen_id = #{vo.canteenId}
@@ -191,8 +194,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,pay.realname,CONCAT(pay.realname,'-',c.realname)) as userName,
             c.phone,
             c.work_no as workNo,
             a.status,
@@ -211,6 +213,7 @@
             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
         WHERE a.is_del = 0
         <if test="vo.startTime != null and vo.endTime !=''">
             <choose>
@@ -245,7 +248,9 @@
             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},'%')
+            and (c.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%') or
+            pay.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%')
+            )
         </if>
         <if test="vo.canteenId != null and vo.canteenId != ''">
             and a.canteen_id = #{vo.canteenId}
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StClientMemberLevelDeductRuleServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StClientMemberLevelDeductRuleServiceImpl.java
index 296b4e8..fbc16bf 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StClientMemberLevelDeductRuleServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StClientMemberLevelDeductRuleServiceImpl.java
@@ -421,6 +421,10 @@ public class StClientMemberLevelDeductRuleServiceImpl extends JeecgServiceImpl<S
         if(CollectionUtils.isEmpty(voListAll)){
             return Result.error("扣费信息不能为空");
         }
+        voListAll.forEach(vo -> {
+            vo.setRestId(restId);
+            vo.setDeviceCode(deviceCode);
+        });
 //        //去重
 //        voListAll = filterDuplicateTimestamp(voListAll);
         //数据预处理: 一人 一餐 除二次扣费外 只有一条扣费数据