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 d91bba25..b3ecf203 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 @@ -1311,10 +1311,10 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { if (saOrder.getOrderType().equals(EOrderType.RETAIL_CONSUME.getValue())) { return null; } - // 区域分红根据商品盒数来,如果没有盒数,直接返回为空 - if (saOrder.getBoxNum().compareTo(BigDecimal.ZERO) == 0) { - return null; - } +// // 区域分红根据商品盒数来,如果没有盒数,直接返回为空 +// if (saOrder.getBoxNum().compareTo(BigDecimal.ZERO) == 0) { +// return null; +// } CuMemberRetailRangeExt sourceRetailRangeExt = memberRangeExtMap.get(saOrder.getPkMember()); // 获取对应区域会员 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 2bf79bda..a2aeb266 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 @@ -135,6 +135,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { // 非测试环境 if (settleDate.endsWith("01")) { // 计算新零售团队福利、福利分红等奖金 + log.info("正式处理:{}", settleDate); bonusSettleRangeHandle.calculateRetailShareBonus(settleDate, bonusConfigDTO, period, recordDetailVO, cuMemberBonusMap); } } @@ -142,8 +143,6 @@ public class BonusSettleServiceImpl implements IBonusSettleService { Date currentDate = DateUtils.afterDate(1, ChronoUnit.DAYS, DateUtils.parseStringToDate(settleDate)); String afterDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, currentDate); if (afterDate.endsWith("01")) { - log.info("afterDate: {}", afterDate); - log.info("settleDate: {}", settleDate); // 计算完月奖,计算考核(区域6个月要达到蓝宝以上) String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + period; cuRegionAssessService.assessRegionByEveryMonth(settleDate, rangeTableName); diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml index 5c02e74b..4c8b1492 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml @@ -600,6 +600,7 @@ bw.benefit_avg_ratio, bw.benefit_share_ratio, nvl(nvl(sc.enable_status, r.enable_status), 1) enable_status, + bt.pk_id pk_rate, bv.region_vertex_pk_id from cu_member cm inner join bd_awards bw @@ -640,7 +641,7 @@ a.pk_share_awards, cm.income_status, cm.pay_time, - b.pk_rate, + nvl(b.pk_rate, bt.pk_id) pk_rate, nvl(cm.is_activate, a.enable_status) enable_status, a.new_box_num, nvl(b.consume_box_num, 0) + a.new_box_num consume_box_num, @@ -695,6 +696,8 @@ on br.pk_id = cr.county and br.del_flag = 0 left join bd_vertex bv on bv.pk_id = cm.pk_vertex + inner join bd_currency bt + on bt.pk_country = cm.pk_settle_country where bg.del_flag = 0