前端对接问题修复84

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionController.java

@@ -223,7 +223,7 @@ public class ApiCommissionController {
             entities.add(entity);
             entities.add(entity);
         }
         }
 
 
-        // 补充完整字段
+        // 补充关联字段、计算本次入账比例
         commissionService.fillCommissionList(entities);
         commissionService.fillCommissionList(entities);
 
 
         return entities;
         return entities;

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

@@ -14,6 +14,7 @@ import com.yd.common.enums.ResultCode;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.csf.service.component.CommissionAsyncService;
 import com.yd.csf.service.component.CommissionAsyncService;
+import com.yd.csf.service.component.ReceivableService;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.enums.CommissionExpectedStatusEnum;
 import com.yd.csf.service.enums.CommissionExpectedStatusEnum;
 import com.yd.csf.service.enums.CommissionStatusEnum;
 import com.yd.csf.service.enums.CommissionStatusEnum;
@@ -72,6 +73,8 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
     private CommissionAsyncService commissionAsyncService;
     private CommissionAsyncService commissionAsyncService;
     @Resource
     @Resource
     private TransactionTemplate transactionTemplate;
     private TransactionTemplate transactionTemplate;
+    @Resource
+    private ReceivableService receivableService;
 
 
 
 
     @Override
     @Override
@@ -882,6 +885,11 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         CommissionExpected expected = new CommissionExpected();
         CommissionExpected expected = new CommissionExpected();
         BeanUtils.copyProperties(commission, expected, "id");
         BeanUtils.copyProperties(commission, expected, "id");
         expected.setCommissionExpectedBizId(RandomStringGenerator.generateBizId16("commission_expected"));
         expected.setCommissionExpectedBizId(RandomStringGenerator.generateBizId16("commission_expected"));
+        // 生成应收单编号
+        expected.setReceivableNo(receivableService.generateReceivableNo(
+                commission.getCommissionBizType(),
+                commission.getReconciliationCompanyCode(),
+                commission.getReconciliationCompany()));
         // 设置预计入账金额、已来佣金额、待入账金额
         // 设置预计入账金额、已来佣金额、待入账金额
         expected.setExpectedAmount(commission.getHkdAmount());
         expected.setExpectedAmount(commission.getHkdAmount());
         expected.setPaidAmount(commission.getHkdAmount());
         expected.setPaidAmount(commission.getHkdAmount());
@@ -901,7 +909,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         // 更新来佣记录
         // 更新来佣记录
         this.lambdaUpdate()
         this.lambdaUpdate()
                 .set(Commission::getCommissionExpectedBizId, expected.getCommissionExpectedBizId())
                 .set(Commission::getCommissionExpectedBizId, expected.getCommissionExpectedBizId())
+                .set(Commission::getReceivableNo, expected.getReceivableNo())
                 .set(Commission::getStatus, CommissionStatusEnum.COMPARE_SUCCESS.getItemValue())
                 .set(Commission::getStatus, CommissionStatusEnum.COMPARE_SUCCESS.getItemValue())
+                .set(Commission::getRemark, null)
                 .eq(Commission::getId, commission.getId())
                 .eq(Commission::getId, commission.getId())
                 .update();
                 .update();
 
 

yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionVO.java

@@ -125,7 +125,7 @@ public class CommissionVO implements Serializable {
      * 当前结算汇率
      * 当前结算汇率
      */
      */
     @Schema(description = "当前结算汇率")
     @Schema(description = "当前结算汇率")
-    private String exchangeRate;
+    private BigDecimal exchangeRate;
 
 
     /**
     /**
      * 来佣金额
      * 来佣金额