From 192be3ff989241f8651168c6c60a6cc9150146aa Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Wed, 9 Jul 2025 14:47:30 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=A4=8D=E8=B4=AD=E7=BA=A7=E5=B7=AE?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E8=B0=83=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/api/ApiCuMemberBonusController.java  |  4 ++--
 .../java/com/hzs/common/core/enums/EBonusItems.java | 13 +++++++------
 2 files changed, 9 insertions(+), 8 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 e12d48ae..efa88474 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
@@ -58,8 +58,8 @@ public class ApiCuMemberBonusController extends BaseController {
                 memberBonusVO.setServiceSpend(BigDecimal.ZERO);
                 memberBonusVO.setSettleDate(DateUtils.currentDate());
                 BigDecimal serviceSpend = ComputeUtil.computeSubtract(
-                        ComputeUtil.computeAddNum(cuMemberBonus.getRetailRangeIncome(), cuMemberBonus.getRetailSameLevelIncome(),
-                                cuMemberBonus.getRetailAreaIncome()), cuMemberBonus.getRetailRealSubtotal()
+                        ComputeUtil.computeAddNum(cuMemberBonus.getRetailRangeIncome(), cuMemberBonus.getRetailSameLevelIncome(), cuMemberBonus.getRetailAreaIncome(), cuMemberBonus.getRepurRangeIncome()),
+                        cuMemberBonus.getRetailRealSubtotal()
                 );
                 memberBonusVO.setBackPoints(serviceSpend);
 
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java
index 746d7c61..ab0c10e4 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java
@@ -31,10 +31,6 @@ public enum EBonusItems {
      * 服务补贴
      */
     SERVICE_SUBSIDIES(7, "旧服务补贴", 0, EnumsPrefixConstants.BONUS_ITEMS + 7),
-    /**
-     * 复购级差收益
-     */
-    REPURCHASE_RANGE_INCOME(8, "复购级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 8),
     /**
      * 消费拓展收益
      */
@@ -62,6 +58,11 @@ public enum EBonusItems {
 
     ////////////////////////////////////////////////// 新奖项 //////////////////////////////////////////////////
 
+    /**
+     * 复购级差收益 -- 秒结，日奖
+     */
+    REPURCHASE_RANGE_INCOME(8, "复购级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 8),
+
     /**
      * 直推收益（新零售直推级差收益） -- 秒结，日奖
      */
@@ -78,11 +79,11 @@ public enum EBonusItems {
     /**
      * 福利极差收益 -- 月结，月奖
      */
-    RETAIL_BENEFIT_RANGE_INCOME(30, "福利级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 30),
+    RETAIL_BENEFIT_RANGE_INCOME(30, "月度福利级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 30),
     /**
      * 复购级差收益（新） -- 月结，月奖
      */
-    RETAIL_MONTH_REPURCHASE_INCOME(31, "复购级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 31),
+    RETAIL_MONTH_REPURCHASE_INCOME(31, "月度复购级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 31),
     /**
      * 培育津贴（新） -- 月结，月奖
      */