From 7a17c2127ea16d3dffad93ea60e303535bf9d77f Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Thu, 19 Jun 2025 15:39:54 +0800
Subject: [PATCH] =?UTF-8?q?##=20get-info=E8=BF=94=E5=9B=9E=E5=88=86?=
 =?UTF-8?q?=E7=BA=A2=E5=A5=96=E8=A1=94=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/common/dto/RetailMemberDataDTO.java   | 14 ++++++++++++++
 .../service/impl/MemberRetailServiceImpl.java    |  5 +++--
 .../hzs/retail/member/vo/RetailMemberInfoVO.java | 16 ++++++++--------
 .../common/provider/CommonServiceProvider.java   | 11 +++++++++++
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/common/dto/RetailMemberDataDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/common/dto/RetailMemberDataDTO.java
index 3b1041e5..ec739671 100644
--- a/bd-api/bd-api-system/src/main/java/com/hzs/system/common/dto/RetailMemberDataDTO.java
+++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/common/dto/RetailMemberDataDTO.java
@@ -37,6 +37,11 @@ public class RetailMemberDataDTO implements Serializable {
      */
     private Integer pkMaxAwards;
 
+    /**
+     * 分红奖衔
+     */
+    private Integer pkRangeAwards;
+
     /**
      * 国家名称
      */
@@ -86,6 +91,15 @@ public class RetailMemberDataDTO implements Serializable {
      */
     private String maxAwardsIcon;
 
+    /**
+     * 分红奖衔名称
+     */
+    private String rangeAwardsVal;
+    /**
+     * 分红奖衔图标
+     */
+    private String rangeAwardsIcon;
+
     /**
      * 币种图标
      */
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java
index e8706879..5be7f781 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java
@@ -37,6 +37,7 @@ public class MemberRetailServiceImpl implements IMemberRetailService {
                     .pkSettleCountry(CountryConstants.CHINA_COUNTRY)
                     .pkGrade(cuMember.getPkSettleGrade())
                     .pkAwards(cuMember.getPkAwards())
+                    .pkRangeAwards(cuMember.getPkRangeAwards())
                     .pkMaxAwards(cuMember.getPkMaxAwards())
                     .build()).getData();
 
@@ -79,8 +80,8 @@ public class MemberRetailServiceImpl implements IMemberRetailService {
                     .awardsIcon(memberDataDTO.getAwardsIcon())
                     .pkMaxAwardsVal(memberDataDTO.getMaxAwardsVal())
                     .maxAwardsIcon(memberDataDTO.getMaxAwardsIcon())
-//                    .pkRangeAwardsVal(memberDataDTO.getRangeAwardsVal())
-//                    .rangeAwardsIcon(memberDataDTO.getRangeAwardsIcon())
+                    .pkRangeAwardsVal(memberDataDTO.getRangeAwardsVal())
+                    .rangeAwardsIcon(memberDataDTO.getRangeAwardsIcon())
                     .currencyIcon(memberDataDTO.getCurrencyIcon())
                     .memberSign(memberSign)
                     .control(control)
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java
index d5361f0e..25fbbecd 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java
@@ -93,14 +93,14 @@ public class RetailMemberInfoVO implements Serializable {
      */
     private String maxAwardsIcon;
 
-//    /**
-//     * 荣誉奖衔名称
-//     */
-//    private String pkRangeAwardsVal;
-//    /**
-//     * 荣誉奖衔图标
-//     */
-//    private String rangeAwardsIcon;
+    /**
+     * 分红奖衔名称
+     */
+    private String pkRangeAwardsVal;
+    /**
+     * 分红奖衔图标
+     */
+    private String rangeAwardsIcon;
 
     /**
      * 币种图标
diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/common/provider/CommonServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/common/provider/CommonServiceProvider.java
index 8b212fd4..3c0c3914 100644
--- a/bd-business/bd-business-system/src/main/java/com/hzs/system/common/provider/CommonServiceProvider.java
+++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/common/provider/CommonServiceProvider.java
@@ -155,6 +155,17 @@ public class CommonServiceProvider implements ICommonServiceApi {
                 }
             }
         }
+        // 分红奖衔
+        if (null != memberDataDTO.getPkRangeAwards()) {
+            BdAwards bdAwards = iBdAwardsService.getBdAwardsOne(memberDataDTO.getPkRangeAwards());
+            if (null != bdAwards) {
+                if (bdAwards.getAwardsValue() > EAwards.HIGH_MANAGER.getValue()) {
+                    // 前4级不显示分红奖衔
+                    memberDataDTO.setRangeAwardsVal(bdAwards.getAwardsName());
+                    memberDataDTO.setRangeAwardsIcon(bdAwards.getImage());
+                }
+            }
+        }
         // 币种
         if (null != memberDataDTO.getPkSettleCountry()) {
             BdCurrency bdCurrency = iBdCurrencyService.getCurrency(memberDataDTO.getPkSettleCountry());