From 0c00d28bddb2f9160ca36b2e1cec284daa279842 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 9 Oct 2025 16:51:43 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=8E=BB=E6=8E=89=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=A5=96=E8=A1=94=E6=9F=A5=E8=AF=A2=E5=A4=84?= =?UTF-8?q?=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/dto/RetailMemberDataDTO.java | 18 +++---- .../service/impl/MemberRetailServiceImpl.java | 12 ++--- .../retail/member/vo/RetailMemberInfoVO.java | 32 ++++++------ .../provider/CommonServiceProvider.java | 50 +++++++++---------- 4 files changed, 56 insertions(+), 56 deletions(-) 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 ec739671..7fddc84b 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 @@ -32,15 +32,15 @@ public class RetailMemberDataDTO implements Serializable { */ private Integer pkAwards; - /** - * 荣誉奖衔 - */ - private Integer pkMaxAwards; - - /** - * 分红奖衔 - */ - private Integer pkRangeAwards; +// /** +// * 荣誉奖衔 +// */ +// private Integer pkMaxAwards; +// +// /** +// * 分红奖衔 +// */ +// private Integer pkRangeAwards; /** * 国家名称 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 bd5860cd..94a9bc94 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 @@ -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) 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 1c6bd6e9..0905e93d 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 @@ -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; /** * 币种图标 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 8b208e13..305951b4 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 @@ -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());