From 7f6ac2347a4c4987d9c697d63d51a5f4f7c39e24 Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Mon, 29 Sep 2025 09:26:02 +0800
Subject: [PATCH] =?UTF-8?q?##=20bug421=20=E6=9F=A5=E8=AF=A2=E8=A1=A8?=
 =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9,=E6=9F=A5=E8=AF=A2=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzs/member/base/controller/api/ApiMemberController.java   | 3 +++
 .../resources/mapper/member/base/CuMemberRetailMapper.xml     | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java
index f93a946e..ba626f08 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java
@@ -467,6 +467,9 @@ public class ApiMemberController extends BaseController {
             return AjaxResult.error("数据查询错误,请联系客服处理");
         }
         MemberPointVO memberPointVO = iCuMemberRetailService.getMemberPointByUserId(settleDetailTableName,settleTableName,userId);
+        if (memberPointVO == null) {
+            return AjaxResult.error("数据查询错误,请联系客服处理");
+        }
         memberPointVO.setMemberSettlePeriod(csPeriod.getSettleDate());
         startPage();
         return AjaxResult.success(memberPointVO);
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml
index e924e9f9..07818ac7 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml
@@ -108,9 +108,9 @@
             COUNT(CASE WHEN curd.STAGE = 2 AND curd.STAGE_STATUS = 1 THEN 1 END) AS secondOrderQuantity,
             COUNT(CASE WHEN curd.STAGE = 3 AND curd.STAGE_STATUS = 1 THEN 1 END) AS threeOrderQuantity
         FROM
-            #{settleTableName} cmr
+            ${settleTableName} cmr
                 LEFT JOIN CU_MEMBER cu ON cmr.PK_MEMBER = cu.PK_ID
-                LEFT JOIN #{settleDetailTableName} curd ON cmr.PK_MEMBER = curd.PK_MEMBER
+                LEFT JOIN ${settleDetailTableName} curd ON cmr.PK_MEMBER = curd.PK_MEMBER
         WHERE
             cmr.PK_MEMBER = #{userId}
         GROUP BY