diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java index 79822525..a8e52d9a 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java @@ -10,9 +10,9 @@ public interface IBonusSettleService { /** * 计算会员奖金 * - * @param date 结算日期 + * @param date 结算日期 */ - void calculateCuMemberBonus(String date); + void calculateCuMemberBonus(String date, Integer period, String yesterday, Integer yesterdayPeriod); /** * 根据订单计算新零售奖金 @@ -21,6 +21,7 @@ public interface IBonusSettleService { /** * 计算秒结表数据 + * * @param orderExt */ void calculateCuMemberRetailRangeBySaOrder(SaOrderExt orderExt); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java index bbd78dca..f613f5fb 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java @@ -80,16 +80,8 @@ public class BonusSettleServiceImpl implements IBonusSettleService { @Override @Transactional(rollbackFor = Exception.class) - public void calculateCuMemberBonus(String settleDate) { - Integer period = null; - Integer yesterdayPeriod = null; + public void calculateCuMemberBonus(String settleDate, Integer period, String yesterday, Integer yesterdayPeriod) { try { - // 结算期间 - period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(settleDate).getPkId(); - String yesterday = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, settleDate); - // 结算期间前一天期间 - yesterdayPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yesterday).getPkId(); - // 获取所有国家的奖金项 key = 国家 + 奖金项的值 BonusConfigDTO bonusConfigDTO = iBonusItemsServiceApi.queryBonusConfigDTO().getData(); // 会员奖金map(key:会员ID, @@ -106,9 +98,6 @@ public class BonusSettleServiceImpl implements IBonusSettleService { // 保存当日计算的奖金 insertCuMemberBonus(settleDate, period, cuMemberBonusMap, recordDetailVO); } catch (Exception e) { - // 因为日结明细用的是直接清表,所以如果执行失败,先拿昨天的去填充,防止前台没数据 - bonusSettleRangeHandle.compensationRetailDetail(period, yesterdayPeriod, settleDate); - log.error("奖金结算异常", e); throw new RuntimeException(e); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java index a860b333..4fe112ee 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java @@ -54,6 +54,8 @@ public class CuMemberBonusServiceImpl extends ServiceImpl