From aa282c7cdebccf2eb328f9e8d8858d6d104da48a Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Wed, 2 Jul 2025 10:12:00 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E7=A7=92=E7=BB=93=E7=9B=92?=
 =?UTF-8?q?=E6=95=B0&=E4=B8=9A=E7=BB=A9=E5=8F=96=E5=80=BC=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2(ALL=5F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../achieve/CuMemberRetailRangeMapper.xml      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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 51a94956..24fc771e 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
@@ -855,10 +855,10 @@
             NVL( mr.SMALL_BOX_NUM, 0 ) smallBoxNum,
 
 
-            NVL( mrs.NEW_BOX_NUM, 0 ) sNewBoxNum,
-            NVL( mrs.TEAM_NEW_BOX_NUM, 0 ) sTeamNewBoxNum,
-            NVL( mrs.NEW_CONSUME_PV, 0 ) sNewConsumePv,
-            NVL( mrs.TEAM_NEW_PV, 0 ) sTeamNewPv
+            NVL( mrs.ALL_NEW_BOX_NUM, 0 ) sNewBoxNum,
+            NVL( mrs.ALL_TEAM_NEW_BOX_NUM, 0 ) sTeamNewBoxNum,
+            NVL( mrs.ALL_NEW_CONSUME_PV, 0 ) sNewConsumePv,
+            NVL( mrs.ALL_TEAM_NEW_PV, 0 ) sTeamNewPv
         FROM
             cu_member cu
                 left join ${memberRetailTable} mr on cu.PK_ID = mr.PK_MEMBER and mr.CATEGORY = 0
@@ -882,15 +882,15 @@
             cu.PK_AWARDS,
             awards.AWARDS_NAME,
             currentMonth.ENABLE_STATUS,
-            NVL( NVL( currentDay.NEW_CONSUME_PV, 0 ) + NVL( currentDay.TEAM_NEW_PV, 0 ), 0 ) todayPv,
-            NVL( NVL( currentDay.NEW_BOX_NUM, 0 ) + NVL( currentDay.TEAM_NEW_BOX_NUM, 0 ), 0 ) todayBoxNum,
+            NVL( NVL( currentDay.ALL_NEW_CONSUME_PV, 0 ) + NVL( currentDay.ALL_TEAM_NEW_PV, 0 ), 0 ) todayPv,
+            NVL( NVL( currentDay.ALL_NEW_BOX_NUM, 0 ) + NVL( currentDay.ALL_TEAM_NEW_BOX_NUM, 0 ), 0 ) todayBoxNum,
             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( currentMonth.TEAM_MONTH_BOX_NUM, 0 ) + NVL( currentDay.NEW_BOX_NUM, 0 ) + NVL( currentDay.TEAM_NEW_BOX_NUM, 0 ), 0 ) currentMonthBoxNum,
+            NVL( NVL( currentMonth.MONTH_CONSUME_PV, 0 ) + NVL( currentDay.ALL_NEW_CONSUME_PV, 0 ) + NVL( currentDay.ALL_TEAM_NEW_PV, 0 ), 0 ) currentMonthPv,
+            NVL( NVL( currentMonth.MONTH_BOX_NUM, 0 ) + NVL( currentMonth.TEAM_MONTH_BOX_NUM, 0 ) + NVL( currentDay.ALL_NEW_BOX_NUM, 0 ) + NVL( currentDay.ALL_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
+            NVL( NVL( currentMonth.CONSUME_BOX_NUM, 0 ) + NVL( currentDay.ALL_NEW_BOX_NUM, 0 ) + NVL( currentDay.ALL_TEAM_NEW_BOX_NUM, 0 ), 0 ) totalBoxNum
         FROM
             cu_member cu
                 LEFT JOIN ${param.currentDayTableName} currentDay ON cu.PK_ID = currentDay.PK_MEMBER