From 72c7e9c2c9eb14302a93164f6e83d4b9b0c05f5b Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 21 Aug 2025 16:17:27 +0800 Subject: [PATCH] =?UTF-8?q?##=204=E3=80=814=E3=80=816=E5=A4=8D=E8=B4=AD?= =?UTF-8?q?=E7=BA=A7=E5=B7=AE=E6=94=B6=E7=9B=8A=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/bonus/service/impl/BonusSettleRangeHandle.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java index 369b21bf..da0679ec 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java @@ -552,7 +552,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 2025.08.13 添加 代理 级差收益，每1盒（4个产品）区域代理4元，董事代理4元，公司6元，总拨出14元 if ((EGrade.REGION.getValue() == targetMemberRangeExt.getGradeValue() - && EGrade.DIRECTOR.getValue() == targetMemberRangeExt.getGradeValue()) + || EGrade.DIRECTOR.getValue() == targetMemberRangeExt.getGradeValue()) && branch < 2) { // 等级是分公司 并且 发放次数小于2 this.calculateRetailRepurCompanyRangeBonus(sourceMemberRangeExt, targetMemberRangeExt, cuMemberBonusMap, bonusConfigDTO, @@ -645,6 +645,10 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { CuMemberRetailRangeExt targetMemberRangeExt = memberRangeExtMap.get(retailRegion.getPkMember()); if (ObjectUtil.isEmpty(targetMemberRangeExt)) { targetMemberRangeExt = cuMemberRetailRangeMapper.queryCuMemberRetailRangeByMemberId(rangeTableName, retailRegion.getPkMember()); + if (null == targetMemberRangeExt) { + // 配送区域对应的会员不存在了，直接跳过 + return memberBonusDetailList; + } memberRangeExtMap.put(retailRegion.getPkMember(), targetMemberRangeExt); } // 复购配送区域收益