新单跟进123

a67ad7bc · jianan · eda556ff · a67ad7bc · a67ad7bc · a67ad7bc
Commit a67ad7bc authored Nov 28, 2025 by jianan
4 changed files
--- a/yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionController.java
+++ b/yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionController.java
@@ -12,6 +12,7 @@ import com.yd.common.result.Result;
 import com.yd.csf.api.dto.CommissionExcelDTO;
 import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.dto.*;
+import com.yd.csf.service.enums.CommissionStatusEnum;
 import com.yd.csf.service.model.Commission;
 import com.yd.csf.service.model.CommissionCompareRecord;
 import com.yd.csf.service.model.CommissionEditRecord;
@@ -151,13 +152,17 @@ public class ApiCommissionController {
            Integer commissionPeriod = commission.getCommissionPeriod();
            String commissionName = commission.getCommissionName();
-            CommissionExpected expected = getCommissionExpected(expectedList, policyNo, commissionPeriod, commissionName);
+            // 查询预计来佣
-            if (expected != null) {
+            CommissionExpected commissionExpected;
-                commissionService.compareWithExpected(commission.getPremium(), commission, expected);
+            try {
-            } else {
+                commissionExpected = commissionService.queryByCommission(commission);
+                // 对比预计来佣
+                commissionService.compareWithExpected(commission.getPremium(), commission, commissionExpected);
+                commissionExpectedService.updateById(commissionExpected);
+            } catch (Exception e) {
                // 预计来佣不存在，来佣状态设置为 比对失败
-                commission.setStatus("2");
+                commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
-                commission.setRemark("未找到当前来佣对应的预计来佣，比对失败");
+                commission.setRemark(e.getMessage());
            }
        }

--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/CommissionService.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/CommissionService.java
@@ -39,4 +39,6 @@ public interface CommissionService extends IService<Commission> {
    List<CommissionBindPolicyBrokerDto> queryCommissionBindPolicyBrokerList(CommissionDto dto);
    CommissionStatisticsVO getCommissionStatistics(List<Long> commissionIds);
+    CommissionExpected queryByCommission(Commission commission);
 }
--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
@@ -150,6 +150,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
        for (CommissionExpectedAddDto addDto : addDtoList) {
            CommissionExpected commissionExpected = new CommissionExpected();
            BeanUtils.copyProperties(addDto, commissionExpected);
+            // 默认结算汇率 7.8 美元对港币
+            commissionExpected.setDefaultExchangeRate(BigDecimal.valueOf(7.8));
            // 校验参数
            validCommissionExpected(commissionExpected, true);

--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
@@ -216,7 +216,8 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
        return commissionRecord;
    }
-    private CommissionExpected queryByCommission(Commission commission) {
+    @Override
+    public CommissionExpected queryByCommission(Commission commission) {
        QueryWrapper<CommissionExpected> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("policy_no", commission.getPolicyNo());
        queryWrapper.eq("commission_name", commission.getCommissionName());
@@ -476,23 +477,23 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
        if (expected != null) {
            if (ObjectUtils.isEmpty(expected.getCommissionRatio())) {
                log.error("预计来佣的来佣比例不能为空，预计来佣业务id：{}", expected.getCommissionExpectedBizId());
-                return;
+                throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "预计来佣的来佣比例不能为空");
            }
            if (ObjectUtils.isEmpty(expected.getDefaultExchangeRate())) {
                log.error("预计来佣的默认汇率不能为空，预计来佣业务id：{}", expected.getCommissionExpectedBizId());
-                return;
+                throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "预计来佣的默认汇率不能为空");
            }
            if (ObjectUtils.isEmpty(premium)) {
                log.error("保费不能为空，来佣业务id：{}", commission.getCommissionBizId());
-                return;
+                throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "保费不能为空");
            }
            if (ObjectUtils.isEmpty(commission.getAmount())) {
                log.error("当前入账金额不能为空，来佣业务id：{}", commission.getCommissionBizId());
-                return;
+                throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "当前入账金额不能为空");
            }
            if (ObjectUtils.isEmpty(commission.getExchangeRate())) {
                log.error("当前结算汇率不能为空，来佣业务id：{}", commission.getCommissionBizId());
-                return;
+                throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "当前结算汇率不能为空");
            }
            // 当前来佣比例=当前入账金额/结算汇率/保费