From a9128bcc60cf111b4fcdabeb61ddca4788f37e3b Mon Sep 17 00:00:00 2001
From: hejiayang <296714699@qq.com>
Date: Sat, 6 Dec 2025 19:40:13 +0800
Subject: [PATCH] bug

---
 .../xml/StClientMemberTransactionRecordMapper.xml    | 12 ++++++++----
 .../StClientMemberLevelDeductRuleServiceImpl.java    |  5 +++--
 2 files changed, 11 insertions(+), 6 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 6d01685..8faa3a8 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
@@ -215,10 +215,12 @@
         <if test="vo.startTime != null and vo.endTime !=''">
             <choose>
                 <when test="vo.payTimeStatus == 1">
-                    and  a.pay_time between #{vo.startTime} and #{vo.endTime}
+                    and DATE_FORMAT(a.pay_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{vo.startTime},'%Y-%m-%d')
+                    and DATE_FORMAT(a.pay_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{vo.endTime},'%Y-%m-%d')
                 </when>
                 <when test="vo.payTimeStatus == 2">
-                    and  a.create_time between #{vo.startTime} and #{vo.endTime}
+                    and DATE_FORMAT(a.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{vo.startTime},'%Y-%m-%d')
+                    and DATE_FORMAT(a.create_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{vo.endTime},'%Y-%m-%d')
                 </when>
             </choose>
         </if>
@@ -287,10 +289,12 @@
         <if test="vo.startTime != null and vo.endTime !=''">
             <choose>
                 <when test="vo.payTimeStatus == 1">
-                    and  a.pay_time between #{vo.startTime} and #{vo.endTime}
+                    and DATE_FORMAT(a.pay_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{vo.startTime},'%Y-%m-%d')
+                    and DATE_FORMAT(a.pay_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{vo.endTime},'%Y-%m-%d')
                 </when>
                 <when test="vo.payTimeStatus == 2">
-                    and  a.create_time between #{vo.startTime} and #{vo.endTime}
+                    and DATE_FORMAT(a.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{vo.startTime},'%Y-%m-%d')
+                    and DATE_FORMAT(a.create_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{vo.endTime},'%Y-%m-%d')
                 </when>
             </choose>
         </if>
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 0df3da9..296b4e8 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
@@ -319,13 +319,14 @@ public class StClientMemberLevelDeductRuleServiceImpl extends JeecgServiceImpl<S
                 .values()
                 .stream()
                 .flatMap(group -> {
+                    //(stRfidVo.getSecondChargeFlag() == null || stRfidVo.getSecondChargeFlag() == 0) && (stRfidVo.getIsCustom() == null || stRfidVo.getIsCustom() == 0)
                     // 分离二次扣费和非二次扣费数据
                     List<StRfidVo> secondCharge = group.stream()
-                            .filter(vo -> vo.getSecondChargeFlag() != null && vo.getSecondChargeFlag() == 1)
+                            .filter(vo -> (vo.getSecondChargeFlag() != null && vo.getSecondChargeFlag() == 1) || (vo.getIsCustom() != null && vo.getIsCustom() == 1) )
                             .collect(Collectors.toList());
 
                     List<StRfidVo> nonSecondCharge = group.stream()
-                            .filter(vo -> vo.getSecondChargeFlag() == null || vo.getSecondChargeFlag() == 0)
+                            .filter(vo -> (vo.getSecondChargeFlag() == null || vo.getSecondChargeFlag() == 0) && (vo.getIsCustom() == null || vo.getIsCustom() == 0))
                             .collect(Collectors.toList());
 
                     // 非二次扣费数据只保留一条