前端对接问题修复36

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.validation.Valid;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;

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

@@ -236,11 +236,12 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         if (CollUtil.isEmpty(addDtoList)) {
             throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "预计入账列表不能为空");
         }
+        validateAddCommissionExpected(addDtoList);
 
         // 查询保单信息、保单产品信息
         Set<String> policyNoSet = addDtoList.stream()
                 .map(CommissionExpectedAddDto::getPolicyNo)
-                .collect(Collectors.toSet());
+                .filter(StringUtils::isNotBlank).collect(Collectors.toSet());
 
         Map<String, Policy> policyMap = new HashMap<>();
         Map<String, PolicyProductInfo> policyProductInfoMap = new HashMap<>();
@@ -319,6 +320,23 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         return true;
     }
 
+    private void validateAddCommissionExpected(List<CommissionExpectedAddDto> addDtoList) {
+        for (CommissionExpectedAddDto request : addDtoList) {
+            // 校验数据
+            if (StringUtils.isBlank(request.getCommissionType())) {
+                throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "入账项目类型不能为空");
+            }
+            // commissionType 只能是数字
+            if (!StringUtils.isNumeric(request.getCommissionType())) {
+                throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "入账项目类型只能是字典值");
+            }
+            // commissionName 不能为空
+            if (StringUtils.isBlank(request.getCommissionName())) {
+                throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "入账项目名称不能为空");
+            }
+        }
+    }
+
     private BigDecimal queryDefaultExchangeRate(String currency) {
         if ("HKD".equalsIgnoreCase(currency)) {
             return BigDecimal.valueOf(1);

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

@@ -148,6 +148,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             if (commissionExpected != null) {
                 // 填充应收账款编号
                 commissionVO.setReceivableNo(commissionExpected.getReceivableNo());
+                commissionVO.setCommissionExpectedStatus(commissionExpected.getStatus());
             }
             return commissionVO;
         }).collect(Collectors.toList());
@@ -345,6 +346,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         }
 
         for (Commission commission : commissions) {
+            if ("U".equals(commission.getCommissionBizType())) {
+                throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "非关联保单应收单，不能点击生成可出账记录");
+            }
             if (StringUtils.isBlank(commission.getPolicyNo())) {
                 throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "保单号不能为空");
             }
@@ -570,9 +574,13 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
     @Transactional(rollbackFor = Exception.class)
     public List<Commission> addCommissionBatch(List<CommissionAddRequest> customerAddRequestList) {
         if (CollectionUtils.isEmpty(customerAddRequestList)) {
-            throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "来佣数据不能为空");
+            throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "入账数据不能为空");
         }
-        Set<String> policyNoSet = customerAddRequestList.stream().map(CommissionAddRequest::getPolicyNo).collect(Collectors.toSet());
+        validateAddCommissionBatch(customerAddRequestList);
+
+        Set<String> policyNoSet = customerAddRequestList.stream()
+                .map(CommissionAddRequest::getPolicyNo)
+                .filter(StringUtils::isNotBlank).collect(Collectors.toSet());
 
         // 关联查询保单信息、预计入账信息
         Map<String, Policy> policyMap = new HashMap<>();
@@ -637,6 +645,23 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         return commissionList;
     }
 
+    private void validateAddCommissionBatch(List<CommissionAddRequest> customerAddRequestList) {
+        for (CommissionAddRequest request : customerAddRequestList) {
+            // 校验数据
+            if (StringUtils.isBlank(request.getCommissionType())) {
+                throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "入账项目类型不能为空");
+            }
+            // commissionType 只能是数字
+            if (!StringUtils.isNumeric(request.getCommissionType())) {
+                throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "入账项目类型只能是字典值");
+            }
+            // commissionName 不能为空
+            if (StringUtils.isBlank(request.getCommissionName())) {
+                throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "入账项目名称不能为空");
+            }
+        }
+    }
+
     @Override
     public Boolean addToExpected(AddToExpectedCommissionRequest addToExpectedCommissionRequest) {
         if (StringUtils.isBlank(addToExpectedCommissionRequest.getCommissionBizId())) {

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

@@ -162,7 +162,7 @@ public class CommissionVO implements Serializable {
      * 比对状态
      */
     @Schema(description = "比对状态 0=未比对 1=比对成功 2=比对失败 字典值: csf_commission_status")
-    private String status;
+    private String commissionStatus;
 
     /**
      * 预计来佣业务id
@@ -171,6 +171,12 @@ public class CommissionVO implements Serializable {
     private String commissionExpectedBizId;
 
     /**
+     * 入账状态
+     */
+    @Schema(description = "入账状态 字典值: csf_expected_commission_status")
+    private String commissionExpectedStatus;
+
+    /**
      * 总金额
      */
     @Schema(description = "总金额")
@@ -195,6 +201,12 @@ public class CommissionVO implements Serializable {
     private String remark;
 
     /**
+     * 记录状态 0=有效 1=无效
+     */
+    @Schema(description = "记录状态 0=有效 1=无效")
+    private Integer isDeleted;
+
+    /**
      * 创建人ID
      */
     @Schema(description = "创建人ID")
@@ -234,6 +246,7 @@ public class CommissionVO implements Serializable {
         }
         CommissionVO commissionVO = new CommissionVO();
         BeanUtils.copyProperties(commission, commissionVO);
+        commissionVO.setCommissionStatus(commission.getStatus());
         return commissionVO;
     }
 }