新增应收2

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

@@ -999,7 +999,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         BeanUtils.copyProperties(commission, expected, "id", "remark");
         BeanUtils.copyProperties(commission, expected, "id", "remark");
         expected.setCommissionExpectedBizId(RandomStringGenerator.generateBizId16("commission_expected"));
         expected.setCommissionExpectedBizId(RandomStringGenerator.generateBizId16("commission_expected"));
         expected.setPremium(new BigDecimal(commission.getPremium()));
         expected.setPremium(new BigDecimal(commission.getPremium()));
-        expected.setCommissionRatio(commission.getCurrentCommissionRatio());
 
 
         // 生成应收单编号
         // 生成应收单编号
         expected.setReceivableNo(receivableService.generateReceivableNo(
         expected.setReceivableNo(receivableService.generateReceivableNo(
@@ -1007,6 +1006,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                 commission.getReconciliationCompanyCode(),
                 commission.getReconciliationCompanyCode(),
                 commission.getReconciliationCompany()));
                 commission.getReconciliationCompany()));
         // 设置预计入账金额、已来佣金额、待入账金额
         // 设置预计入账金额、已来佣金额、待入账金额
+        expected.setCommissionRatio(commission.getCurrentCommissionRatio());
         expected.setExpectedAmount(commission.getHkdAmount());
         expected.setExpectedAmount(commission.getHkdAmount());
         expected.setPaidAmount(commission.getHkdAmount());
         expected.setPaidAmount(commission.getHkdAmount());
         expected.setPaidRatio(commission.getCurrentCommissionRatio());
         expected.setPaidRatio(commission.getCurrentCommissionRatio());