Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622' into dev_jzg_lipf_v20260622

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeOrdersServiceImpl.java

@@ -379,20 +379,41 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
         BigDecimal jqCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getJqCommissionRatio());
         BigDecimal syCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getSyCommissionRatio());
         BigDecimal jyCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getJyCommissionRatio());
-        insFeeOrders.setJqCommissionRatio(jqCommissionRatio);
-        insFeeOrders.setSyCommissionRatio(syCommissionRatio);
-        insFeeOrders.setJyCommissionRatio(jyCommissionRatio);
+
         // 入口比例
         BigDecimal jqInletRatio = covertPercent(ptlAgreementCostRatioVo.getJqInletRatio());
         BigDecimal syInletRatio = covertPercent(ptlAgreementCostRatioVo.getSyInletRatio());
         BigDecimal jyInletRatio = covertPercent(ptlAgreementCostRatioVo.getJyInletRatio());
+
+        BigDecimal jqFollowRatio = BigDecimal.ZERO;
+        BigDecimal syFollowRatio = BigDecimal.ZERO;
+        BigDecimal jyFollowRatio = BigDecimal.ZERO;
+        // 跟单比例
+        if (jqInletRatio.compareTo(jqCommissionRatio) > 0){
+            jqFollowRatio = jqInletRatio.subtract(jqCommissionRatio);
+        }else{
+            jqCommissionRatio = jqInletRatio;
+        }
+        if (syInletRatio.compareTo(syCommissionRatio) > 0){
+            syFollowRatio = syInletRatio.subtract(syCommissionRatio);
+        }else{
+            syCommissionRatio = syInletRatio;
+        }
+        if (jyInletRatio.compareTo(jyCommissionRatio) > 0){
+            jyFollowRatio = jyInletRatio.subtract(jyCommissionRatio);
+        }else{
+            jyCommissionRatio = jyInletRatio;
+        }
+
+        // 手续费
+        insFeeOrders.setJqCommissionRatio(jqCommissionRatio);
+        insFeeOrders.setSyCommissionRatio(syCommissionRatio);
+        insFeeOrders.setJyCommissionRatio(jyCommissionRatio);
+        // 入口费用
         insFeeOrders.setJqInletRatio(jqInletRatio);
         insFeeOrders.setSyInletRatio(syInletRatio);
         insFeeOrders.setJyInletRatio(jyInletRatio);
-        // 跟单比例 
-        BigDecimal jqFollowRatio = jqInletRatio.subtract(jqCommissionRatio);
-        BigDecimal syFollowRatio = syInletRatio.subtract(syCommissionRatio);
-        BigDecimal jyFollowRatio = jyInletRatio.subtract(jyCommissionRatio);
+        // 跟单费
         insFeeOrders.setJqFollowRatio(jqFollowRatio);
         insFeeOrders.setSyFollowRatio(syFollowRatio);
         insFeeOrders.setJyFollowRatio(jyFollowRatio);

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -2979,7 +2979,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         BigDecimal jqCommissionRatio = BigDecimal.ZERO;
         BigDecimal jqFollowRatio = BigDecimal.ZERO;
         if(batchModifyVo.getJqSuperviseCostsProportion() != null && batchModifyVo.getJqOtherCostsProportion() == null){
-            jqInletRatio = insFeeOrders .getJqInletRatio();
+            jqInletRatio = insFeeOrders.getJqInletRatio();
             jqCommissionRatio = batchModifyVo.getJqSuperviseCostsProportion();
             if (jqCommissionRatio.compareTo(jqInletRatio) > 0){
                 jqCommissionRatio = jqInletRatio;
@@ -3079,7 +3079,6 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
      */
     private PtlAgreementCostRatioVo calRatio(InsPlyIncome insPlyIncome, BatchModifyVo batchModifyVo) {
         log.info("batchModifyVo.转换百分比之前的数据=【{}】", JSONUtil.toJsonStr(batchModifyVo));
-        batchModifyVo.divide100();
         PtlAgreementCostRatioVo vo = new PtlAgreementCostRatioVo();
         vo.setOrderNo(insPlyIncome.getOrderNo());
 
@@ -3170,6 +3169,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
         // 准备批量更新的实体列表
         List<InsPlyIncome> updateList = new ArrayList<>();
+        batchModifyVo.divide100();
 
         for (InsPlyIncome income : incomeList) {
             BigDecimal taxRate = taxRateMap.getOrDefault(income.getOrderNo(), BigDecimal.ONE);