## Opt - 盒数&业绩(ALL_)

bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml

@@ -445,7 +445,7 @@
     <!--开始大小区业绩 以累计为准 -->
     <select id="selectMemberOrderSumAchieveByPkMember" resultType="com.hzs.retail.member.vo.CuMemberRetailAchieveVO">
         SELECT sum(arealPv) arealPv
-        FROM (SELECT NVL(mr.CONSUME_PV, 0) arealPv
+        FROM (SELECT (NVL(mr.CONSUME_PV, 0)  + NVL( mr.TEAM_CONSUME_PV, 0 )) arealPv
               FROM ${memberRetailTable} mr
               WHERE mr.category = 0
                 AND mr.pk_member = #{pkMember}
@@ -496,13 +496,13 @@
         <foreach collection="pkMemberList" item="pkMember" separator="union all">
             SELECT SUM(t1.arealPv) arealPv ,#{pkMember} pkMember
             FROM (
-            SELECT NVL(mr.CONSUME_PV + mr.TEAM_CONSUME_PV,0) arealPv
+            SELECT NVL(mr.CONSUME_PV + mr.ALL_TEAM_CONSUME_PV,0) arealPv
             FROM ${memberRetailTable} mr
             WHERE mr.category = 0
             AND mr.pk_member = #{pkMember}
             UNION ALL
             SELECT
-            NVL( mrs.NEW_CONSUME_PV + mrs.TEAM_NEW_PV, 0 ) arealPv
+            NVL( mrs.NEW_CONSUME_PV + mrs.ALL_TEAM_NEW_PV, 0 ) arealPv
             FROM
             ${memberRetailSTable} mrs
             WHERE mrs.pk_member = #{pkMember}
@@ -844,13 +844,13 @@
             mr.ENABLE_STATUS,
             NVL( mr.CONSUME_PV, 0 ) consumePv,
             NVL( mr.NEW_CONSUME_PV, 0 ) newConsumePv,
-            NVL( mr.TEAM_CONSUME_PV, 0 ) teamConsumePv,
-            NVL( mr.TEAM_NEW_PV, 0 ) teamNewPv,
+            NVL( mr.All_TEAM_CONSUME_PV, 0 ) teamConsumePv,
+            NVL( mr.All_TEAM_NEW_PV, 0 ) teamNewPv,
 
             NVL( mr.CONSUME_BOX_NUM, 0 ) consumeBoxNum,
             NVL( mr.NEW_BOX_NUM, 0 ) newBoxNum,
-            NVL( mr.TEAM_BOX_NUM, 0 ) teamBoxNum,
-            NVL( mr.TEAM_NEW_BOX_NUM, 0 ) teamNewBoxNum,
+            NVL( mr.All_TEAM_BOX_NUM, 0 ) teamBoxNum,
+            NVL( mr.All_TEAM_NEW_BOX_NUM, 0 ) teamNewBoxNum,
             NVL( mr.BIG_BOX_NUM, 0 ) bigBoxNum,
             NVL( mr.SMALL_BOX_NUM, 0 ) smallBoxNum,