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 ee567c64..3b1041e5 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 @@ -9,11 +9,7 @@ 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 @@ -32,14 +28,14 @@ public class RetailMemberDataDTO implements Serializable { private Integer pkGrade; /** - * 极差奖衔 + * 当月奖衔 */ private Integer pkAwards; /** * 荣誉奖衔 */ - private Integer pkRangeAwards; + private Integer pkMaxAwards; /** * 国家名称 @@ -71,23 +67,24 @@ public class RetailMemberDataDTO implements Serializable { * 等级图标 */ private String gradeIcon; + /** - * 极差奖衔显示 + * 月度奖衔显示 */ private String awardsVal; /** - * 极差奖衔图标 + * 月度奖衔图标 */ private String awardsIcon; /** * 荣誉奖衔显示 */ - private String rangeAwardsVal; + private String maxAwardsVal; /** * 荣誉奖衔图标 */ - private String rangeAwardsIcon; + private String maxAwardsIcon; /** * 币种图标 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 ffb5c0de..e8706879 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,7 +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(); // 会员标记(0=正常会员,1=V0会员,2=V5会员) @@ -77,8 +77,10 @@ public class MemberRetailServiceImpl implements IMemberRetailService { .gradeIcon(memberDataDTO.getGradeIcon()) .pkAwardsVal(memberDataDTO.getAwardsVal()) .awardsIcon(memberDataDTO.getAwardsIcon()) - .pkRangeAwardsVal(memberDataDTO.getRangeAwardsVal()) - .rangeAwardsIcon(memberDataDTO.getRangeAwardsIcon()) + .pkMaxAwardsVal(memberDataDTO.getMaxAwardsVal()) + .maxAwardsIcon(memberDataDTO.getMaxAwardsIcon()) +// .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 6cf20d6c..d5361f0e 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 @@ -76,22 +76,31 @@ public class RetailMemberInfoVO implements Serializable { private String gradeIcon; /** - * 极差奖衔名称 + * 当月奖衔名称 */ private String pkAwardsVal; /** - * 极差奖衔图标 + * 当月奖衔图标 */ private String awardsIcon; /** * 荣誉奖衔名称 */ - private String pkRangeAwardsVal; + private String pkMaxAwardsVal; /** * 荣誉奖衔图标 */ - private String rangeAwardsIcon; + private String maxAwardsIcon; + +// /** +// * 荣誉奖衔名称 +// */ +// 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 3ccbfc78..8b212fd4 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 @@ -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,13 +143,15 @@ public class CommonServiceProvider implements ICommonServiceApi { } } // 荣誉奖衔 - if (null != memberDataDTO.getPkRangeAwards()) { - BdAwards bdAwards = iBdAwardsService.getBdAwardsOne(memberDataDTO.getPkRangeAwards()); + if (null != memberDataDTO.getPkMaxAwards()) { + BdAwards bdAwards = iBdAwardsService.getBdAwardsOne(memberDataDTO.getPkMaxAwards()); if (null != bdAwards) { - memberDataDTO.setRangeAwardsVal(bdAwards.getAwardsName()); - if (EAwards.MEMBER.getValue() != bdAwards.getAwardsValue()) { - // 奖衔如果是会员级别不返回图标 - memberDataDTO.setRangeAwardsIcon(bdAwards.getImage()); + if (EAwards.MEMBER.getValue() == bdAwards.getAwardsValue()) { + memberDataDTO.setMaxAwardsVal(memberDataDTO.getAwardsVal()); + memberDataDTO.setMaxAwardsIcon(memberDataDTO.getAwardsIcon()); + } else { + memberDataDTO.setMaxAwardsVal(bdAwards.getAwardsName()); + memberDataDTO.setMaxAwardsIcon(bdAwards.getImage()); } } }