新单跟进48

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

@@ -10,8 +10,6 @@ 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.CommissionExpectedStatusEnum;
-import com.yd.csf.service.enums.CommissionStatusEnum;
 import com.yd.csf.service.model.Commission;
 import com.yd.csf.service.model.CommissionExpected;
 import com.yd.csf.service.service.CommissionExpectedService;
@@ -139,18 +137,7 @@ public class ApiCommissionController {
             String commissionName = commission.getCommissionName();
 
             CommissionExpected expected = getCommissionExpected(expectedList, policyNo, commissionPeriod, commissionName);
-            if (expected != null) {
-                if (expected.getAmount().compareTo(commission.getAmount()) == 0) {
-                    // 一致，来佣状态设置为 比对成功
-                    commission.setStatus(CommissionStatusEnum.COMPARE_SUCCESS.getItemValue());
-                    // 预计来佣的状态设置为 已来佣
-                    expected.setStatus(CommissionExpectedStatusEnum.COMPARED.getItemValue());
-                } else {
-                    // 不一致，来佣状态设置为 比对失败
-                    commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
-                    expected.setStatus(CommissionExpectedStatusEnum.PARTIAL.getItemValue());
-                }
-            }
+            commissionService.compareWithExpected(commission, expected);
         }
 
         // 保存来佣数据

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

@@ -9,6 +9,7 @@ import com.yd.csf.service.dto.CommissionUpdateRequest;
 import com.yd.csf.service.dto.GenerateFortuneRequest;
 import com.yd.csf.service.model.Commission;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yd.csf.service.model.CommissionExpected;
 import com.yd.csf.service.vo.CommissionVO;
 
 import java.util.Map;
@@ -31,4 +32,6 @@ public interface CommissionService extends IService<Commission> {
     Boolean addCommission(CommissionAddRequest commissionAddRequest);
 
     Commission getByCommissionBizId(String commissionBizId);
+
+    void compareWithExpected(Commission commission, CommissionExpected expected);
 }

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

@@ -11,6 +11,7 @@ import com.yd.common.enums.ResultCode;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.csf.service.dto.*;
+import com.yd.csf.service.enums.CommissionExpectedStatusEnum;
 import com.yd.csf.service.enums.CommissionStatusEnum;
 import com.yd.csf.service.enums.FortuneStatusEnum;
 import com.yd.csf.service.model.*;
@@ -44,6 +45,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
     private PolicyBrokerService policyBrokerService;
     @Resource
     private PolicyService policyService;
+    @Resource
+    private CommissionExpectedService commissionExpectedService;
+
 
     @Override
     public QueryWrapper<Commission> getQueryWrapper(CommissionQueryRequest commissionQueryRequest) {
@@ -187,6 +191,18 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         commission.setCommissionBizId(commissionBizId);
         // 设置默认状态
         commission.setStatus(CommissionStatusEnum.WAIT.getItemValue());
+        // 查询预计来佣
+        QueryWrapper<CommissionExpected> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("commission_biz_id", commissionBizId);
+        queryWrapper.eq("commission_name", commissionAddRequest.getCommissionName());
+        queryWrapper.eq("commission_period", commissionAddRequest.getCommissionPeriod());
+        queryWrapper.eq("commission_currency", commissionAddRequest.getCurrency());
+        CommissionExpected commissionExpected = commissionExpectedService.getOne(queryWrapper);
+        if (commissionExpected != null) {
+            // 对比预计来佣
+            compareWithExpected(commission, commissionExpected);
+            commissionExpectedService.updateById(commissionExpected);
+        }
         commission.setCreatorId(loginUserId);
         commission.setCreateTime(new Date());
         commission.setUpdaterId(loginUserId);
@@ -199,6 +215,22 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
     public Commission getByCommissionBizId(String commissionBizId) {
         return this.getOne(new QueryWrapper<Commission>().eq("commission_biz_id", commissionBizId));
     }
+
+    @Override
+    public void compareWithExpected(Commission commission, CommissionExpected expected) {
+        if (expected != null) {
+            if (expected.getAmount().compareTo(commission.getAmount()) == 0) {
+                // 一致，来佣状态设置为 比对成功
+                commission.setStatus(CommissionStatusEnum.COMPARE_SUCCESS.getItemValue());
+                // 预计来佣的状态设置为 已来佣
+                expected.setStatus(CommissionExpectedStatusEnum.COMPARED.getItemValue());
+            } else {
+                // 不一致，来佣状态设置为 比对失败
+                commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
+                expected.setStatus(CommissionExpectedStatusEnum.PARTIAL.getItemValue());
+            }
+        }
+    }
 }