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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
sangelxiu1 2025-06-20 18:15:21 +08:00
parent c1bb43f3bd 55f5e0523d
commit 1a083b499b
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
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());
@ -962,7 +962,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
BdAwards bdAwards = retailAwardsMap.get(awardsValue); BdAwards bdAwards = retailAwardsMap.get(awardsValue);
// 先验证累计业绩 // 先验证累计业绩
if (ComputeUtil.compareValue(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamMonthPv(), targetMemberRangeExt.getMonthConsumePv()), bdAwards.getShareTotalCheck())) { if (ComputeUtil.compareValue(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamMonthPv(), targetMemberRangeExt.getMonthConsumePv()), bdAwards.getShareTotalCheck())) {
// 验证小区，计算小区业绩（拉取直推会员数据） // 再验证小区，计算小区业绩（拉取直推会员数据）
List<CuMemberRetailRangeExt> cuMemberRangeExtList; List<CuMemberRetailRangeExt> cuMemberRangeExtList;
if (secondRangeTableName != null) { if (secondRangeTableName != null) {
// 会员表 关联 秒结表 和 昨日结算表，查询订单会员直推数据 // 会员表 关联 秒结表 和 昨日结算表，查询订单会员直推数据
@ -992,9 +992,10 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
if (bdAwards.getPlaceDeptNum() > 0) { if (bdAwards.getPlaceDeptNum() > 0) {
// 验证是否有多个区满足业绩 // 验证是否有多个区满足业绩
List<CuMemberRetailRangeExt> cuMemberRetailRangeExtList; List<CuMemberRetailRangeExt> cuMemberRetailRangeExtList;
// 非秒结需要查询日结相关数据，秒结表使用上面查出的数据就可以
if (secondRangeTableName != null) { if (secondRangeTableName != null) {
// 会员表 关联 秒结表 和 昨日结算表，查询订单会员直推数据 // 会员表 关联 秒结表 和 昨日结算表，查询订单会员直推数据
cuMemberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); cuMemberRetailRangeExtList = cuMemberRangeExtList;
} else { } else {
// 昨日结算表，查询订单会员直推数据 // 昨日结算表，查询订单会员直推数据
cuMemberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeEnoughAchieve(rangeTableName, targetMemberRangeExt.getPkMember(), bdAwards.getShareCommunityCheck()); cuMemberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeEnoughAchieve(rangeTableName, targetMemberRangeExt.getPkMember(), bdAwards.getShareCommunityCheck());
@ -1014,7 +1015,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 +1135,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 +1206,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 +2178,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())

2
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
View File

@ -689,7 +689,7 @@
</select> </select>
<select id="queryCuMemberSecondRangeExtByParent" resultMap="CuMemberRetailRangeExt"> <select id="queryCuMemberSecondRangeExtByParent" resultMap="CuMemberRetailRangeExt">
select cm.pk_id pkMember, select cm.pk_id pk_member,
cm.pk_parent, cm.pk_parent,
nvl(b.month_consume_pv, 0) + nvl(a.new_consume_pv, 0) month_consume_pv, nvl(b.month_consume_pv, 0) + nvl(a.new_consume_pv, 0) month_consume_pv,
nvl(b.team_month_pv, 0) + nvl(a.team_new_pv, 0) team_month_pv, nvl(b.team_month_pv, 0) + nvl(a.team_new_pv, 0) team_month_pv,