From c515f7e476b65f2ec42e6443f38631e353fe794e Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Mon, 1 Sep 2025 11:00:59 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=A5=96=E9=87=91=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=8C=89=E6=97=A5=E6=98=BE=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/ApiCuMemberBonusController.java       | 26 +++++++++----------
 .../impl/CuMemberBonusServiceImpl.java        |  2 ++
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java
index 361eddf4..39e168c0 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java
@@ -39,18 +39,18 @@ public class ApiCuMemberBonusController extends BaseController {
     public TableDataInfo listFirstRepurchaseBonus(@RequestBody BonusParam bonusParam) {
         setBonusParam(bonusParam);
 
-        // 当前日期的天
-        int dateDD = Integer.parseInt(DateUtils.parseDateTimeToStr(DateUtils.DD, bonusParam.getEndDate()));
-        if (dateDD < 15) {
-            // 今天日期小于15号，查询上月23号之前的
-            bonusParam.setEndDate(DateUtils.setDays(DateUtils.addMonths(bonusParam.getEndDate(), -1), 23));
-        } else {
-            // 今天日期大于等于15号，查询本月7号之前的
-            bonusParam.setEndDate(DateUtils.setDays(bonusParam.getEndDate(), 7));
-        }
-
-        // 新查询奖金明细
-        List<CuMemberBonusExt> cuMemberBonusList = iCuMemberBonusService.listMemberBonus(bonusParam);
+//        // 当前日期的天
+//        int dateDD = Integer.parseInt(DateUtils.parseDateTimeToStr(DateUtils.DD, bonusParam.getEndDate()));
+//        if (dateDD < 15) {
+//            // 今天日期小于15号，查询上月23号之前的
+//            bonusParam.setEndDate(DateUtils.setDays(DateUtils.addMonths(bonusParam.getEndDate(), -1), 23));
+//        } else {
+//            // 今天日期大于等于15号，查询本月7号之前的
+//            bonusParam.setEndDate(DateUtils.setDays(bonusParam.getEndDate(), 7));
+//        }
+//        // 新查询奖金明细
+//        List<CuMemberBonusExt> cuMemberBonusList = iCuMemberBonusService.listMemberBonus(bonusParam);
+        List<CuMemberBonusExt> cuMemberBonusList = iCuMemberBonusService.queryMemberBonusVoByCondition(bonusParam);
 
         List<MemberBonusFirstPurchaseVO> firstPurchaseVOList = new ArrayList<>();
         cuMemberBonusList.forEach(cuMemberBonus -> {
@@ -96,7 +96,7 @@ public class ApiCuMemberBonusController extends BaseController {
         bonusParam.setPkMember(SecurityUtils.getUserId());
 
         // 默认查询90天之内的
-        Date startDate = DateUtils.beforeDate(60, ChronoUnit.DAYS, DateUtils.currentDate());
+        Date startDate = DateUtils.beforeDate(15, ChronoUnit.DAYS, DateUtils.currentDate());
         if (bonusParam.getStartDate() == null) {
             bonusParam.setStartDate(startDate);
         } else if (DateUtils.compareDateBefore(bonusParam.getStartDate(), startDate)) {
diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java
index 19c7e8ec..c452f08b 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java
@@ -90,10 +90,12 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
                 if (!DateUtils.compareDateEqual(endDate, DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate()))
                         || DateUtils.compareDateTimeAfter(DateUtils.currentDateTime(), compareDate)) {
                     CuMemberBonusExt cuMemberBonusExt = new CuMemberBonusExt();
+                    cuMemberBonusExt.setSettleDate(endDate);
                     cuMemberBonusExt.setRepurRangeIncome(BigDecimal.ZERO);
                     cuMemberBonusExt.setRetailRangeIncome(BigDecimal.ZERO);
                     cuMemberBonusExt.setRetailRealSubtotal(BigDecimal.ZERO);
                     cuMemberBonusExt.setRealIncomeTotal(BigDecimal.ZERO);
+                    cuMemberBonusExt.setRetailAreaIncome(BigDecimal.ZERO);
                     memberBonusExtList.add(cuMemberBonusExt);
                 }
             }