From 9ca1e812e5b7c18fefec61334ff0f4eb532a1110 Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Tue, 23 Sep 2025 10:25:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?##=20=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/base/service/impl/ICumemberRetailDetailImpl.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailImpl.java
index 8bf481b4..46ef4631 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailImpl.java
@@ -47,8 +47,7 @@ public class ICumemberRetailDetailImpl extends ServiceImpl<CuMemberRetailDetailM
                 cuMemberRetailDetail.getPointMember11(), cuMemberRetailDetail.getPointMember12(),
                 cuMemberRetailDetail.getPointMember21(), cuMemberRetailDetail.getPointMember22(), cuMemberRetailDetail.getPointMember23(), cuMemberRetailDetail.getPointMember24(),
                 cuMemberRetailDetail.getPointMember31(), cuMemberRetailDetail.getPointMember32(), cuMemberRetailDetail.getPointMember33(), cuMemberRetailDetail.getPointMember34(),
-                cuMemberRetailDetail.getPointMember35(), cuMemberRetailDetail.getPointMember36(), cuMemberRetailDetail.getPointMember37(), cuMemberRetailDetail.getPointMember38(),
-                cuMemberRetailDetail.getPointMemberFirst(), cuMemberRetailDetail.getPointMemberSecond(), cuMemberRetailDetail.getPointMemberThird()
+                cuMemberRetailDetail.getPointMember35(), cuMemberRetailDetail.getPointMember36(), cuMemberRetailDetail.getPointMember37(), cuMemberRetailDetail.getPointMember38()
         ).filter(Objects::nonNull).forEach(ids::add);
 
         // 查找对应会员信息

From ff594b02642db9335ea007628efd64c36f2e9e14 Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Tue, 23 Sep 2025 11:05:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?##=20=E4=BC=9A=E5=91=98=E6=97=A5=E7=BB=93?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/manage/MemberStructureController.java          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
index 43eaee5d..6bcf17bc 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
@@ -235,6 +235,10 @@ public class MemberStructureController extends BaseController {
         }
         CuMemberRetailDetail cuMemberRetailDetail = iCumemberRetailDetail.getCuMemberRetailDetail(memberCode,stage,stageStatus,childNode,settleTableName);
         log.info("日结表会员信息{}",cuMemberRetailDetail);
+        if (cuMemberRetailDetail == null) {
+            log.error("当前会员日结信息不存在");
+            return AjaxResult.error("当前会员日结信息不存在");
+        }
         // 拼接树形结构
         List<Tree<String>> cuMemberRetailTree = iCumemberRetailDetail.convertToNodeList(cuMemberRetailDetail);
         return AjaxResult.success(cuMemberRetailTree);