From 4dec48629fe736e4843cd0d2ffb881f8f32c2ee1 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Wed, 3 Sep 2025 18:05:31 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E4=B8=9A=E7=BB=A9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8-=E5=A4=8D=E8=B4=AD=E5=8F=96=E6=98=A8=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzs/retail/member/mapper/CuMemberRetailRangeMapper.java | 2 +-
 .../service/impl/CuMemberRetailAchieveServiceImpl.java      | 6 +++---
 .../mapper/member/achieve/CuMemberRetailRangeMapper.xml     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRangeMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRangeMapper.java
index 1ac270bc..83efa270 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRangeMapper.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRangeMapper.java
@@ -138,5 +138,5 @@ public interface CuMemberRetailRangeMapper extends BaseMapper<CuMemberRetailRang
      * @param targetDayEnd
      * @return
      */
-    List<PerformanceVO> getPerformanceList(@Param("tableName") String tableName, @Param("memberIdList") List<Long> memberIdList, @Param("targetDayStart") Date targetDayStart, @Param("targetDayEnd") Date targetDayEnd, @Param("repurchaseDate") Date repurchaseDate);
+    List<PerformanceVO> getPerformanceList(@Param("tableName") String tableName, @Param("memberIdList") List<Long> memberIdList, @Param("targetDayStart") Date targetDayStart, @Param("targetDayEnd") Date targetDayEnd);
 }
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
index fab1cf29..b242245a 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
@@ -479,7 +479,7 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
         CuMemberSettlePeriod settlePeriod = null;
         if(isCurrentMonth(param.getYear(), param.getMonth())) {
             targetDayStart = DateUtils.getFirstDayOfMonth(targetDate);
-            targetDayEnd = DateUtils.getLastDayOfMonth(targetDate);
+            targetDayEnd = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate());
             settlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, targetDate));
         }else{
             settlePeriod = iCuMemberSettlePeriodService.getLastDayCuMemberSettlePeriod(param.getYear() + "-" + param.getMonth());
@@ -522,11 +522,11 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
         ){
             pkMemberList = baseMapper.selectDirectPushByPkMember(member.getPkId(), SecurityUtils.getSystemType());
         }
-        List<PerformanceVO> meList = baseMapper.getPerformanceList(settleTable, Collections.singletonList(member.getPkId()), targetDayStart, targetDayEnd, targetDate);
+        List<PerformanceVO> meList = baseMapper.getPerformanceList(settleTable, Collections.singletonList(member.getPkId()), targetDayStart, targetDayEnd);
         PageUtils.startPage(param.getPageNum(), param.getPageSize());
         List<PerformanceVO> otherList = new ArrayList<>();
         if(CollUtil.isNotEmpty(pkMemberList)){
-            otherList = baseMapper.getPerformanceList(settleTable, pkMemberList, targetDayStart, targetDayEnd, targetDate);
+            otherList = baseMapper.getPerformanceList(settleTable, pkMemberList, targetDayStart, targetDayEnd);
         }
         PageUtils.clearPage();
         if(param.getPageNum() == 1){
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml
index 3a524c3d..1e2a4c4e 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml
@@ -763,7 +763,7 @@
                     ORDER_TYPE = 43
                   AND DEL_FLAG = 0
                   AND ORDER_STATUS = 1
-                  AND PAY_TIME BETWEEN #{targetDayStart} and #{repurchaseDate}
+                  AND PAY_TIME BETWEEN #{targetDayStart} and #{targetDayEnd}
                 GROUP BY
                     PK_MEMBER
             ) fg ON fg.pk_member = cu.pk_id