From 42d1d7829770e1d98369d0bf71375ed6cabcfe4b Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 23 Apr 2025 15:04:16 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E4=B9=90=E5=AD=A62025.09.01=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=EF=BC=8C=E9=A2=86=E5=AF=BC=E5=A5=96=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=80=83=E6=A0=B8=E6=9C=88=E6=96=B0=E5=A2=97=E4=B8=9A?= =?UTF-8?q?=E7=BB=A9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BonusSettleFirstPurchaseHandle.java | 19 ++++++++++++++----- .../service/impl/BonusSettleServiceImpl.java | 2 -- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java index 87ba5a19..4648d7c9 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.hzs.bonus.bonus.service.ICuMemberBonusDelayService; import com.hzs.bonus.bonus.vo.BonusRecordDetailVO; +import com.hzs.common.core.config.HzsConfig; import com.hzs.common.core.constant.*; import com.hzs.common.core.constant.msg.BonusMsgConstants; import com.hzs.common.core.enums.*; @@ -720,7 +721,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { // } List coachBonusList = calculateBonusCoach(cuMemberSettleExtMap, bonusConfigDTO, period, cuMemberBonusMap, saOrderExtMap, cuMemberAssessMap, bonusIdSettleMap, cuMemberBonusExpand, cuAwardsControlMap, - riskControlMap, cuMemberBonusNumMap, awardsList, firstBool, orderBool); + riskControlMap, cuMemberBonusNumMap, awardsList, firstBool, orderBool, settleDateStr); if (coachBonusList.size() > 0) { cuMemberBonusCoachList.addAll(coachBonusList); } @@ -736,7 +737,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { Map cuMemberBonusMap, Map saOrderExtMap, Map cuMemberAssessMap, Map bonusIdSettleMap, CuMemberBonusExpand cuMemberBonusExpand, Map cuAwardsControlMap, Map riskControlMap, Map cuMemberBonusNumMap, List awardsList, - boolean firstBool, boolean orderBool) { + boolean firstBool, boolean orderBool, String settleDateStr) { // 目前这个会员只用来处理备注会员信息使用 CuMemberSettleExt sourceMemberSettleExt = bonusIdSettleMap.get(cuMemberBonusExpand.getPkBonus()); // 用于回写血缘总共多少代 @@ -792,7 +793,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { BdAwards awardsCouch = getBdAwards(bonusConfigDTO, targetMemberSettleExt, cuAwardsControlMap); // 获取奖衔能拿多少代领导奖的奖衔值 - Integer awardsValue = this.getCoachAwardsMemberNum(awardsList, coachAwardsMember, awardsCouch); + Integer awardsValue = this.getCoachAwardsMemberNum(awardsList, coachAwardsMember, awardsCouch, settleDateStr); // 判断是否有奖金 if (awardsValue >= MagicNumberConstants.BLOOD_GENERATION_SERIES * i) { @@ -1568,13 +1569,21 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { * @param awardsList 奖衔列表 * @param coachAwardsMember 会员奖衔数据（上月结余、本月新増等） * @param bdAwards 当前奖衔（处理过真实奖衔控制） + * @param settleDateStr 结算日期（2025-09-01） * @return */ - private Integer getCoachAwardsMemberNum(List awardsList, CuMemberSettleExt coachAwardsMember, BdAwards bdAwards) { + private Integer getCoachAwardsMemberNum(List awardsList, CuMemberSettleExt coachAwardsMember, BdAwards bdAwards, String settleDateStr) { // 奖衔值倒序排序 List tmpAwardsList = awardsList.stream().sorted(Comparator.comparingInt(BdAwards::getAwardsValue).reversed()).collect(Collectors.toList()); - // TODO new 2025年9月之前不需要校验，直接按奖衔拿 + // TODO new 2025年9月1日之前不需要校验，直接按奖衔拿 + if (settleDateStr.compareTo("2025-09-01") < 0 + && (EEnv.ONLINE.getValue().equals(HzsConfig.getEnv()) + || EEnv.TEST.getValue().equals(HzsConfig.getEnv())) + ) { + // 生产环境（2025.09.01之前，领导奖不需要校验业绩，是什么奖衔就按什么奖衔处理） + return bdAwards.getAwardsValue(); + } // 小区业绩 BigDecimal smallPV; diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java index e4de8a16..33e596be 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java @@ -357,8 +357,6 @@ public class BonusSettleServiceImpl implements IBonusSettleService { /** * @Description: 每日计算会员奖金，最终的奖金 - * @Author: sui q - * @Date: 2023/2/13 9:45 */ @Override @Transactional(rollbackFor = Exception.class)