新增应付19

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

@@ -978,11 +978,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "来佣记录不存在");
         }
 
-        CommissionExpected commissionExpected = commissionExpectedService.getByBizId(commission.getCommissionExpectedBizId());
-        if (commissionExpected != null) {
-            throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "预计来佣已存在");
-        }
-
         // 获取当前登录用户
         AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
         String loginUserId = currentLoginUser.getId().toString();
@@ -991,15 +986,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         BeanUtils.copyProperties(commission, expected, "id", "remark");
         expected.setCommissionExpectedBizId(RandomStringGenerator.generateBizId16("commission_expected"));
 
-        if (ObjectUtils.isEmpty(commission.getReconciliationCompanyCode())) {
-            if (ObjectUtils.isEmpty(commission.getReconciliationCompanyBizId())) {
-                throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "来佣记录未关联对账公司");
-            }
-            // 调用对账公司 feignclient，查询对账公司编码
-            String reconciliationCompanyCode = policyFollowService.queryReconciliationCompanyByFeign(commission.getReconciliationCompanyBizId());
-            expected.setReconciliationCompanyCode(reconciliationCompanyCode);
-            commission.setReconciliationCompanyCode(reconciliationCompanyCode);
-        }
         // 生成应收单编号
         expected.setReceivableNo(receivableService.generateReceivableNo(
                 commission.getCommissionBizType(),
@@ -1008,7 +994,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         // 设置预计入账金额、已来佣金额、待入账金额
         expected.setExpectedAmount(commission.getHkdAmount());
         expected.setPaidAmount(commission.getHkdAmount());
-        expected.setPaidRatio(null);
+        expected.setPaidRatio(commission.getCurrentCommissionRatio());
         expected.setDefaultExchangeRate(commission.getExchangeRate());
         expected.setCommissionDate(commission.getCommissionDate());
         expected.setStatus(CommissionExpectedStatusEnum.COMPARED.getItemValue());