From 8911e80a8d93e86f3144f29755b5ddff29767732 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Sat, 1 Nov 2025 20:54:20 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E7=BB=93=E7=AE=97=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E5=85=B3=E8=81=94=E4=BC=9A=E5=91=98=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B5=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=A8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CuMemberBonusStageServiceImpl.java   | 54 ++++++++++++-------
 1 file changed, 36 insertions(+), 18 deletions(-)

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<CuMemberBonusStag
 
         List<Long> 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<CuMemberBonusStag
 
         List<Long> 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<CuMemberBonusStag
                 downFirstPoint = newParentRetailDetail.getPoint12();
                 break;
         }
-        CuMemberRetailRangeExt memberDownFirst = memberRangeExtMap.get(downFirstMember);
-        if (null == memberDownFirst && null != downFirstMember) {
-            queryMemberList.add(downFirstMember);
+        if (null != downFirstMember) {
+            CuMemberRetailRangeExt memberDownFirst = memberRangeExtMap.get(downFirstMember);
+            if (null == memberDownFirst
+                    || null == this.getRetailDetailMap(memberDownFirst, eBonusStage)) {
+                queryMemberList.add(downFirstMember);
+            }
         }
         if (CollectionUtil.isNotEmpty(queryMemberList)) {
             // 查询会员数据
@@ -617,13 +629,19 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
                 }
                 break;
         }
-        CuMemberRetailRangeExt memberDownSecond = memberRangeExtMap.get(downSecondMember);
-        if (null == memberDownSecond && null != downSecondMember) {
-            queryMemberList.add(downSecondMember);
+        if (null != downSecondMember) {
+            CuMemberRetailRangeExt memberDownSecond = memberRangeExtMap.get(downSecondMember);
+            if (null == memberDownSecond
+                    || null == this.getRetailDetailMap(memberDownSecond, eBonusStage)) {
+                queryMemberList.add(downSecondMember);
+            }
         }
-        CuMemberRetailRangeExt memberDownFirst = memberRangeExtMap.get(downFirstMember);
-        if (null == memberDownFirst && null != downFirstMember) {
-            queryMemberList.add(downFirstMember);
+        if (null != downFirstMember) {
+            CuMemberRetailRangeExt memberDownFirst = memberRangeExtMap.get(downFirstMember);
+            if (null == memberDownFirst
+                    || null == this.getRetailDetailMap(memberDownFirst, eBonusStage)) {
+                queryMemberList.add(downFirstMember);
+            }
         }
         if (CollectionUtil.isNotEmpty(queryMemberList)) {
             // 查询会员数据