应收管理、应付管理5

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

@@ -230,6 +230,22 @@ public class ApiCommissionController {
     }
     }
 
 
     /**
     /**
+     * 同步到预计来佣
+     *
+     * @param addToExpectedCommissionRequest
+     * @param request
+     * @return
+     */
+    @Operation(summary = "同步到预计来佣")
+    @PostMapping("/addToExpected")
+    public Result<Boolean> addToExpected(@RequestBody AddToExpectedCommissionRequest addToExpectedCommissionRequest, HttpServletRequest request) {
+        if (StringUtils.isBlank(addToExpectedCommissionRequest.getCommissionBizId())) {
+            return Result.fail(ResultCode.PARAMS_ERROR.getCode(), "来佣业务id不能为空");
+        }
+        return Result.success(commissionService.addToExpected(addToExpectedCommissionRequest));
+    }
+
+    /**
      * 来佣比对记录列表
      * 来佣比对记录列表
      */
      */
     @PostMapping("/compare/records")
     @PostMapping("/compare/records")

yd-csf-service/src/main/java/com/yd/csf/service/dto/AddToExpectedCommissionRequest.java

+package com.yd.csf.service.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class AddToExpectedCommissionRequest {
+    /**
+     * 来佣业务id
+     */
+    @Schema(description = "来佣业务id", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String commissionBizId;
+}

yd-csf-service/src/main/java/com/yd/csf/service/service/CommissionService.java

@@ -53,4 +53,6 @@ public interface CommissionService extends IService<Commission> {
     CommissionCompareRecord getNewCompareRecord(Commission existingCommission, CommissionExpected commissionExpected, AuthUserDto currentLoginUser);
     CommissionCompareRecord getNewCompareRecord(Commission existingCommission, CommissionExpected commissionExpected, AuthUserDto currentLoginUser);
 
 
     Boolean addCommissionBatch(List<CommissionAddRequest> customerAddRequestList);
     Boolean addCommissionBatch(List<CommissionAddRequest> customerAddRequestList);
+
+    Boolean addToExpected(AddToExpectedCommissionRequest addToExpectedCommissionRequest);
 }
 }

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

@@ -704,6 +704,42 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         return b;
         return b;
     }
     }
 
 
+    @Override
+    public Boolean addToExpected(AddToExpectedCommissionRequest addToExpectedCommissionRequest) {
+        if (StringUtils.isBlank(addToExpectedCommissionRequest.getCommissionBizId())) {
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "来佣业务id不能为空");
+        }
+        Commission commission = this.getByCommissionBizId(addToExpectedCommissionRequest.getCommissionBizId());
+        if (commission == null) {
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "来佣记录不存在");
+        }
+
+        if (commission.getCommissionExpectedBizId() != null) {
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "预计来佣已存在");
+        }
+
+        // 获取当前登录用户
+        AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
+        String loginUserId = currentLoginUser.getId().toString();
+
+        CommissionExpected expected = new CommissionExpected();
+        BeanUtils.copyProperties(commission, expected);
+        expected.setCommissionExpectedBizId(RandomStringGenerator.generateBizId16("commission_expected"));
+        // 设置预计入账金额、已来佣金额、待入账金额
+        expected.setExpectedAmount(commission.getAmount());
+        expected.setPaidAmount(BigDecimal.ZERO);
+        expected.setPaidRatio(BigDecimal.valueOf(100));
+        expected.setDefaultExchangeRate(new BigDecimal(commission.getExchangeRate()));
+        expected.setCommissionDate(new Date());
+
+        expected.setCreatorId(loginUserId);
+        expected.setCreateTime(new Date());
+        expected.setUpdaterId(loginUserId);
+        expected.setUpdateTime(new Date());
+
+        return commissionExpectedService.save(expected);
+    }
+
     /**
     /**
      * 查询列表
      * 查询列表
      *
      *