From e6f247670eeca5520e38c326d7bd2c18855912f1 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Thu, 25 Sep 2025 14:04:34 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E4=B8=89=E9=98=B6=E6=AE=B5=E5=A5=96?=
 =?UTF-8?q?=E9=87=91=E5=A4=84=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzs/bonus/bonus/service/impl/BonusSettleHandle.java    | 6 +++---
 .../bonus/service/impl/CuMemberBonusStageServiceImpl.java  | 3 ---
 .../mapper/bonus/achieve/CuMemberRetailRangeMapper.xml     | 7 +++----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java
index 53cb8cda..106d74a0 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java
@@ -223,8 +223,8 @@ public abstract class BonusSettleHandle {
             backRatio = bdBonusDeduct.getBackRatio();
             platformRatio = bdBonusDeduct.getPlatformRatio();
         }
-//        cuMemberBonus.setBackPoints(ComputeUtil.computeAdd(cuMemberBonus.getBackPoints(), ComputeUtil.computeBonusMultiply(pretaxIncome, backRatio)));
-//        cuMemberBonus.setServiceSpend(ComputeUtil.computeAdd(cuMemberBonus.getServiceSpend(), ComputeUtil.computeBonusMultiply(pretaxIncome, platformRatio)));
+        cuMemberBonus.setBackPoints(ComputeUtil.computeAdd(cuMemberBonus.getBackPoints(), ComputeUtil.computeBonusMultiply(pretaxIncome, backRatio)));
+        cuMemberBonus.setServiceSpend(ComputeUtil.computeAdd(cuMemberBonus.getServiceSpend(), ComputeUtil.computeBonusMultiply(pretaxIncome, platformRatio)));
     }
 
     /**
@@ -233,7 +233,7 @@ public abstract class BonusSettleHandle {
     protected void setRetailTotal(BdBonusDeduct bdBonusDeduct, CuMemberBonus cuMemberBonus, Object bonusDetail) {
         setBonusDeduct(bdBonusDeduct, cuMemberBonus, bonusDetail);
         BigDecimal realIncome = ReflectUtils.invokeGetter(bonusDetail, BonusFieldConstants.REAL_INCOME);
-//        cuMemberBonus.setRetailRealSubtotal(ComputeUtil.computeAdd(cuMemberBonus.getRetailRealSubtotal(), realIncome));
+        cuMemberBonus.setRetailRealSubtotal(ComputeUtil.computeAdd(cuMemberBonus.getRetailRealSubtotal(), realIncome));
         cuMemberBonus.setRealIncomeTotal(ComputeUtil.computeAdd(cuMemberBonus.getRealIncomeTotal(), realIncome));
     }
 
diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java
index 92aa1f31..5497cd05 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java
@@ -278,9 +278,6 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
                 case BonusConstants.POINT_37:
                 case BonusConstants.POINT_38:
                     // 如果填充的点位是第三层，理论上有可能已经全部填满，需要判断是否已经完成
-                    if (EBonusStageStatus.YES.getValue() == targetRetailDetail.getStageStatus()) {
-                        break;
-                    }
                     boolean isFinish = true;
                     for (String suffix : BonusConstants.FIELD_LIST) {
                         if (null == ReflectUtil.getFieldValue(targetRetailDetail, BonusConstants.POINT_MEMBER_FIELD_NAME + suffix)) {
diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
index 7dbf8526..80f02a9a 100644
--- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
@@ -183,7 +183,7 @@
                          left join cu_member cm
                                    on cm.pk_id = x.pk_member
             ) b
-            on (a.pk_member = b.pk_member and a.child_node = b.child_node)
+            on (a.pk_member = b.pk_member and a.child_node = b.child_node and a.stage = b.stage)
             when not matched then
                 insert (pk_member,
                         child_node,
@@ -280,7 +280,6 @@
             when matched then
                 update set
                     a.pk_parent = b.pk_parent,
-                    a.stage = b.stage,
                     a.stage_status = b.stage_status,
                     a.stage_date = b.stage_date,
                     a.point_11 = b.point_11,
@@ -392,7 +391,7 @@
             from dual
         </foreach>
         ) b
-        on (a.pk_member = b.pk_member and a.child_node = b.child_node)
+        on (a.pk_member = b.pk_member and a.child_node = b.child_node and a.stage = b.stage)
         when not matched then
         insert (pk_member, child_node, pk_parent,
         stage, stage_status, stage_date,
@@ -440,7 +439,7 @@
         b.third_bonus_1, b.third_bonus_2, b.third_bonus_3)
         when matched then
         update set
-        a.stage = b.stage, a.stage_status = b.stage_status, a.stage_date = b.stage_date,
+        a.stage_status = b.stage_status, a.stage_date = b.stage_date,
         a.point_11 = b.point_11, a.point_12 = b.point_12,
         a.point_21 = b.point_21, a.point_22 = b.point_22,
         a.point_23 = b.point_23, a.point_24 = b.point_24,