From ccec401f8429e5f9666accbf4a07eda84f13d0d5 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Thu, 12 Jun 2025 20:27:19 +0800
Subject: [PATCH] =?UTF-8?q?##=20Fix=20-=20=E6=9F=A5=E8=AF=A2=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E5=81=B6=E5=8F=91=E5=B8=A6=E5=88=86=E9=A1=B5&?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=9A=E5=91=98=E7=9B=92=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/controller/api/ApiRetailHomePageController.java    | 4 ++++
 .../retail/member/controller/api/RetailMemberController.java  | 2 ++
 2 files changed, 6 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 bb983bc3..d7db832d 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
@@ -46,7 +46,11 @@ public class ApiRetailHomePageController extends BaseController {
         CuMemberRetailDataStatisticsResultVO result = retailAchieveService.getRetailDataStatisticsDetail(pkMember, pkCountry, systemType);
         CuMemberRetailAchieveVO vo = CuMemberRetailAchieveVO.builder()
                 .totalBox(result.getTotalBoxNum())
+                .bigAreaBox(result.getBigRangeTotalBoxNum())
                 .smallAreaBox(result.getSmallRangeTotalBoxNum())
+                .totalSumPv(result.getTotalPv())
+                .bigArealPv(result.getBigRangeTotalPv())
+                .smallAreaPv(result.getSmallRangeTotalPv())
                 .build();
         return AjaxResult.success(vo);
 //        return AjaxResult.success(retailAchieveService.selectMemberSmallBox(pkMember, pkCountry, systemType));
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java
index 0d1d5c6e..084a5d29 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java
@@ -12,6 +12,7 @@ import com.hzs.common.core.annotation.RepeatSubmitSimple;
 import com.hzs.common.core.config.BdConfig;
 import com.hzs.common.core.constant.msg.AreaConstants;
 import com.hzs.common.core.enums.*;
+import com.hzs.common.core.utils.PageUtils;
 import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.domain.AjaxResult;
 import com.hzs.common.core.web.page.TableDataInfo;
@@ -258,6 +259,7 @@ public class RetailMemberController extends BaseController {
      */
     @GetMapping("/region-tree")
     public AjaxResult regionTree() {
+        PageUtils.clearPage();
         List<BdArea> areaList = iCuMemberRetailRegionService.listChooseRegion(SecurityUtils.getSystemType());
         if (CollectionUtil.isEmpty(areaList)) {
             log.info("region-tree: 111");