From cef8a8889fb00e2f045b6bfc479fe5a2f2f6bbbd Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Thu, 14 Aug 2025 10:45:48 +0800 Subject: [PATCH] =?UTF-8?q?##=20Fix=20-=20=E9=85=8D=E9=80=81=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E4=B8=BA=E4=BC=9E=E4=B8=8B=E6=97=B6,=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E9=85=8D=E9=80=81=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E7=BB=93=E5=B9=B6=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/bonus/service/impl/BonusSettleRangeHandle.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 c5c45354..2bd8c9fc 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 @@ -801,6 +801,11 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { CuMemberRetailRegion retailRegion = regionMap.get(saOrderExt.getRecCounty()); if (null != retailRegion) { CuMemberRetailRangeExt targetMemberRangeExt = memberRangeExtMap.get(retailRegion.getPkMember()); + if(ObjectUtil.isEmpty(targetMemberRangeExt)){ + List memberRetailRangeExtList = cuMemberRetailRangeMapper.queryCuMemberRetailRangeParent(rangeTableName, Arrays.asList(retailRegion.getPkMember())); + targetMemberRangeExt = memberRetailRangeExtList.stream().filter(e -> e.getPkMember().equals(retailRegion.getPkMember())).findFirst().get(); + memberRangeExtMap.put(retailRegion.getPkMember(), targetMemberRangeExt); + } // 复购配送区域收益 BigDecimal bonusIncome = BigDecimal.ZERO; @@ -817,10 +822,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { if (bonusIncome.compareTo(BigDecimal.ZERO) > 0) { // 处理复购级差收益 // 会员奖金 - if(ObjectUtil.isEmpty(targetMemberRangeExt)){ - List memberRetailRangeExtList = cuMemberRetailRangeMapper.queryCuMemberRetailRangeParent(rangeTableName, Arrays.asList(retailRegion.getPkMember())); - targetMemberRangeExt = memberRetailRangeExtList.stream().filter(e -> e.getPkMember().equals(retailRegion.getPkMember())).findFirst().get(); - } CuMemberBonus cuMemberBonus = getCuMemberBonus(period, cuMemberBonusMap, targetMemberRangeExt.getPkMember(), targetMemberRangeExt.getIncomeStatus(), targetMemberRangeExt.getPkSettleCountry(), targetMemberRangeExt.getPkRate() == null ? saOrderExt.getPkRate() : targetMemberRangeExt.getPkRate()); int pkBonusItems = getPkBonusItems(bonusConfigDTO, targetMemberRangeExt.getPkSettleCountry(), EBonusItems.RETAIL_REPURCHASE_DELIVERY_INCOME.getValue());