From 86c8a748167dc4fe9e4daaef6cd9eb7f429a276e Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Wed, 23 Apr 2025 10:04:36 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=BB=B6=E7=BC=93=E6=94=B6=E7=9B=8A?=
 =?UTF-8?q?=E5=8F=91=E6=94=BE=E6=B7=BB=E5=8A=A0=E4=BC=9A=E5=91=98=E6=94=B6?=
 =?UTF-8?q?=E7=9B=8A=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BonusSettleFirstPurchaseHandle.java  | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java
index 1406de39..87ba5a19 100644
--- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java
+++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java
@@ -1366,9 +1366,8 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
                     // TODO new 追加会员奖金拓展收益
                     CuMemberBonus cuMemberBonus = this.getCuMemberBonus(period, cuMemberBonusMap, pkMember,
                             cuMemberSettleExt.getIncomeStatus(), cuMemberSettleExt.getPkSettleCountry(), cuMemberSettleExt.getPkRate());
-                    cuMemberBonus.setExpandIncome(pretaxIncome);
-                    cuMemberBonus.setExpandNoCapping(pretaxIncome);
                     cuMemberBonus.setExpandCapping(cuMemberBonusDelayAddDetail.getExpandCapping());
+                    cuMemberBonus.setExpandNoCapping(pretaxIncome);
 
                     // 获取拓展收益奖项
                     Integer pkBonusItems = getPkBonusItems(bonusConfigDTO, cuMemberBonusDelayAddDetail.getPkCountry(), EBonusItems.EXPANSION_INCOME.getValue());
@@ -1384,11 +1383,14 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
                     cuMemberBonusExpand.setExpandNormalHalf(ComputeUtil.computeMultiplyHalf(cuMemberBonusDelayAddDetail.getExpandCapping()));
                     cuMemberBonusExpand.setExpandNormalReal(ComputeUtil.computeMultiplyHalf(pretaxIncome));
                     cuMemberBonusExpand.setRemark(String.format(BonusMsgConstants.BONUS_EXPAND_DELAY, cuMemberSettleExt.getMemberCode() + cuMemberSettleExt.getMemberName()));
-
                     // 处理扣项，计算最终收益
                     BdBonusDeduct bdBonusDeduct = setDeplyBonusDetailDeduct(bonusConfigDTO, cuMemberBonusExpand);
-                    // 处理实发小计、实发收益总计
-                    setFirstPurchaseTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusExpand);
+
+                    if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusExpand.getIncomeStatus()) {
+                        // 处理实发小计、实发收益总计
+                        cuMemberBonus.setExpandIncome(pretaxIncome);
+                        setFirstPurchaseTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusExpand);
+                    }
                     // TODO new 追加的一条延缓收益生成的拓展收益明细
                     cuMemberBonusExpandList.add(cuMemberBonusExpand);
 
@@ -1500,7 +1502,6 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
                 // 追加会员奖金收益
                 CuMemberBonus cuMemberBonus = this.getCuMemberBonus(period, cuMemberBonusMap, pkMember,
                         cuMemberSettleExt.getIncomeStatus(), cuMemberSettleExt.getPkSettleCountry(), cuMemberSettleExt.getPkRate());
-                cuMemberBonus.setExpandIncome(pretaxIncome);
                 cuMemberBonus.setExpandNoCapping(pretaxIncome);
                 cuMemberBonus.setExpandCapping(expandCapping);
 
@@ -1517,8 +1518,12 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
                 cuMemberBonusExpand.setRemark(String.format(BonusMsgConstants.BONUS_EXPAND_DELAY, cuMemberSettleExt.getMemberCode() + cuMemberSettleExt.getMemberName()));
                 // 处理扣项，计算最终收益
                 BdBonusDeduct bdBonusDeduct = setDeplyBonusDetailDeduct(bonusConfigDTO, cuMemberBonusExpand);
-                // 处理实发小计、实发收益总计
-                setFirstPurchaseTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusExpand);
+
+                if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusExpand.getIncomeStatus()) {
+                    // 处理实发小计、实发收益总计
+                    cuMemberBonus.setExpandIncome(pretaxIncome);
+                    setFirstPurchaseTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusExpand);
+                }
                 // TODO new 追加的一条延缓收益生成的拓展收益明细
                 cuMemberBonusExpandList.add(cuMemberBonusExpand);