## get-info返回分红奖衔;
This commit is contained in:
parent
a35e468103
commit
7a17c2127e
|
@ -37,6 +37,11 @@ public class RetailMemberDataDTO implements Serializable {
|
||||||
*/
|
*/
|
||||||
private Integer pkMaxAwards;
|
private Integer pkMaxAwards;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分红奖衔
|
||||||
|
*/
|
||||||
|
private Integer pkRangeAwards;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 国家名称
|
* 国家名称
|
||||||
*/
|
*/
|
||||||
|
@ -86,6 +91,15 @@ public class RetailMemberDataDTO implements Serializable {
|
||||||
*/
|
*/
|
||||||
private String maxAwardsIcon;
|
private String maxAwardsIcon;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分红奖衔名称
|
||||||
|
*/
|
||||||
|
private String rangeAwardsVal;
|
||||||
|
/**
|
||||||
|
* 分红奖衔图标
|
||||||
|
*/
|
||||||
|
private String rangeAwardsIcon;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 币种图标
|
* 币种图标
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -37,6 +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())
|
.pkMaxAwards(cuMember.getPkMaxAwards())
|
||||||
.build()).getData();
|
.build()).getData();
|
||||||
|
|
||||||
|
@ -79,8 +80,8 @@ public class MemberRetailServiceImpl implements IMemberRetailService {
|
||||||
.awardsIcon(memberDataDTO.getAwardsIcon())
|
.awardsIcon(memberDataDTO.getAwardsIcon())
|
||||||
.pkMaxAwardsVal(memberDataDTO.getMaxAwardsVal())
|
.pkMaxAwardsVal(memberDataDTO.getMaxAwardsVal())
|
||||||
.maxAwardsIcon(memberDataDTO.getMaxAwardsIcon())
|
.maxAwardsIcon(memberDataDTO.getMaxAwardsIcon())
|
||||||
// .pkRangeAwardsVal(memberDataDTO.getRangeAwardsVal())
|
.pkRangeAwardsVal(memberDataDTO.getRangeAwardsVal())
|
||||||
// .rangeAwardsIcon(memberDataDTO.getRangeAwardsIcon())
|
.rangeAwardsIcon(memberDataDTO.getRangeAwardsIcon())
|
||||||
.currencyIcon(memberDataDTO.getCurrencyIcon())
|
.currencyIcon(memberDataDTO.getCurrencyIcon())
|
||||||
.memberSign(memberSign)
|
.memberSign(memberSign)
|
||||||
.control(control)
|
.control(control)
|
||||||
|
|
|
@ -93,14 +93,14 @@ public class RetailMemberInfoVO implements Serializable {
|
||||||
*/
|
*/
|
||||||
private String maxAwardsIcon;
|
private String maxAwardsIcon;
|
||||||
|
|
||||||
// /**
|
/**
|
||||||
// * 荣誉奖衔名称
|
* 分红奖衔名称
|
||||||
// */
|
*/
|
||||||
// private String pkRangeAwardsVal;
|
private String pkRangeAwardsVal;
|
||||||
// /**
|
/**
|
||||||
// * 荣誉奖衔图标
|
* 分红奖衔图标
|
||||||
// */
|
*/
|
||||||
// private String rangeAwardsIcon;
|
private String rangeAwardsIcon;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 币种图标
|
* 币种图标
|
||||||
|
|
|
@ -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()) {
|
if (null != memberDataDTO.getPkSettleCountry()) {
|
||||||
BdCurrency bdCurrency = iBdCurrencyService.getCurrency(memberDataDTO.getPkSettleCountry());
|
BdCurrency bdCurrency = iBdCurrencyService.getCurrency(memberDataDTO.getPkSettleCountry());
|
||||||
|
|
Loading…
Reference in New Issue