From fc1fdcde704d0ec5b96202bd66f93dd6a813cb53 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Tue, 17 Jun 2025 09:39:25 +0800
Subject: [PATCH] =?UTF-8?q?##=20Fix=20-=20=E7=9B=92=E6=95=B0(=E5=B0=8F?=
 =?UTF-8?q?=E5=8C=BA=E7=9B=92=E6=95=B0)=20&=20=E5=B8=82=E5=9C=BA=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81-=E6=9C=AC=E6=9C=88=E7=9B=92=E6=95=B0(=E6=97=A5?=
 =?UTF-8?q?=E7=BB=93.MONTH=5FBOX=5FNUM=20+=20TEAM=5FMONTH=5FBOX=5FNUM=20+?=
 =?UTF-8?q?=20=E7=A7=92=E7=BB=93.NEW=5FBOX=5FNUM=20+=20TEAM=5FNEW=5FBOX=5F?=
 =?UTF-8?q?NUM)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hzs/retail/member/utils/DataStatisticsUtil.java    | 2 +-
 .../mapper/member/achieve/CuMemberRetailRangeMapper.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
index 04273214..d5836207 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
@@ -180,7 +180,7 @@ public class DataStatisticsUtil {
                 .memberCode(SELF_VIRTUAL_NAME)
                 .totalBoxNum(
                         detailVO.getConsumeBoxNum()
-                        + detailVO.getNewBoxNum()
+//                        + detailVO.getNewBoxNum()
                         + detailVO.getSNewBoxNum()
                 )
                 .totalPv(
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml
index 6054564a..3a10d092 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml
@@ -887,7 +887,7 @@
             NVL( NVL( currentMonth.NEW_CONSUME_PV, 0 ) + NVL( currentMonth.TEAM_NEW_PV, 0 ), 0 ) yesterdayPv,
             NVL( NVL( currentMonth.NEW_BOX_NUM, 0 ) + NVL( currentMonth.TEAM_NEW_BOX_NUM, 0 ), 0 ) yesterdayBoxNum,
             NVL( NVL( currentMonth.MONTH_CONSUME_PV, 0 ) + NVL( currentDay.NEW_CONSUME_PV, 0 ) + NVL( currentDay.TEAM_NEW_PV, 0 ), 0 ) currentMonthPv,
-            NVL( NVL( currentMonth.MONTH_BOX_NUM, 0 ) + NVL( currentDay.NEW_BOX_NUM, 0 ) + NVL( currentDay.TEAM_NEW_BOX_NUM, 0 ), 0 ) currentMonthBoxNum,
+            NVL( NVL( currentMonth.MONTH_BOX_NUM, 0 ) + NVL( currentMonth.TEAM_MONTH_BOX_NUM, 0 ) + NVL( currentDay.NEW_BOX_NUM, 0 ) + NVL( currentDay.TEAM_NEW_BOX_NUM, 0 ), 0 ) currentMonthBoxNum,
             NVL( lastMonth.MONTH_CONSUME_PV, 0 ) lastMonthPv,
             NVL( lastMonth.MONTH_BOX_NUM, 0 ) lastMonthBoxNum,
             NVL( NVL( currentMonth.CONSUME_BOX_NUM, 0 ) + NVL( currentDay.NEW_BOX_NUM, 0 ) + NVL( currentDay.TEAM_NEW_BOX_NUM, 0 ), 0 ) totalBoxNum