From 4bef2feacd0c4b5f390d375f0d8e7717cf503e22 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Sat, 5 Jul 2025 09:56:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?##=20Opt=20-=20=E7=A9=BA=E5=80=BC=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CuMemberRetailAchieveServiceImpl.java       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
index de6ec00a..8b707c7c 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
@@ -270,6 +270,11 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
         if(ObjectUtil.isEmpty(memberAchieveList)){
             return null;
         }
+        for (CuMemberRetailAchieveVO cuMemberRetailAchieveVO : memberAchieveList) {
+            if(ObjectUtil.isEmpty(cuMemberRetailAchieveVO.getArealPv())){
+                cuMemberRetailAchieveVO.setArealPv(BigDecimal.ZERO);
+            }
+        }
         CuMemberRetailAchieveVO maxAchieveVO = memberAchieveList.stream().max(Comparator.comparing(CuMemberRetailAchieveVO::getArealPv)).get();
         //查询小区业绩
         BigDecimal smallAreaPv = memberAchieveList.stream().filter(achieveVO -> !achieveVO.getPkMember().equals(maxAchieveVO.getPkMember())).map(vo -> null == vo.getArealPv() ? BigDecimal.ZERO : vo.getArealPv()).reduce(BigDecimal.ZERO, BigDecimal::add);

From 23db6a89181a49c705f608cf9f9114f18c89724d Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Sat, 5 Jul 2025 10:18:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?##=20Opt=20-=20=E7=A9=BA=E5=80=BC=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/controller/api/ApiRetailHomePageController.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/ApiRetailHomePageController.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/ApiRetailHomePageController.java
index e0812932..f5bcd896 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/ApiRetailHomePageController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/ApiRetailHomePageController.java
@@ -1,6 +1,7 @@
 package com.hzs.retail.member.controller.api;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.domain.AjaxResult;
 import com.hzs.common.core.web.page.TableDataInfo;
@@ -44,6 +45,9 @@ public class ApiRetailHomePageController extends BaseController {
         Long pkMember = SecurityUtils.getUserId();
         Integer pkCountry = SecurityUtils.getPkCountry();
         Integer systemType = SecurityUtils.getSystemType();
+        if(ObjectUtil.isEmpty(systemType)){
+            systemType = 2;
+        }
         CuMemberRetailDataStatisticsResultVO result = retailAchieveService.getRetailDataStatisticsDetail(pkMember, pkCountry, systemType);
         CuMemberRetailAchieveVO vo = CuMemberRetailAchieveVO.builder()
                 .totalBox(result.getTotalBoxNum())