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

## 分红奖衔秒结处理；

This commit is contained in:
cabbage 2025-06-20 17:06:06 +08:00
parent 63cc9acb4a
commit f1264dd994
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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());

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,