angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 乐学2025.09.01之前，领导奖不需要考核月新増业绩；

This commit is contained in:
cabbage 2025-04-23 15:04:16 +08:00
parent f4d0293731
commit 07d5ea8d12
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java
View File

@ -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<CuMemberBonusCoach> 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<Long, CuMemberBonus> cuMemberBonusMap, Map<Long, SaOrderExt> saOrderExtMap, Map<Long, CuMemberAssess> cuMemberAssessMap,
Map<Long, CuMemberSettleExt> bonusIdSettleMap, CuMemberBonusExpand cuMemberBonusExpand, Map<Long, CuAwardsControl> cuAwardsControlMap,
Map<Long, CuMemberRiskControl> riskControlMap, Map<Long, CuMemberSettleExt> cuMemberBonusNumMap, List<BdAwards> 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<BdAwards> awardsList, CuMemberSettleExt coachAwardsMember, BdAwards bdAwards) {
private Integer getCoachAwardsMemberNum(List<BdAwards> awardsList, CuMemberSettleExt coachAwardsMember, BdAwards bdAwards, String settleDateStr) {
// 奖衔值倒序排序
List<BdAwards> 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;

2
hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java
View File

@ -357,8 +357,6 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
/**
* @Description: 每日计算会员奖金，最终的奖金
* @Author: sui q
* @Date: 2023/2/13 9:45
*/
@Override
@Transactional(rollbackFor = Exception.class)