From 218eb3773e8716634c2625fc1b46eae7a5f6e6ce Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Mon, 20 Oct 2025 11:47:43 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E4=BC=9A=E5=91=98=E7=AB=AF=E6=9C=88?=
 =?UTF-8?q?=E6=96=B0=E5=A2=97=E4=B8=9A=E7=BB=A9=E6=94=B9=E4=B8=BA=E4=B8=8D?=
 =?UTF-8?q?=E8=B5=B0=E6=9C=88=E8=A1=A8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../achieve/mapper/CuMemberTreeMapper.java    |  4 ++--
 .../achieve/service/ICuMemberTreeService.java |  4 ++--
 .../impl/CuMemberAchieveServiceImpl.java      | 23 +++++++++++++------
 .../service/impl/CuMemberTreeServiceImpl.java |  4 ++--
 .../member/achieve/CuMemberTreeMapper.xml     |  6 ++---
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java
index a035827e..6742300a 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java
@@ -168,12 +168,12 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
      *
      * @param settleTable
      * @param pkMember
-     * @param monthTable
+     * @param lastMonthTable
      * @return
      */
     CuMemberAwardsUnderVO queryMemberPv(@Param("settleTable") String settleTable,
                                         @Param("pkMember") Long pkMember,
-                                        @Param("monthTable") String monthTable);
+                                        @Param("lastMonthTable") String lastMonthTable);
 
     /**
      * 查询会员当天业绩
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java
index b292220a..d84876db 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java
@@ -147,10 +147,10 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
      *
      * @param settleTable
      * @param pkMember
-     * @param monthTable
+     * @param lastMonthTable
      * @return
      */
-    CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String monthTable);
+    CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String lastMonthTable);
 
     /**
      * 查询会员当天业绩
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java
index a5c40357..362cadb0 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java
@@ -369,18 +369,27 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
         if (hasSettle) {
             // 昨日业绩 -- 昨日结算表
             // 历史业绩 -- 昨日结算表
-            // 当月业绩 -- 月业绩表
-            String month = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM"));
-            // 当月业绩表
-            String monthTable = TableNameConstants.CU_MEMBER_MONTH + month;
-            Integer number = iCuMemberTreeService.queryExistOracleTable(monthTable);
+//            // 当月业绩 -- 月业绩表
+//            String month = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM"));
+//            // 当月业绩表
+//            String monthTable = TableNameConstants.CU_MEMBER_MONTH + month;
+//            Integer number = iCuMemberTreeService.queryExistOracleTable(monthTable);
+//            if (null == number || number == 0) {
+//                // 月业绩表不存在
+//                monthTable = null;
+//            }
+
+            // 之前月份的最后一期
+            Integer monthLastPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.beforeMonthLastDateStr(new Date())).getPkId();
+            String lastMonthTable = TableNameConstants.CU_MEMBER_SETTLE + monthLastPeriod;
+            Integer number = iCuMemberTreeService.queryExistOracleTable(lastMonthTable);
             if (null == number || number == 0) {
                 // 月业绩表不存在
-                monthTable = null;
+                lastMonthTable = null;
             }
 
             // 查询会员首页业绩显示
-            CuMemberAwardsUnderVO awardsUnderVO = iCuMemberTreeService.queryMemberPv(settleTable, pkMember, monthTable);
+            CuMemberAwardsUnderVO awardsUnderVO = iCuMemberTreeService.queryMemberPv(settleTable, pkMember, lastMonthTable);
             if (null != awardsUnderVO) {
                 resultVO.setANewPv(null != awardsUnderVO.getANewPv() ? BigDecimalUtil.handleBig10000Down(awardsUnderVO.getANewPv()) : BigDecimal.ZERO);
                 resultVO.setBNewPv(null != awardsUnderVO.getBNewPv() ? BigDecimalUtil.handleBig10000Down(awardsUnderVO.getBNewPv()) : BigDecimal.ZERO);
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java
index a17ce30c..25133cb5 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java
@@ -147,8 +147,8 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
     }
 
     @Override
-    public CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String monthTable) {
-        return baseMapper.queryMemberPv(settleTable, pkMember, monthTable);
+    public CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String lastMonthTable) {
+        return baseMapper.queryMemberPv(settleTable, pkMember, lastMonthTable);
     }
 
     @Override
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml
index 72b5c4b8..fbd7e6e7 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml
@@ -613,7 +613,7 @@
     <select id="queryMemberPv" resultType="com.hzs.member.achieve.vo.CuMemberAwardsUnderVO">
         select a.*
         <if test="monthTable != null and monthTable != ''">
-            , b.a_sum_pv aMonthPv, b.b_sum_pv bMonthPv
+            , a.a_sum_pv - nvl(b.a_sum_pv, 0) aMonthPv, a.b_sum_pv - nvl(b.b_sum_pv, 0) bMonthPv
         </if>
         from (select
         cms.pk_member,
@@ -625,9 +625,9 @@
         cms.b_new_pv + cms.rep_b_new_pv b_new_pv
         from ${settleTable} cms
         where cms.pk_member = #{pkMember}) a
-        <if test="monthTable != null and monthTable != ''">
+        <if test="lastMonthTable != null and lastMonthTable != ''">
             left join (select cmm.pk_member, cmm.a_sum_pv, cmm.b_sum_pv
-            from ${monthTable} cmm
+            from ${lastMonthTable} cmm
             where cmm.pk_member = #{pkMember}) b
             on a.pk_member = b.pk_member
         </if>