diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java index f3035d1f..aef08d4a 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java @@ -453,13 +453,19 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl queryMemberList = new ArrayList<>(2); // 获取上第二、三层结算数据 - CuMemberRetailRangeExt memberFirst = memberRangeExtMap.get(newParentRetailDetail.getPointMemberFirst()); - if (null == memberFirst && null != newParentRetailDetail.getPointMemberFirst()) { - queryMemberList.add(newParentRetailDetail.getPointMemberFirst()); + if (null != newParentRetailDetail.getPointMemberFirst()) { + CuMemberRetailRangeExt memberFirst = memberRangeExtMap.get(newParentRetailDetail.getPointMemberFirst()); + if (null == memberFirst + || null == this.getRetailDetailMap(memberFirst, eBonusStage)) { + queryMemberList.add(newParentRetailDetail.getPointMemberFirst()); + } } - CuMemberRetailRangeExt memberSecond = memberRangeExtMap.get(newParentRetailDetail.getPointMemberSecond()); - if (null == memberSecond && null != newParentRetailDetail.getPointMemberSecond()) { - queryMemberList.add(newParentRetailDetail.getPointMemberSecond()); + if (null != newParentRetailDetail.getPointMemberSecond()) { + CuMemberRetailRangeExt memberSecond = memberRangeExtMap.get(newParentRetailDetail.getPointMemberSecond()); + if (null == memberSecond + || null == this.getRetailDetailMap(memberSecond, eBonusStage)) { + queryMemberList.add(newParentRetailDetail.getPointMemberSecond()); + } } if (CollectionUtil.isNotEmpty(queryMemberList)) { // 查询会员数据 @@ -509,9 +515,12 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl queryMemberList = new ArrayList<>(2); // 获取上第三层结算数据 - CuMemberRetailRangeExt memberUpFirst = memberRangeExtMap.get(newParentRetailDetail.getPointMemberFirst()); - if (null == memberUpFirst && null != newParentRetailDetail.getPointMemberFirst()) { - queryMemberList.add(newParentRetailDetail.getPointMemberFirst()); + if (null != newParentRetailDetail.getPointMemberFirst()) { + CuMemberRetailRangeExt memberUpFirst = memberRangeExtMap.get(newParentRetailDetail.getPointMemberFirst()); + if (null == memberUpFirst + || null == this.getRetailDetailMap(memberUpFirst, eBonusStage)) { + queryMemberList.add(newParentRetailDetail.getPointMemberFirst()); + } } // 获取上第一层结算数据 Long downFirstMember = null; @@ -528,9 +537,12 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl