push

yd-csf-api/src/main/java/com/yd/csf/api/handler/CalmSendJobHandler.java

@@ -130,12 +130,11 @@ public class CalmSendJobHandler {
                 BigDecimal noRyc = noRycOld.subtract(fycValue);
                 BigDecimal noRyc = noRycOld.subtract(fycValue);
                 agentAccumulatedFyc.setNoRyc(noRyc.compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO : noRyc);
                 agentAccumulatedFyc.setNoRyc(noRyc.compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO : noRyc);
             }
             }
-            //晋升职级累计积分 = 已生效累计积分 - 已生效累计非首期佣金积分值
-            // 注意：此处 effect 和 ryc 已更新，使用更新后的值，但仍需判空保护
-            BigDecimal effectAfter = agentAccumulatedFyc.getEffect() == null ? BigDecimal.ZERO : agentAccumulatedFyc.getEffect();
-            BigDecimal rycAfter = agentAccumulatedFyc.getRyc() == null ? BigDecimal.ZERO : agentAccumulatedFyc.getRyc();
-            BigDecimal promotion = effectAfter.subtract(rycAfter);
-            agentAccumulatedFyc.setPromotion(promotion.compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO : promotion);
+            //晋升职级累计积分 = 初始化已生效积分（不限业务场景） +  已生效累计首期销售佣金积分值（销售佣金场景（佣金场景的其中一个））
+            BigDecimal initEffect = agentAccumulatedFyc.getInitEffect() == null ? BigDecimal.ZERO : agentAccumulatedFyc.getInitEffect();
+            BigDecimal firstSalesCommission = agentAccumulatedFyc.getFirstSalesCommission() == null ? BigDecimal.ZERO : agentAccumulatedFyc.getFirstSalesCommission();
+            BigDecimal promotion = initEffect.add(firstSalesCommission);
+            agentAccumulatedFyc.setPromotion(promotion.compareTo(BigDecimal.ZERO) <= 0 ?  BigDecimal.ZERO : promotion);
             //最后计算日期，记录最后一次计算累计FYC的日期
             //最后计算日期，记录最后一次计算累计FYC的日期
             agentAccumulatedFyc.setLastCalcDate(LocalDateTime.now());
             agentAccumulatedFyc.setLastCalcDate(LocalDateTime.now());
             iAgentAccumulatedFycService.saveOrUpdate(agentAccumulatedFyc);
             iAgentAccumulatedFycService.saveOrUpdate(agentAccumulatedFyc);