From e6a54d5b231d81416ec527976309d535e3d83adb Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Wed, 25 Jun 2025 14:34:01 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E4=BC=9A=E5=91=98=E5=A5=96=E9=87=91?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=A6=8F=E5=88=A9=E5=88=86=E7=BA=A2=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/bonus/service/impl/CuMemberBonusServiceImpl.java   | 3 +++
 .../com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java   | 4 ++--
 .../com/hzs/common/domain/member/ext/CuMemberBonusExt.java   | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

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 2d83de1f..d7a10bcc 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
@@ -181,6 +181,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
                     cuMemberBonusExt.setRetailBenefitAvgIncome(BigDecimal.ZERO);
                     cuMemberBonusExt.setRetailBenefitIncome(BigDecimal.ZERO);
                     cuMemberBonusExt.setRetailRealSubtotal(BigDecimal.ZERO);
+                    cuMemberBonusExt.setRetailBenefitIncomeTotal(BigDecimal.ZERO);
                     memberBonusExtList.add(cuMemberBonusExt);
                 }
             }
@@ -230,6 +231,8 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
             cuMemberBonusExt.setRetailBenefitAvgIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitAvgIncome(), inExchangeRate));
             cuMemberBonusExt.setRetailBenefitIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitIncome(), inExchangeRate));
             cuMemberBonusExt.setRetailRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailRealSubtotal(), inExchangeRate));
+            // 福利分红总计
+            cuMemberBonusExt.setRetailBenefitIncomeTotal(cuMemberBonusExt.getRetailBenefitAvgIncome().add(cuMemberBonusExt.getRetailBenefitIncome()));
         }
         return cuMemberBonusExtList;
     }
diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java
index 2df3edee..119a8134 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java
@@ -108,10 +108,10 @@ public class MemberBonusFirstPurchaseVO extends PubMemberBonusVO {
     private BigDecimal retailMonthRepurchaseIncome;
 
     /**
-     * 福利分红收益
+     * 福利分红收益总计
      */
     @BigDecimalFormat
-    private BigDecimal retailBenefitIncome;
+    private BigDecimal retailBenefitIncomeTotal;
 
     /**
      * 新零售收益小计
diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberBonusExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberBonusExt.java
index e881bd72..0d7d4621 100644
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberBonusExt.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberBonusExt.java
@@ -78,4 +78,9 @@ public class CuMemberBonusExt extends CuMemberBonus {
      */
     private String nickName;
 
+    /**
+     * 福利分红收益总计
+     */
+    private BigDecimal retailBenefitIncomeTotal;
+
 }