From 6723180291f83898e600b5fb555ed61bd8720c21 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 25 Jun 2025 10:49:07 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E9=BB=98=E8=AE=A4=E6=9C=88=E7=BB=93?= =?UTF-8?q?=E6=9C=9F=E9=97=B4=E8=A1=A8=E5=8F=96=E5=80=BC=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/bonus/service/impl/BonusSettleRangeHandle.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 1aaf98b9..ec84472e 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 @@ -1811,8 +1811,11 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 上月最后一天期数 CuMemberSettlePeriod beforeMonthLast = getCuMemberSettlePeriodService().getCuMemberSettlePeriodByDate(beforeMonthLastDate); String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE; - if(ObjectUtil.isNotEmpty(beforeMonthLast)){ + // 如果上月最后一期有值则使用，没有值则使用昨天期数 + if (ObjectUtil.isNotEmpty(beforeMonthLast)) { rangeTableName += beforeMonthLast.getPkId(); + } else { + rangeTableName += period; } // 查询上月订单 @@ -2010,7 +2013,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } - // 查询 v5 等级 且 分红奖衔 >=S4 + // 查询 v5 等级 且 分红奖衔 >= S4 List memberRetailRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailRangeByAwards(rangeTableName); if (memberRetailRangeExtList.size() > 0) { // 查询月度分红会员的直推