新单跟进131

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java

@@ -558,7 +558,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             commission.setPeriodPendingRatio(expectedCommissionRatio.subtract(commission.getPeriodPaidRatio()).setScale(2, RoundingMode.HALF_UP));
             commission.setPeriodPendingRatio(expectedCommissionRatio.subtract(commission.getPeriodPaidRatio()).setScale(2, RoundingMode.HALF_UP));
 
 
             // 预计来佣的已入账金额更新为 已入账金额
             // 预计来佣的已入账金额更新为 已入账金额
-            expected.setExpectedAmount(expectedAmount.setScale(2, RoundingMode.HALF_UP));
             expected.setPaidAmount(paidAmount.setScale(2, RoundingMode.HALF_UP));
             expected.setPaidAmount(paidAmount.setScale(2, RoundingMode.HALF_UP));
             // 已入账来佣比例 = 当前来佣比例 + 已入账来佣比例
             // 已入账来佣比例 = 当前来佣比例 + 已入账来佣比例
             expected.setPaidRatio(currentCommissionRatio.add(ObjectUtils.defaultIfNull(expected.getPaidRatio(), BigDecimal.ZERO)).setScale(2, RoundingMode.HALF_UP));
             expected.setPaidRatio(currentCommissionRatio.add(ObjectUtils.defaultIfNull(expected.getPaidRatio(), BigDecimal.ZERO)).setScale(2, RoundingMode.HALF_UP));

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyFollowServiceImpl.java

@@ -588,9 +588,9 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
         policyReportData.setAdditionalInsurances(additionalInsurances);
         policyReportData.setAdditionalInsurances(additionalInsurances);
         // 处理服务经理
         // 处理服务经理
         String signerList = policyReportData.getServiceManager();
         String signerList = policyReportData.getServiceManager();
-        if (StringUtils.isNotBlank(signerList) && ObjectUtils.isNotEmpty(signerList.split(",")[0])) {
-            PolicySigner signer = GSONUtil.fromJson(signerList.split(",")[0], PolicySigner.class);
-            policyReportData.setServiceManager(signer.getSigner());
+        if (StringUtils.isNotBlank(signerList)) {
+            PolicySigner[] signers = GSONUtil.fromJson(signerList, PolicySigner[].class);
+            policyReportData.setServiceManager(signers[0].getSigner());
         }
         }
         // 处理位置
         // 处理位置
         policyReportData.setLocation("香港");
         policyReportData.setLocation("香港");