From c106f48cad959fba74930701c53108bcd5c01964 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Tue, 22 Apr 2025 13:40:04 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E6=96=B0=E4=BC=9A=E5=91=98=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=9A=E7=BB=A9=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CuMemberAchieveServiceImpl.java      | 37 ++++++++++---------
 .../controller/api/ApiHomePageController.java |  8 +---
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java
index f0bb63d3..99f99613 100644
--- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java
+++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hzs.common.core.constant.*;
 import com.hzs.common.core.domain.R;
 import com.hzs.common.core.enums.*;
+import com.hzs.common.core.exception.ServiceException;
 import com.hzs.common.core.utils.*;
 import com.hzs.common.domain.member.achieve.CuMemberAchieve;
 import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
@@ -457,25 +458,25 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
             }
             // 查询会员首页业绩显示
             CuMemberAwardsUnderVO awardsUnderVO = iCuMemberTreeService.queryMemberPv(settleTable, pkMember, monthTable);
-
-            return CuMemberAwardsUnderVO.builder()
-                    .aNewPv(null != awardsUnderVO.getANewPv() ? awardsUnderVO.getANewPv() : BigDecimal.ZERO)
-                    .bNewPv(null != awardsUnderVO.getBNewPv() ? awardsUnderVO.getBNewPv() : BigDecimal.ZERO)
-                    .aMonthPv(null != awardsUnderVO.getAMonthPv() ? awardsUnderVO.getAMonthPv() : BigDecimal.ZERO)
-                    .bMonthPv(null != awardsUnderVO.getBMonthPv() ? awardsUnderVO.getBMonthPv() : BigDecimal.ZERO)
-                    .aSumPv(null != awardsUnderVO.getASumPv() ? awardsUnderVO.getASumPv() : BigDecimal.ZERO)
-                    .bSumPv(null != awardsUnderVO.getBSumPv() ? awardsUnderVO.getBSumPv() : BigDecimal.ZERO)
-                    .build();
-        } else {
-            return CuMemberAwardsUnderVO.builder()
-                    .aNewPv(BigDecimal.ZERO)
-                    .bNewPv(BigDecimal.ZERO)
-                    .aMonthPv(BigDecimal.ZERO)
-                    .bMonthPv(BigDecimal.ZERO)
-                    .aSumPv(BigDecimal.ZERO)
-                    .bSumPv(BigDecimal.ZERO)
-                    .build();
+            if (null != awardsUnderVO) {
+                return CuMemberAwardsUnderVO.builder()
+                        .aNewPv(null != awardsUnderVO.getANewPv() ? awardsUnderVO.getANewPv() : BigDecimal.ZERO)
+                        .bNewPv(null != awardsUnderVO.getBNewPv() ? awardsUnderVO.getBNewPv() : BigDecimal.ZERO)
+                        .aMonthPv(null != awardsUnderVO.getAMonthPv() ? awardsUnderVO.getAMonthPv() : BigDecimal.ZERO)
+                        .bMonthPv(null != awardsUnderVO.getBMonthPv() ? awardsUnderVO.getBMonthPv() : BigDecimal.ZERO)
+                        .aSumPv(null != awardsUnderVO.getASumPv() ? awardsUnderVO.getASumPv() : BigDecimal.ZERO)
+                        .bSumPv(null != awardsUnderVO.getBSumPv() ? awardsUnderVO.getBSumPv() : BigDecimal.ZERO)
+                        .build();
+            }
         }
+        return CuMemberAwardsUnderVO.builder()
+                .aNewPv(BigDecimal.ZERO)
+                .bNewPv(BigDecimal.ZERO)
+                .aMonthPv(BigDecimal.ZERO)
+                .bMonthPv(BigDecimal.ZERO)
+                .aSumPv(BigDecimal.ZERO)
+                .bSumPv(BigDecimal.ZERO)
+                .build();
     }
 
     /**
diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java
index a104f290..5baeb77d 100644
--- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java
+++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java
@@ -23,12 +23,6 @@ import java.util.*;
 
 /**
  * 会员首页
- *
- * @Description:
- * @Author: ljc
- * @Time: 2023/5/4 21:06
- * @Classname: ApiHomePageController
- * @Package_name: com.hzs.member.base.controller.api
  */
 @Slf4j
 @RequestMapping("/api/member")
@@ -67,7 +61,7 @@ public class ApiHomePageController {
     }
 
     /**
-     * 会员荣誉奖衔
+     * 会员业绩显示 -- 昨日、月、历史业绩
      *
      * @return AjaxResult
      */