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
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
@@ -175,7 +176,9 @@
and c.work_no like CONCAT('%',#{vo.workNo,jdbcType=VARCHAR},'%')
- 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},'%')
+ )
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
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
@@ -245,7 +248,9 @@
and c.work_no like CONCAT('%',#{vo.workNo,jdbcType=VARCHAR},'%')
- 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},'%')
+ )
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 {
+ vo.setRestId(restId);
+ vo.setDeviceCode(deviceCode);
+ });
// //去重
// voListAll = filterDuplicateTimestamp(voListAll);
//数据预处理: 一人 一餐 除二次扣费外 只有一条扣费数据