前端对接问题修复83

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

@@ -283,7 +283,7 @@ public class ApiCommissionController {
      * @param request
      * @param request
      * @return
      * @return
      */
      */
-    @Operation(summary = "同步到预计来佣")
+    @Operation(summary = "同步到预计来佣(比对状态自动为已比对成功)")
     @PostMapping("/addToExpected")
     @PostMapping("/addToExpected")
     public Result<Boolean> addToExpected(@RequestBody AddToExpectedCommissionRequest addToExpectedCommissionRequest, HttpServletRequest request) {
     public Result<Boolean> addToExpected(@RequestBody AddToExpectedCommissionRequest addToExpectedCommissionRequest, HttpServletRequest request) {
         if (StringUtils.isBlank(addToExpectedCommissionRequest.getCommissionBizId())) {
         if (StringUtils.isBlank(addToExpectedCommissionRequest.getCommissionBizId())) {

yd-csf-service/src/main/java/com/yd/csf/service/component/CommissionAsyncService.java

@@ -255,6 +255,11 @@ public class CommissionAsyncService {
     public void commissionCompare(Commission commission) {
     public void commissionCompare(Commission commission) {
         log.info("开始执行比对事务，来佣ID: {}", commission.getCommissionBizId());
         log.info("开始执行比对事务，来佣ID: {}", commission.getCommissionBizId());
 
 
+        // 未查询到预计来佣，需要先同步到预计来佣表
+        if (CommissionStatusEnum.MATCH_FAILED.getItemValue().equals(commission.getStatus())) {
+            return;
+        }
+
         if ("R".equals(commission.getCommissionBizType())) {
         if ("R".equals(commission.getCommissionBizType())) {
             normalCommission(commission.getCommissionBizId(), commission.getPolicyNo(), commission.getCommissionName(), commission.getCommissionPeriod(), commission.getCurrency(), commission.getPremium());
             normalCommission(commission.getCommissionBizId(), commission.getPolicyNo(), commission.getCommissionName(), commission.getCommissionPeriod(), commission.getCurrency(), commission.getPremium());
         } else {
         } else {

yd-csf-service/src/main/java/com/yd/csf/service/model/Commission.java

@@ -129,7 +129,7 @@ public class Commission implements Serializable {
     private Date commissionDate;
     private Date commissionDate;
 
 
     /**
     /**
-     * 来佣状态 0=未比对 1=比对成功 2=比对失败
+     * 来佣状态 0=未比对 1=比对成功 2=比对失败 3=未查询到预计来佣，需要先同步到预计来佣表
      */
      */
     private String status;
     private String status;