From 3c0f8cfc974dbb22095c226d5f8ca8b1f915b9f3 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Mon, 23 Jun 2025 17:58:51 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=89=8D=E5=8F=B0=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=BF=94=E5=9B=9E=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CuMemberBonusServiceImpl.java        |  1 +
 .../bonus/vo/MemberBonusDetailSerVO.java      |  6 +-----
 .../bonus/vo/MemberBonusFirstPurchaseVO.java  | 19 ++++++++++++++++++-
 .../bonus/bonus/CuMemberBonusMapper.xml       |  6 ++++++
 .../domain/member/ext/CuMemberBonusExt.java   |  7 -------
 5 files changed, 26 insertions(+), 13 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 60436387..c940c880 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
@@ -238,6 +238,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
             cuMemberBonusExt.setRetailSameLevelIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailSameLevelIncome(), inExchangeRate));
             cuMemberBonusExt.setRetailAreaIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailAreaIncome(), inExchangeRate));
             cuMemberBonusExt.setRetailBenefitRangeIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitRangeIncome(), inExchangeRate));
+            cuMemberBonusExt.setRetailMonthRepurchaseIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailMonthRepurchaseIncome(), inExchangeRate));
             cuMemberBonusExt.setRetailBenefitAvgIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitAvgIncome(), inExchangeRate));
             cuMemberBonusExt.setRetailBenefitIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitIncome(), inExchangeRate));
             cuMemberBonusExt.setRetailRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailRealSubtotal(), inExchangeRate));
diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java
index 75d97ed6..9ae304d7 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java
@@ -17,11 +17,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * @Description: 返回后端用户端查询奖金明细vo
- * @Author: sui q
- * @Time: 2022/12/20 9:56
- * @Classname: MemberBonusDetailVO
- * @PackageName: com.hzs.member.bonus.vo
+ * 返回后端用户端查询奖金明细vo
  */
 @Data
 @Builder
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 73244cbc..2df3edee 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
@@ -77,7 +77,6 @@ public class MemberBonusFirstPurchaseVO extends PubMemberBonusVO {
 //    private BigDecimal globalPoints;
 
 
-
     /**
      * 新零售直推收益
      */
@@ -96,6 +95,24 @@ public class MemberBonusFirstPurchaseVO extends PubMemberBonusVO {
     @BigDecimalFormat
     private BigDecimal retailAreaIncome;
 
+    /**
+     * 福利级差收益
+     */
+    @BigDecimalFormat
+    private BigDecimal retailBenefitRangeIncome;
+
+    /**
+     * 复购级差收益
+     */
+    @BigDecimalFormat
+    private BigDecimal retailMonthRepurchaseIncome;
+
+    /**
+     * 福利分红收益
+     */
+    @BigDecimalFormat
+    private BigDecimal retailBenefitIncome;
+
     /**
      * 新零售收益小计
      */
diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml
index 56e18561..f36a43ef 100644
--- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml
@@ -61,6 +61,11 @@
         <result column="PK_VERTEX" property="pkVertex"/>
         <result column="SERVICE_CODE" property="serviceCode"/>
         <result column="NICK_NAME" property="nickName"/>
+
+        <result column="RETAIL_BENEFIT_RANGE_INCOME" property="retailBenefitRangeIncome"/>
+        <result column="RETAIL_MONTH_REPURCHASE_INCOME" property="retailMonthRepurchaseIncome"/>
+        <result column="RETAIL_BENEFIT_AVG_INCOME" property="retailBenefitAvgIncome"/>
+        <result column="RETAIL_BENEFIT_INCOME" property="retailBenefitIncome"/>
     </resultMap>
 
     <update id="updateCuMemberBonusStatus">
@@ -289,6 +294,7 @@
         cb.retail_same_level_income,
         cb.retail_area_income,
         cb.retail_benefit_range_income,
+        cb.retail_month_repurchase_income,
         cb.retail_benefit_avg_income,
         cb.retail_benefit_income,
         cb.retail_real_subtotal,
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 10d40514..e881bd72 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
@@ -7,13 +7,6 @@ import lombok.EqualsAndHashCode;
 import java.math.BigDecimal;
 import java.util.Date;
 
-/**
- * @Description:
- * @Author: sui q
- * @Time: 2023/2/1 10:27
- * @Classname: CuMemberBonusExt
- * @PackageName: com.hzs.common.domain.member.ext
- */
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class CuMemberBonusExt extends CuMemberBonus {