From a57628531acf67b4e5ace9417321ec30bec76b57 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Wed, 30 Apr 2025 15:19:49 +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

---
 .../impl/CuMemberAchieveServiceImpl.java      | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

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 9ce784ae..8d849e0b 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
@@ -930,20 +930,23 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
                 //当前日期
                 Date frontDate = DateUtils.parseStringToDate(endDateStr);
                 String frontLastMonth = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeMonthLastDate(frontDate));
-                int frontLastendperiod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
-                        DateUtils.parseDateToStr(frontLastMonth)).getPkId();
-                String frontTreeTableNameEnd = TableNameConstants.CU_MEMBER_SETTLE + frontLastendperiod;
-                frontPna.setPkMember(pna.getPkMember());
-                frontPna.setStartDate(frontLastMonth);
-                frontPna.setAchieveTableName(frontTreeTableNameEnd);
-                List<PlaceNewAddAchieveVO> frontMonthCount = selectABCoun(frontPna);
-                if (CollectionUtil.isNotEmpty(frontMonthCount)) {
-                    for (PlaceNewAddAchieveVO pl : frontMonthCount) {
-                        if (pl.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) {
-                            frontLiftCount = pl.getMemberCount();
-                        }
-                        if (pl.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) {
-                            frontRightCount = pl.getMemberCount();
+
+                CuMemberSettlePeriod tmpSettlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(frontLastMonth));
+                if (null != tmpSettlePeriod) {
+                    int frontLastendperiod = tmpSettlePeriod.getPkId();
+                    String frontTreeTableNameEnd = TableNameConstants.CU_MEMBER_SETTLE + frontLastendperiod;
+                    frontPna.setPkMember(pna.getPkMember());
+                    frontPna.setStartDate(frontLastMonth);
+                    frontPna.setAchieveTableName(frontTreeTableNameEnd);
+                    List<PlaceNewAddAchieveVO> frontMonthCount = selectABCoun(frontPna);
+                    if (CollectionUtil.isNotEmpty(frontMonthCount)) {
+                        for (PlaceNewAddAchieveVO pl : frontMonthCount) {
+                            if (pl.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) {
+                                frontLiftCount = pl.getMemberCount();
+                            }
+                            if (pl.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) {
+                                frontRightCount = pl.getMemberCount();
+                            }
                         }
                     }
                 }