angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## get-info返回会员荣誉奖衔；

This commit is contained in:
cabbage 2025-06-14 09:45:28 +08:00
parent 634f657163
commit 19de07fd43
4 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -37,7 +37,7 @@ public class MemberRetailServiceImpl implements IMemberRetailService {
.pkSettleCountry(CountryConstants.CHINA_COUNTRY) .pkSettleCountry(CountryConstants.CHINA_COUNTRY)
.pkGrade(cuMember.getPkSettleGrade()) .pkGrade(cuMember.getPkSettleGrade())
.pkAwards(cuMember.getPkAwards()) .pkAwards(cuMember.getPkAwards())
.pkRangeAwards(cuMember.getPkRangeAwards()) .pkMaxAwards(cuMember.getPkMaxAwards())
.build()).getData(); .build()).getData();
// 会员标记（0=正常会员，1=V0会员，2=V5会员） // 会员标记（0=正常会员，1=V0会员，2=V5会员）
@ -77,8 +77,10 @@ public class MemberRetailServiceImpl implements IMemberRetailService {
.gradeIcon(memberDataDTO.getGradeIcon()) .gradeIcon(memberDataDTO.getGradeIcon())
.pkAwardsVal(memberDataDTO.getAwardsVal()) .pkAwardsVal(memberDataDTO.getAwardsVal())
.awardsIcon(memberDataDTO.getAwardsIcon()) .awardsIcon(memberDataDTO.getAwardsIcon())
.pkRangeAwardsVal(memberDataDTO.getRangeAwardsVal()) .pkMaxAwardsVal(memberDataDTO.getMaxAwardsVal())
.rangeAwardsIcon(memberDataDTO.getRangeAwardsIcon()) .maxAwardsIcon(memberDataDTO.getMaxAwardsIcon())
// .pkRangeAwardsVal(memberDataDTO.getRangeAwardsVal())
// .rangeAwardsIcon(memberDataDTO.getRangeAwardsIcon())
.currencyIcon(memberDataDTO.getCurrencyIcon()) .currencyIcon(memberDataDTO.getCurrencyIcon())
.memberSign(memberSign) .memberSign(memberSign)
.control(control) .control(control)

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

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

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

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