From 0d4c3a392777313c9cc8942a4e74a738c2263a84 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Sat, 1 Nov 2025 21:16:52 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=A5=96=E9=87=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9A=201.=E6=88=90=E4=B8=BA=E9=93=B6=E7=BA=A7=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E6=94=B9=E4=B8=BA=E8=B5=A0=E9=80=811000=E5=85=83?= =?UTF-8?q?=E4=BA=A7=E5=93=81=EF=BC=8C=E6=88=90=E4=B8=BA=E9=87=91=E7=BA=A7?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=94=B9=E4=B8=BA=E8=B5=A0=E9=80=813000?= =?UTF-8?q?=E5=85=83=E4=BA=A7=E5=93=81=E3=80=82=202.=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=9C=A8=E7=B2=BE=E5=93=81=E4=B8=93=E5=8C=BA=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E7=9A=84=E4=BC=9A=E5=91=98=E6=8E=A8=E8=8D=90=E5=A5=9610%,?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=93=B6=E7=BA=A7=E4=BC=9A=E5=91=98=E3=80=81?= =?UTF-8?q?=E9=87=91=E7=BA=A7=E4=BC=9A=E5=91=98=E6=8E=A8=E8=8D=90=E7=BB=99?= =?UTF-8?q?1000=E5=85=83=E3=80=812000=E5=85=83=E4=BA=A7=E5=93=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BonusSettleRangeHandle.java | 43 +++++++++---------- .../hzs/bonus/constant/BonusConstants.java | 4 +- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java index fa88041d..032228da 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java @@ -403,10 +403,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { this.calculateRetailRangeBonus(cuMemberBonusRangeList, memberRangeExtMap, cuMemberBonusMap, bonusConfigDTO, period, awardsMap, saOrderExt, sourceMember); - // 2025.10.27需求调整，去掉直推收益 -// // 直推收益 -- 来源订单金额，直推拿业绩的10% -// this.calculateDirectIncome(cuMemberBonusPushList, memberRangeExtMap, sourceMember, saOrderExt, -// bonusConfigDTO, period, cuMemberBonusMap); + // 直推收益 -- 来源订单金额，直推拿业绩的10% + this.calculateDirectIncome(cuMemberBonusPushList, memberRangeExtMap, sourceMember, saOrderExt, + bonusConfigDTO, period, cuMemberBonusMap); // 2025.10.27需求调整，订单满指定PV对应给指定赠品积分 this.calculateGiftPoint(memberRangeExtMap, saOrderExt, cuMemberBonusMap, cuMemberBonusDetailList, bonusConfigDTO, period); @@ -1462,17 +1461,17 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 赠送积分 BigDecimal giftPoint = BigDecimal.ZERO; - // 推荐赠送积分 - BigDecimal targetGiftPoint = BigDecimal.ZERO; +// // 推荐赠送积分 +// BigDecimal targetGiftPoint = BigDecimal.ZERO; if (orderAchieve.compareTo(BonusConstants.GIFT_TWO_AMOUNT) >= 0) { // 订单业绩大于等于2万 giftPoint = BonusConstants.GIFT_TWO_POINT; - targetGiftPoint = BonusConstants.TARGET_GIFT_TWO_POINT; +// targetGiftPoint = BonusConstants.TARGET_GIFT_TWO_POINT; } else if (orderAchieve.compareTo(BonusConstants.GIFT_ONE_AMOUNT) >= 0) { // 订单业绩大于等于1万 giftPoint = BonusConstants.GIFT_ONE_POINT; - targetGiftPoint = BonusConstants.TARGET_GIFT_ONE_POINT; +// targetGiftPoint = BonusConstants.TARGET_GIFT_ONE_POINT; } if (giftPoint.compareTo(BigDecimal.ZERO) > 0 && null != sourceMember) { @@ -1488,20 +1487,20 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } cuMemberBonusDetailList.add(cuMemberBonusDetail); } - if (targetGiftPoint.compareTo(BigDecimal.ZERO) > 0 && null != targetMember && targetMember.getGradeValue() >= EGrade.HAI_FAN.getValue()) { - // 银卡 或 金卡会员推荐才有奖励 - CuMemberBonus cuMemberBonus = getCuMemberBonus(period, cuMemberBonusMap, targetMember.getPkMember(), - targetMember.getIncomeStatus(), targetMember.getPkSettleCountry(), targetMember.getPkRate() == null ? saOrderExt.getPkRate() : targetMember.getPkRate()); - int pkBonusItems = getPkBonusItems(bonusConfigDTO, targetMember.getPkSettleCountry(), EBonusItems.GIFT_POINT.getValue()); - CuMemberBonusDetail cuMemberBonusDetail = getCuMemberBonusDetail(saOrderExt, targetMember, cuMemberBonus, pkBonusItems); - cuMemberBonusDetail.setPretaxIncome(targetGiftPoint); - setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusDetail, saOrderExt.getOrderAmount(), saOrderExt.getInExchangeRate()); - giftPointRemark(saOrderExt, cuMemberBonusDetail, targetMember); - if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusDetail.getIncomeStatus()) { - cuMemberBonus.setBackPoints(ComputeUtil.computeAdd(cuMemberBonus.getBackPoints(), targetGiftPoint)); - } - cuMemberBonusDetailList.add(cuMemberBonusDetail); - } +// if (targetGiftPoint.compareTo(BigDecimal.ZERO) > 0 && null != targetMember && targetMember.getGradeValue() >= EGrade.HAI_FAN.getValue()) { +// // 银卡 或 金卡会员推荐才有奖励 +// CuMemberBonus cuMemberBonus = getCuMemberBonus(period, cuMemberBonusMap, targetMember.getPkMember(), +// targetMember.getIncomeStatus(), targetMember.getPkSettleCountry(), targetMember.getPkRate() == null ? saOrderExt.getPkRate() : targetMember.getPkRate()); +// int pkBonusItems = getPkBonusItems(bonusConfigDTO, targetMember.getPkSettleCountry(), EBonusItems.GIFT_POINT.getValue()); +// CuMemberBonusDetail cuMemberBonusDetail = getCuMemberBonusDetail(saOrderExt, targetMember, cuMemberBonus, pkBonusItems); +// cuMemberBonusDetail.setPretaxIncome(targetGiftPoint); +// setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusDetail, saOrderExt.getOrderAmount(), saOrderExt.getInExchangeRate()); +// giftPointRemark(saOrderExt, cuMemberBonusDetail, targetMember); +// if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusDetail.getIncomeStatus()) { +// cuMemberBonus.setBackPoints(ComputeUtil.computeAdd(cuMemberBonus.getBackPoints(), targetGiftPoint)); +// } +// cuMemberBonusDetailList.add(cuMemberBonusDetail); +// } } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/constant/BonusConstants.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/constant/BonusConstants.java index 99b0f217..39991ed7 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/constant/BonusConstants.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/constant/BonusConstants.java @@ -34,11 +34,11 @@ public class BonusConstants { /** * 2万业绩赠送积分 */ - public static final BigDecimal GIFT_TWO_POINT = new BigDecimal("7000"); + public static final BigDecimal GIFT_TWO_POINT = new BigDecimal("3000"); /** * 1万业绩赠送积分 */ - public static final BigDecimal GIFT_ONE_POINT = new BigDecimal("2000"); + public static final BigDecimal GIFT_ONE_POINT = new BigDecimal("1000"); /** * 推荐2万业绩会员赠送积分