前端对接问题修复88

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

@@ -298,8 +298,8 @@ public class ApiCommissionController {
     @PostMapping("/compare/records")
     @PostMapping("/compare/records")
     @Operation(summary = "来佣比对记录列表", description = "可根据实际来佣业务id、预计来佣业务id，查询来佣比对记录")
     @Operation(summary = "来佣比对记录列表", description = "可根据实际来佣业务id、预计来佣业务id，查询来佣比对记录")
     public Result<Page<CommissionCompareRecord>> getCommissionCompareRecords(@RequestBody CommissionCompareRecordQueryRequest queryRequest) {
     public Result<Page<CommissionCompareRecord>> getCommissionCompareRecords(@RequestBody CommissionCompareRecordQueryRequest queryRequest) {
-        if (StringUtils.isBlank(queryRequest.getCommissionBizId())) {
-            return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "commissionBizId不能为空");
+        if (StringUtils.isBlank(queryRequest.getCommissionBizId()) && StringUtils.isBlank(queryRequest.getCommissionExpectedBizId())) {
+            return Result.fail(ResultCode.PARAMS_ERROR.getCode(), "commissionBizId、commissionExpectedBizId不能同时为空");
         }
         }
         // 查询来佣比对记录
         // 查询来佣比对记录
         QueryWrapper<CommissionCompareRecord> queryWrapper = new QueryWrapper<CommissionCompareRecord>();
         QueryWrapper<CommissionCompareRecord> queryWrapper = new QueryWrapper<CommissionCompareRecord>();

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

@@ -251,13 +251,11 @@ public class CommissionExpectedVO implements Serializable {
                 commissionVO.setPendingAmount(commissionExpected.getExpectedAmount().subtract(paidAmount1));
                 commissionVO.setPendingAmount(commissionExpected.getExpectedAmount().subtract(paidAmount1));
             }
             }
             return commissionVO;
             return commissionVO;
-        }
-        if (commissionExpected.getAmount() != null) {
+        } else {
             commissionVO.setPaidAmount(paidAmount1);
             commissionVO.setPaidAmount(paidAmount1);
             commissionVO.setPendingAmount(commissionExpected.getAmount().subtract(paidAmount1));
             commissionVO.setPendingAmount(commissionExpected.getAmount().subtract(paidAmount1));
 
 
             return commissionVO;
             return commissionVO;
         }
         }
-        return commissionVO;
     }
     }
 }
 }