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

## 去掉不需要的奖衔查询处理；

This commit is contained in:
cabbage 2025-10-09 16:51:43 +08:00
parent 5dfff40101
commit df0faa2c5b
4 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,15 +32,15 @@ public class RetailMemberDataDTO implements Serializable {
*/
private Integer pkAwards;
/**
* 荣誉奖衔
*/
private Integer pkMaxAwards;
/**
* 分红奖衔
*/
private Integer pkRangeAwards;
// /**
// * 荣誉奖衔
// */
// private Integer pkMaxAwards;
//
// /**
// * 分红奖衔
// */
// private Integer pkRangeAwards;
/**
* 国家名称

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

@ -36,8 +36,8 @@ public class MemberRetailServiceImpl implements IMemberRetailService {
.pkSettleCountry(CountryConstants.CHINA_COUNTRY)
.pkGrade(cuMember.getPkSettleGrade())
.pkAwards(cuMember.getPkAwards())
.pkRangeAwards(cuMember.getPkRangeAwards())
.pkMaxAwards(cuMember.getPkMaxAwards())
// .pkRangeAwards(cuMember.getPkRangeAwards())
// .pkMaxAwards(cuMember.getPkMaxAwards())
.build()).getData();
// 会员标记（0=正常会员）
@ -68,10 +68,10 @@ 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())
// .pkMaxAwardsVal(memberDataDTO.getMaxAwardsVal())
// .maxAwardsIcon(memberDataDTO.getMaxAwardsIcon())
// .pkRangeAwardsVal(memberDataDTO.getRangeAwardsVal())
// .rangeAwardsIcon(memberDataDTO.getRangeAwardsIcon())
.currencyIcon(memberDataDTO.getCurrencyIcon())
.memberSign(memberSign)
.control(control)

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

@ -84,23 +84,23 @@ public class RetailMemberInfoVO implements Serializable {
*/
private String awardsIcon;
/**
* 荣誉奖衔名称
*/
private String pkMaxAwardsVal;
/**
* 荣誉奖衔图标
*/
private String maxAwardsIcon;
// /**
// * 荣誉奖衔名称
// */
// private String pkMaxAwardsVal;
// /**
// * 荣誉奖衔图标
// */
// private String maxAwardsIcon;
/**
* 分红奖衔名称
*/
private String pkRangeAwardsVal;
/**
* 分红奖衔图标
*/
private String rangeAwardsIcon;
// /**
// * 分红奖衔名称
// */
// private String pkRangeAwardsVal;
// /**
// * 分红奖衔图标
// */
// private String rangeAwardsIcon;
/**
* 币种图标

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

@ -143,31 +143,31 @@ public class CommonServiceProvider implements ICommonServiceApi {
}
}
}
// 荣誉奖衔
if (null != memberDataDTO.getPkMaxAwards()) {
BdAwards bdAwards = iBdAwardsService.getBdAwardsOne(memberDataDTO.getPkMaxAwards());
if (null != bdAwards) {
if (null != monthAwards && monthAwards.getAwardsValue() > bdAwards.getAwardsValue()) {
// 月奖衔 大于 荣誉奖衔，显示月奖衔
memberDataDTO.setMaxAwardsVal(memberDataDTO.getAwardsVal());
memberDataDTO.setMaxAwardsIcon(memberDataDTO.getAwardsIcon());
} else {
memberDataDTO.setMaxAwardsVal(bdAwards.getAwardsName());
memberDataDTO.setMaxAwardsIcon(bdAwards.getImage());
}
}
}
// 分红奖衔
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.getPkMaxAwards()) {
// BdAwards bdAwards = iBdAwardsService.getBdAwardsOne(memberDataDTO.getPkMaxAwards());
// if (null != bdAwards) {
// if (null != monthAwards && monthAwards.getAwardsValue() > bdAwards.getAwardsValue()) {
// // 月奖衔 大于 荣誉奖衔，显示月奖衔
// memberDataDTO.setMaxAwardsVal(memberDataDTO.getAwardsVal());
// memberDataDTO.setMaxAwardsIcon(memberDataDTO.getAwardsIcon());
// } else {
// memberDataDTO.setMaxAwardsVal(bdAwards.getAwardsName());
// memberDataDTO.setMaxAwardsIcon(bdAwards.getImage());
// }
// }
// }
// // 分红奖衔
// 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());