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

Compare commits

base: angelo:01d77cdf10487b522cd2317602a97529249ccfc4
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
..
compare: angelo:283b041012dc0ec48b6fd3291e63fa9befc0c4b7
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
angelo:master

2 Commits
01d77cdf10 ... 283b041012

Author SHA1 Message Date
cabbage 283b041012 Merge remote-tracking branch 'origin/dev' into dev 2025-06-19 17:40:38 +08:00
cabbage 724ff1ae61 ## 分红奖衔撤单回退处理； 2025-06-19 17:40:34 +08:00
1 changed files with 7 additions and 7 deletions
Show Stats Expand all files Collapse all files

14
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
View File

@ -945,7 +945,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
// new 升级奖衔判断： 月累计业绩 = 本人月消费业绩 + 团队月消费业绩 // new 升级奖衔判断： 月累计业绩 = 本人月消费业绩 + 团队月消费业绩
if (ComputeUtil.compareValue(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamMonthPv(), targetMemberRangeExt.getMonthConsumePv()), bdAwards.getTotalCheck())) { if (ComputeUtil.compareValue(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamMonthPv(), targetMemberRangeExt.getMonthConsumePv()), bdAwards.getTotalCheck())) {
// 累计业绩足够，即可升奖衔 // 累计业绩足够，即可升奖衔
cuMemberAwardsList.add(getCuMemberRetailAwards(targetMemberRangeExt, period, saOrderExt, bdAwards, EAwardsType.RANGE_TYPE.getValue())); cuMemberAwardsList.add(getCuMemberRetailAwards(targetMemberRangeExt, period, saOrderExt, bdAwards, EAwardsType.RANGE_TYPE.getValue(), targetMemberRangeExt.getPkAwards()));
targetMemberRangeExt.setPkAwards(bdAwards.getPkId()); targetMemberRangeExt.setPkAwards(bdAwards.getPkId());
targetMemberRangeExt.setAwardsValue(bdAwards.getAwardsValue()); targetMemberRangeExt.setAwardsValue(bdAwards.getAwardsValue());
targetMemberRangeExt.setAwardsName(bdAwards.getAwardsName()); targetMemberRangeExt.setAwardsName(bdAwards.getAwardsName());
@ -1014,7 +1014,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
break; break;
} }
} }
cuMemberAwardsList.add(getCuMemberRetailAwards(targetMemberRangeExt, period, saOrderExt, bdAwards, EAwardsType.SHARE_TYPE.getValue())); cuMemberAwardsList.add(getCuMemberRetailAwards(targetMemberRangeExt, period, saOrderExt, bdAwards, EAwardsType.SHARE_TYPE.getValue(), targetMemberRangeExt.getPkShareAwards()));
targetMemberRangeExt.setShareAwardsValue(bdAwards.getAwardsValue()); targetMemberRangeExt.setShareAwardsValue(bdAwards.getAwardsValue());
targetMemberRangeExt.setPkShareAwards(bdAwards.getPkId()); targetMemberRangeExt.setPkShareAwards(bdAwards.getPkId());
continue; continue;
@ -1134,7 +1134,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
// new 升级奖衔判断为当月累计业绩，累计业绩为团队业绩 + 个人消费业绩 // new 升级奖衔判断为当月累计业绩，累计业绩为团队业绩 + 个人消费业绩
if (ComputeUtil.compareValue(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamMonthPv(), targetMemberRangeExt.getMonthConsumePv()), bdAwards.getTotalCheck())) { if (ComputeUtil.compareValue(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamMonthPv(), targetMemberRangeExt.getMonthConsumePv()), bdAwards.getTotalCheck())) {
// 累计业绩足够，即可升奖衔 // 累计业绩足够，即可升奖衔
CuMemberAwards cuMemberRetailAwards = getCuMemberRetailAwards(targetMemberRangeExt, period, saOrderExt, bdAwards, EAwardsType.RANGE_TYPE.getValue()); CuMemberAwards cuMemberRetailAwards = getCuMemberRetailAwards(targetMemberRangeExt, period, saOrderExt, bdAwards, EAwardsType.RANGE_TYPE.getValue(), targetMemberRangeExt.getPkAwards());
cuMemberAwardsMap.put(cuMemberRetailAwards.getPkMember() + "_" + cuMemberRetailAwards.getNewLevel(), cuMemberRetailAwards); cuMemberAwardsMap.put(cuMemberRetailAwards.getPkMember() + "_" + cuMemberRetailAwards.getNewLevel(), cuMemberRetailAwards);
targetMemberRangeExt.setPkAwards(bdAwards.getPkId()); targetMemberRangeExt.setPkAwards(bdAwards.getPkId());
targetMemberRangeExt.setAwardsValue(bdAwards.getAwardsValue()); targetMemberRangeExt.setAwardsValue(bdAwards.getAwardsValue());
@ -1205,7 +1205,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
break; break;
} }
} }
CuMemberAwards cuMemberRetailAwards = getCuMemberRetailAwards(targetMemberRangeExt, period, saOrderExt, bdAwards, EAwardsType.SHARE_TYPE.getValue()); CuMemberAwards cuMemberRetailAwards = getCuMemberRetailAwards(targetMemberRangeExt, period, saOrderExt, bdAwards, EAwardsType.SHARE_TYPE.getValue(), targetMemberRangeExt.getPkShareAwards());
cuMemberShareAwardsMap.put(cuMemberRetailAwards.getPkMember() + "_" + cuMemberRetailAwards.getNewLevel(), cuMemberRetailAwards); cuMemberShareAwardsMap.put(cuMemberRetailAwards.getPkMember() + "_" + cuMemberRetailAwards.getNewLevel(), cuMemberRetailAwards);
targetMemberRangeExt.setShareAwardsValue(bdAwards.getAwardsValue()); targetMemberRangeExt.setShareAwardsValue(bdAwards.getAwardsValue());
targetMemberRangeExt.setPkShareAwards(bdAwards.getPkId()); targetMemberRangeExt.setPkShareAwards(bdAwards.getPkId());
@ -2177,15 +2177,15 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
return cuMemberAwards; return cuMemberAwards;
} }
private CuMemberAwards getCuMemberRetailAwards(CuMemberRetailRangeExt sourceRangeExt, Integer period, private CuMemberAwards getCuMemberRetailAwards(CuMemberRetailRangeExt sourceRangeExt, Integer period, SaOrderExt saOrderExt,
SaOrderExt saOrderExt, BdAwards bdRangeAwards, Integer awardType) { BdAwards bdRangeAwards, Integer awardType, Integer oldLevel) {
CuMemberAwards cuMemberAwards = CuMemberAwards.builder() CuMemberAwards cuMemberAwards = CuMemberAwards.builder()
.pkMember(sourceRangeExt.getPkMember()) .pkMember(sourceRangeExt.getPkMember())
.period(period) .period(period)
.upType(EUpgradeType.AUTO_UPGRADE.getValue()) .upType(EUpgradeType.AUTO_UPGRADE.getValue())
.awardType(awardType) .awardType(awardType)
// 原等级 // 原等级
.oldLevel(sourceRangeExt.getPkAwards()) .oldLevel(null == oldLevel ? sourceRangeExt.getPkAwards() : oldLevel)
.newLevel(bdRangeAwards.getPkId()) .newLevel(bdRangeAwards.getPkId())
// 默认不免考 // 默认不免考
.purchaseStatus(EYesNo.NO.getIntValue()) .purchaseStatus(EYesNo.NO.getIntValue())