From 93f175d4e5fc7aea60a97015233b57b07c2a5937 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Wed, 30 Apr 2025 13:38:07 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E6=9C=88=E5=BA=A6=E4=B8=9A=E7=BB=A9?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E6=9C=88?=
 =?UTF-8?q?=E4=BB=BD=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ICuMemberSettlePeriodService.java |  3 --
 .../impl/CuMemberAchieveServiceImpl.java      | 53 ++++++++++---------
 .../impl/CuMemberSettlePeriodServiceImpl.java |  3 --
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java
index 9fbb3232..0b723812 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java
@@ -7,9 +7,6 @@ import java.util.List;
 
 /**
  * 会员结算期间 服务类
- *
- * @author hzs
- * @since 2022-10-26
  */
 public interface ICuMemberSettlePeriodService extends IService<CuMemberSettlePeriod> {
 
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 d0e87705..9ce784ae 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
@@ -882,9 +882,12 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
         pna.setStartDate(startDateStr);
         pna.setAchieveTableName(treeTableNameEnd);
 
+        int endperiod = 0;
         //查询最新期数
-        int endperiod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
-                DateUtils.parseDateToStr(endDateStr)).getPkId();
+        CuMemberSettlePeriod settlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(endDateStr));
+        if (null != settlePeriod) {
+            endperiod = settlePeriod.getPkId();
+        }
         //如果是当前月，则查询最新月份数据 查询左右区人数
         String monthStr = DateUtils.getMonth(endDateStr);
         //查询当前月份的左右区人数
@@ -962,6 +965,9 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
             }
         }
 
+        BigDecimal leftDirectAchieve = BigDecimal.ZERO;
+        BigDecimal rightDirectAchieve = BigDecimal.ZERO;
+
         //查询直推业绩（血缘业绩 查询月度表）
         PlaceNewAddAchieveVO pam = new PlaceNewAddAchieveVO();
         //查询结束日期业绩表
@@ -988,33 +994,32 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
             } else {
                 rtupna.setDirectAchieve(BigDecimal.ZERO);
             }
-        }
-        //查询左右区血缘业绩
-        List<PlaceNewAddAchieveVO> lrDirectAchieve = selectABDirectAchieve(pam);
-        BigDecimal leftDirectAchieve;
-        BigDecimal rightDirectAchieve;
-        if (CollectionUtil.isNotEmpty(lrDirectAchieve)) {
-            for (PlaceNewAddAchieveVO pl : lrDirectAchieve) {
-                if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) {
-                    if (pna.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
-                        leftDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate());
-                    } else {
-                        leftDirectAchieve = pl.getDirectAchieve();
+
+            //查询左右区血缘业绩
+            List<PlaceNewAddAchieveVO> lrDirectAchieve = selectABDirectAchieve(pam);
+            if (CollectionUtil.isNotEmpty(lrDirectAchieve)) {
+                for (PlaceNewAddAchieveVO pl : lrDirectAchieve) {
+                    if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) {
+                        if (pna.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
+                            leftDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate());
+                        } else {
+                            leftDirectAchieve = pl.getDirectAchieve();
+                        }
+                        leftDirectAchieve = leftDirectAchieve.divide(constant, 4, RoundingMode.DOWN);
                     }
-                    leftDirectAchieve = leftDirectAchieve.divide(constant, 4, RoundingMode.DOWN);
-                    rtupna.setLeftDirectAchieve(leftDirectAchieve);
-                }
-                if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) {
-                    if (pna.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
-                        rightDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate());
-                    } else {
-                        rightDirectAchieve = pl.getDirectAchieve();
+                    if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) {
+                        if (pna.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
+                            rightDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate());
+                        } else {
+                            rightDirectAchieve = pl.getDirectAchieve();
+                        }
+                        rightDirectAchieve = rightDirectAchieve.divide(constant, 4, RoundingMode.DOWN);
                     }
-                    rightDirectAchieve = rightDirectAchieve.divide(constant, 4, RoundingMode.DOWN);
-                    rtupna.setRightDirectAchieve(rightDirectAchieve);
                 }
             }
         }
+        rtupna.setLeftDirectAchieve(leftDirectAchieve);
+        rtupna.setRightDirectAchieve(rightDirectAchieve);
         return rtupna;
     }
 
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java
index 9ef71ad8..a190370c 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java
@@ -27,9 +27,6 @@ import java.util.*;
 
 /**
  * 会员结算期间 服务实现类
- *
- * @author hzs
- * @since 2022-10-26
  */
 @Service
 public class CuMemberSettlePeriodServiceImpl extends ServiceImpl<CuMemberSettlePeriodMapper, CuMemberSettlePeriod> implements ICuMemberSettlePeriodService {