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

## 结算时，上下关联会员阶段数据补全；

This commit is contained in:
cabbage 2025-11-01 20:54:20 +08:00
parent ed1212b7e6
commit 8911e80a8d
1 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java
View File

@ -453,14 +453,20 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
List<Long> queryMemberList = new ArrayList<>(2); List<Long> queryMemberList = new ArrayList<>(2);
// 获取上第二、三层结算数据 // 获取上第二、三层结算数据
if (null != newParentRetailDetail.getPointMemberFirst()) {
CuMemberRetailRangeExt memberFirst = memberRangeExtMap.get(newParentRetailDetail.getPointMemberFirst()); CuMemberRetailRangeExt memberFirst = memberRangeExtMap.get(newParentRetailDetail.getPointMemberFirst());
if (null == memberFirst && null != newParentRetailDetail.getPointMemberFirst()) { if (null == memberFirst
|| null == this.getRetailDetailMap(memberFirst, eBonusStage)) {
queryMemberList.add(newParentRetailDetail.getPointMemberFirst()); queryMemberList.add(newParentRetailDetail.getPointMemberFirst());
} }
}
if (null != newParentRetailDetail.getPointMemberSecond()) {
CuMemberRetailRangeExt memberSecond = memberRangeExtMap.get(newParentRetailDetail.getPointMemberSecond()); CuMemberRetailRangeExt memberSecond = memberRangeExtMap.get(newParentRetailDetail.getPointMemberSecond());
if (null == memberSecond && null != newParentRetailDetail.getPointMemberSecond()) { if (null == memberSecond
|| null == this.getRetailDetailMap(memberSecond, eBonusStage)) {
queryMemberList.add(newParentRetailDetail.getPointMemberSecond()); queryMemberList.add(newParentRetailDetail.getPointMemberSecond());
} }
}
if (CollectionUtil.isNotEmpty(queryMemberList)) { if (CollectionUtil.isNotEmpty(queryMemberList)) {
// 查询会员数据 // 查询会员数据
List<CuMemberRetailRangeExt> retailList = cuMemberRetailRangeMapper.listCuMemberRetailRange(rangeTableName, queryMemberList); List<CuMemberRetailRangeExt> retailList = cuMemberRetailRangeMapper.listCuMemberRetailRange(rangeTableName, queryMemberList);
@ -509,10 +515,13 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
List<Long> queryMemberList = new ArrayList<>(2); List<Long> queryMemberList = new ArrayList<>(2);
// 获取上第三层结算数据 // 获取上第三层结算数据
if (null != newParentRetailDetail.getPointMemberFirst()) {
CuMemberRetailRangeExt memberUpFirst = memberRangeExtMap.get(newParentRetailDetail.getPointMemberFirst()); CuMemberRetailRangeExt memberUpFirst = memberRangeExtMap.get(newParentRetailDetail.getPointMemberFirst());
if (null == memberUpFirst && null != newParentRetailDetail.getPointMemberFirst()) { if (null == memberUpFirst
|| null == this.getRetailDetailMap(memberUpFirst, eBonusStage)) {
queryMemberList.add(newParentRetailDetail.getPointMemberFirst()); queryMemberList.add(newParentRetailDetail.getPointMemberFirst());
} }
}
// 获取上第一层结算数据 // 获取上第一层结算数据
Long downFirstMember = null; Long downFirstMember = null;
Integer downFirstPoint = null; Integer downFirstPoint = null;
@ -528,10 +537,13 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
downFirstPoint = newParentRetailDetail.getPoint12(); downFirstPoint = newParentRetailDetail.getPoint12();
break; break;
} }
if (null != downFirstMember) {
CuMemberRetailRangeExt memberDownFirst = memberRangeExtMap.get(downFirstMember); CuMemberRetailRangeExt memberDownFirst = memberRangeExtMap.get(downFirstMember);
if (null == memberDownFirst && null != downFirstMember) { if (null == memberDownFirst
|| null == this.getRetailDetailMap(memberDownFirst, eBonusStage)) {
queryMemberList.add(downFirstMember); queryMemberList.add(downFirstMember);
} }
}
if (CollectionUtil.isNotEmpty(queryMemberList)) { if (CollectionUtil.isNotEmpty(queryMemberList)) {
// 查询会员数据 // 查询会员数据
List<CuMemberRetailRangeExt> retailList = cuMemberRetailRangeMapper.listCuMemberRetailRange(rangeTableName, queryMemberList); List<CuMemberRetailRangeExt> retailList = cuMemberRetailRangeMapper.listCuMemberRetailRange(rangeTableName, queryMemberList);
@ -617,14 +629,20 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
} }
break; break;
} }
if (null != downSecondMember) {
CuMemberRetailRangeExt memberDownSecond = memberRangeExtMap.get(downSecondMember); CuMemberRetailRangeExt memberDownSecond = memberRangeExtMap.get(downSecondMember);
if (null == memberDownSecond && null != downSecondMember) { if (null == memberDownSecond
|| null == this.getRetailDetailMap(memberDownSecond, eBonusStage)) {
queryMemberList.add(downSecondMember); queryMemberList.add(downSecondMember);
} }
}
if (null != downFirstMember) {
CuMemberRetailRangeExt memberDownFirst = memberRangeExtMap.get(downFirstMember); CuMemberRetailRangeExt memberDownFirst = memberRangeExtMap.get(downFirstMember);
if (null == memberDownFirst && null != downFirstMember) { if (null == memberDownFirst
|| null == this.getRetailDetailMap(memberDownFirst, eBonusStage)) {
queryMemberList.add(downFirstMember); queryMemberList.add(downFirstMember);
} }
}
if (CollectionUtil.isNotEmpty(queryMemberList)) { if (CollectionUtil.isNotEmpty(queryMemberList)) {
// 查询会员数据 // 查询会员数据
List<CuMemberRetailRangeExt> retailList = cuMemberRetailRangeMapper.listCuMemberRetailRange(rangeTableName, queryMemberList); List<CuMemberRetailRangeExt> retailList = cuMemberRetailRangeMapper.listCuMemberRetailRange(rangeTableName, queryMemberList);