From 344aa09b4ce72cd22ec1d462ff67d5a9c8add0a6 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 21 May 2025 16:14:16 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E4=BC=9A=E5=91=98=20BD62233572=EF=BC=8C5?= =?UTF-8?q?=E6=9C=8820=E5=88=B05=E6=9C=8831=E5=8F=B7=EF=BC=8C=E9=A2=86?= =?UTF-8?q?=E5=AF=BC=E5=A5=96=E5=85=8D=E8=80=83=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BonusSettleFirstPurchaseHandle.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java index e53d09dd..196f805e 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java @@ -1516,7 +1516,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { if (ESysName.LX.getValue().equals(BdConfig.getSysName())) { // 乐学系统 - // TODO new 2025年9月1日之前不需要校验,直接按奖衔拿 + // 2025年9月1日之前不需要校验,直接按奖衔拿 if (settleDateStr.compareTo("2025-09-01") < 0 && (EEnv.ONLINE.getValue().equals(BdConfig.getEnv()) || EEnv.TEST.getValue().equals(BdConfig.getEnv())) @@ -1524,6 +1524,15 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { // 生产环境(2025.09.01之前,领导奖不需要校验业绩,是什么奖衔就按什么奖衔处理) return bdAwards.getAwardsValue(); } + } else if (ESysName.BD.getValue().equals(BdConfig.getSysName())) { + // 北大系统 + // 2025.05.21 会员 BD62233572(10690),2025-06-01前领导奖免考 + if (coachAwardsMember.getPkMember().equals(10690L) + && (settleDateStr.compareTo("2025-06-01") < 0 + && settleDateStr.compareTo("2025-05-20") >= 0) + ) { + return bdAwards.getAwardsValue(); + } } if (EYesNo.YES.getIntValue() == coachAwardsMember.getPurchaseStatus()) {