From 93dce943023fcd0af88ad09791dc38d713bf8824 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 28 Apr 2025 11:40:32 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E4=B9=90=E5=AD=A6V1=E5=A4=8D=E8=B4=AD?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E6=94=B9=E4=B8=BA2980=EF=BC=8C=E4=B9=90?= =?UTF-8?q?=E5=AD=A6=E5=A4=8D=E8=B4=AD300=E7=BA=A7=E5=B7=AE=E5=87=8F?= =?UTF-8?q?=E5=B0=91=E4=B8=80=E7=BA=A7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BonusSettlePurchaseHandle.java | 34 +++++++++++-------- .../order/service/impl/SaOrderHandle.java | 8 ++--- .../controller/api/ApiBdWaresController.java | 6 ++-- .../impl/BdWaresSpecsSkuServiceImpl.java | 18 +++++----- .../core/constant/MagicNumberConstants.java | 15 +++++++- .../com/hzs/common/core/enums/EGrade.java | 6 +--- 6 files changed, 51 insertions(+), 36 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java index bc0baa48..b4416d1b 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java @@ -540,13 +540,14 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { BigDecimal maxBonus; if (ComputeUtil.compareValue(saOrderItems.getPrice(), MagicNumberConstants.LXYK_V1)) { // 价格大于等于3280,最多拨900 - maxBonus = BigDecimal.valueOf(900); + // 2025.04.28 需求调整去掉 V1 等级,最低为2980,最多拨600 + maxBonus = MagicNumberConstants.LXYK_BONUS_600; } else if (ComputeUtil.compareValue(saOrderItems.getPrice(), MagicNumberConstants.LXYK_V2)) { // 价格大于等于2980,最多拨600 - maxBonus = BigDecimal.valueOf(600); + maxBonus = MagicNumberConstants.LXYK_BONUS_600; } else if (ComputeUtil.compareValue(saOrderItems.getPrice(), MagicNumberConstants.LXYK_V3)) { // 价格大于等于2680,最多拨拨300 - maxBonus = BigDecimal.valueOf(300); + maxBonus = MagicNumberConstants.LXYK_BONUS_300; } else { maxBonus = BigDecimal.ZERO; } @@ -563,9 +564,10 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { break; } int pkGrade = sourceMemberTree.getPkGrade(); - if (pkGrade == 3) { + if (pkGrade == 3 || pkGrade == 4) { // 如果是 V1 直接跳过,开始计算 V2 - pkGrade = 4; + // 2025.04.28 需求调整去掉 V1 等级,V1 V2 就直接跳过,开始计算V3 + pkGrade = 5; } // 推荐人 CuMemberSettleExt parentMemberTree = cuMemberSettleExtMap.get(sourceMemberTree.getPkParent()); @@ -576,16 +578,20 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { } // 级差奖金 BigDecimal rangeOrder = BigDecimal.ZERO; - if (parentMemberTree.getPkGrade() == 4) { - // V2 拿 300 - rangeOrder = BigDecimal.valueOf(300); - } else if (parentMemberTree.getPkGrade() == 5) { +// if (parentMemberTree.getPkGrade() == 4) { +// // V2 拿 300 +// // 2025.04.28 需求调整去掉 V1 等级,V2 不需要拿了 +// rangeOrder = MagicNumberConstants.LXYK_BONUS_300; +// } else + if (parentMemberTree.getPkGrade() == 5) { // V3前没有V2,拿600; V3前有V2,拿300 - if (ComputeUtil.computeSubtract(maxBonus, grantBonus).compareTo(new BigDecimal(900)) == 0) { - rangeOrder = BigDecimal.valueOf(600); - } else { - rangeOrder = BigDecimal.valueOf(300); - } + // 2025.04.28 需求调整去掉 V1 等级,V3 拿300 + rangeOrder = MagicNumberConstants.LXYK_BONUS_300; +// if (ComputeUtil.computeSubtract(maxBonus, grantBonus).compareTo(new BigDecimal(900)) == 0) { +// rangeOrder = MagicNumberConstants.LXYK_BONUS_600; +// } else { +// rangeOrder = MagicNumberConstants.LXYK_BONUS_300; +// } } else if (parentMemberTree.getPkGrade() == 6) { // V4 拿剩下所有 rangeOrder = ComputeUtil.computeSubtract(maxBonus, grantBonus); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java index 8c91d3ba..88855b80 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java @@ -281,17 +281,17 @@ public class SaOrderHandle { && EYesNo.NO.getIntValue() == saOrderItems.getIsGift()) { // 乐学复购,价格根据等级固定 - if (cuMember.getPkSettleGrade().equals(gradeMap.get(70).getPkId())) { + if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.S_VIP.getValue()).getPkId())) { saOrderItems.setPrice(MagicNumberConstants.LXYK_V4); - } else if (cuMember.getPkSettleGrade().equals(gradeMap.get(60).getPkId())) { + } else if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.VIP.getValue()).getPkId())) { saOrderItems.setPrice(MagicNumberConstants.LXYK_V3); - } else if (cuMember.getPkSettleGrade().equals(gradeMap.get(50).getPkId())) { + } else if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.MAKER.getValue()).getPkId())) { saOrderItems.setPrice(MagicNumberConstants.LXYK_V2); } else { saOrderItems.setPrice(MagicNumberConstants.LXYK_V1); } // TODO new 乐学复购商品业绩为600 - saOrderItems.setAchievement(BigDecimal.valueOf(600)); + saOrderItems.setAchievement(MagicNumberConstants.LXYK_PV); } // 免邮的话不需要计算邮费 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java index 64624be1..dcfcad0b 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java @@ -245,11 +245,11 @@ public class ApiBdWaresController extends BaseController { } if (EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == cuWaresParams.getSpecialArea()) { // 乐学复购,价格根据等级固定 - if (cuMember.getPkSettleGrade().equals(gradeMap.get(70).getPkId())) { + if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.S_VIP.getValue()).getPkId())) { waresPrice = MagicNumberConstants.LXYK_V4; - } else if (cuMember.getPkSettleGrade().equals(gradeMap.get(60).getPkId())) { + } else if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.VIP.getValue()).getPkId())) { waresPrice = MagicNumberConstants.LXYK_V3; - } else if (cuMember.getPkSettleGrade().equals(gradeMap.get(50).getPkId())) { + } else if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.MAKER.getValue()).getPkId())) { waresPrice = MagicNumberConstants.LXYK_V2; } else { waresPrice = MagicNumberConstants.LXYK_V1; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java index b43713cd..994b180b 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java @@ -195,11 +195,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl gradeMap = gradeServiceApi.queryGradeList(pkCountry).getData().stream() .collect(Collectors.toMap(GradeDTO::getGradeValue, Function.identity())); BigDecimal price; - if (cuMember.getPkSettleGrade().equals(gradeMap.get(70).getPkId())) { + if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.S_VIP.getValue()).getPkId())) { price = MagicNumberConstants.LXYK_V4; - } else if (cuMember.getPkSettleGrade().equals(gradeMap.get(60).getPkId())) { + } else if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.VIP.getValue()).getPkId())) { price = MagicNumberConstants.LXYK_V3; - } else if (cuMember.getPkSettleGrade().equals(gradeMap.get(50).getPkId())) { + } else if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.MAKER.getValue()).getPkId())) { price = MagicNumberConstants.LXYK_V2; } else { price = MagicNumberConstants.LXYK_V1; @@ -569,11 +569,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl