bd-api/bd-api-system/src/main/java/com/hzs/system/common/dto/RetailMemberDataDTO.java

@@ -9,7 +9,11 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * 新零售会员信息
+ * @Description: 新零售会员信息
+ * @Author: jiang chao
+ * @Time: 2024/12/11 15:46
+ * @Classname: RetailMemberDataDTO
+ * @PackageName: com.hzs.system.common.dto
  */
 @AllArgsConstructor
 @NoArgsConstructor
@@ -28,14 +32,14 @@ public class RetailMemberDataDTO implements Serializable {
     private Integer pkGrade;
 
     /**
-     * 当月奖衔
+     * 极差奖衔
      */
     private Integer pkAwards;
 
     /**
      * 荣誉奖衔
      */
-    private Integer pkMaxAwards;
+    private Integer pkRangeAwards;
 
     /**
      * 国家名称
@@ -67,24 +71,23 @@ public class RetailMemberDataDTO implements Serializable {
      * 等级图标
      */
     private String gradeIcon;
-
     /**
-     * 月度奖衔显示
+     * 极差奖衔显示
      */
     private String awardsVal;
     /**
-     * 月度奖衔图标
+     * 极差奖衔图标
      */
     private String awardsIcon;
 
     /**
      * 荣誉奖衔显示
      */
-    private String maxAwardsVal;
+    private String rangeAwardsVal;
     /**
      * 荣誉奖衔图标
      */
-    private String maxAwardsIcon;
+    private String rangeAwardsIcon;
 
     /**
      * 币种图标

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java

@@ -37,7 +37,7 @@ public class MemberRetailServiceImpl implements IMemberRetailService {
                     .pkSettleCountry(CountryConstants.CHINA_COUNTRY)
                     .pkGrade(cuMember.getPkSettleGrade())
                     .pkAwards(cuMember.getPkAwards())
-                    .pkMaxAwards(cuMember.getPkMaxAwards())
+                    .pkRangeAwards(cuMember.getPkRangeAwards())
                     .build()).getData();
 
             // 会员标记（0=正常会员，1=V0会员，2=V5会员）
@@ -77,10 +77,8 @@ public class MemberRetailServiceImpl implements IMemberRetailService {
                     .gradeIcon(memberDataDTO.getGradeIcon())
                     .pkAwardsVal(memberDataDTO.getAwardsVal())
                     .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)

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java

@@ -76,31 +76,22 @@ public class RetailMemberInfoVO implements Serializable {
     private String gradeIcon;
 
     /**
-     * 当月奖衔名称
+     * 极差奖衔名称
      */
     private String pkAwardsVal;
     /**
-     * 当月奖衔图标
+     * 极差奖衔图标
      */
     private String awardsIcon;
 
     /**
      * 荣誉奖衔名称
      */
-    private String pkMaxAwardsVal;
+    private String pkRangeAwardsVal;
     /**
      * 荣誉奖衔图标
      */
-    private String maxAwardsIcon;
-
-//    /**
-//     * 荣誉奖衔名称
-//     */
-//    private String pkRangeAwardsVal;
-//    /**
-//     * 荣誉奖衔图标
-//     */
-//    private String rangeAwardsIcon;
+    private String rangeAwardsIcon;
 
     /**
      * 币种图标

bd-business/bd-business-system/src/main/java/com/hzs/system/common/provider/CommonServiceProvider.java

@@ -131,7 +131,7 @@ public class CommonServiceProvider implements ICommonServiceApi {
                 memberDataDTO.setGradeVal(bdGrade.getGradeName());
             }
         }
-        // 当月奖衔
+        // 极差奖衔
         if (null != memberDataDTO.getPkAwards()) {
             BdAwards bdAwards = iBdAwardsService.getBdAwardsOne(memberDataDTO.getPkAwards());
             if (null != bdAwards) {
@@ -143,15 +143,13 @@ public class CommonServiceProvider implements ICommonServiceApi {
             }
         }
         // 荣誉奖衔
-        if (null != memberDataDTO.getPkMaxAwards()) {
-            BdAwards bdAwards = iBdAwardsService.getBdAwardsOne(memberDataDTO.getPkMaxAwards());
+        if (null != memberDataDTO.getPkRangeAwards()) {
+            BdAwards bdAwards = iBdAwardsService.getBdAwardsOne(memberDataDTO.getPkRangeAwards());
             if (null != bdAwards) {
-                if (EAwards.MEMBER.getValue() == bdAwards.getAwardsValue()) {
-                    memberDataDTO.setMaxAwardsVal(memberDataDTO.getAwardsVal());
-                    memberDataDTO.setMaxAwardsIcon(memberDataDTO.getAwardsIcon());
-                } else {
-                    memberDataDTO.setMaxAwardsVal(bdAwards.getAwardsName());
-                    memberDataDTO.setMaxAwardsIcon(bdAwards.getImage());
+                memberDataDTO.setRangeAwardsVal(bdAwards.getAwardsName());
+                if (EAwards.MEMBER.getValue() != bdAwards.getAwardsValue()) {
+                    // 奖衔如果是会员级别不返回图标
+                    memberDataDTO.setRangeAwardsIcon(bdAwards.getImage());
                 }
             }
         }