push

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

@@ -102,16 +102,16 @@ public class CommissionExpectedAddDto {
     /**
      * 入账日 (估)
      */
-    @Schema(description = "入账日 (估) format:yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Schema(description = "入账日 (估) format:yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     private Date commissionDate;
 
-    /**
-     * 入账日 (实)
-     */
-    @Schema(description = "入账日 (实) format:yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date actualCommissionDate;
+//    /**
+//     * 入账日 (实)
+//     */
+//    @Schema(description = "入账日 (实) format:yyyy-MM-dd")
+//    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+//    private Date actualCommissionDate;
 
     /**
      * 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效

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

@@ -69,4 +69,6 @@ public interface CommissionService extends IService<Commission> {
      * @return 结算汇率
      */
     BigDecimal queryCommissionExchangeRate(String policyNo, Integer commissionPeriod);
+
+    Commission queryOne(String policyNo,Integer commissionPeriod,String commissionType);
 }

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

@@ -733,6 +733,12 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
 
             // 预计总金额
             if ("R".equals(addDto.getCommissionBizType())) {
+                //校验同一个保单且同一个期数且同一个项目的数据是否存在，如果存在不允许添加
+                Commission commission = commissionService.queryOne(addDto.getPolicyNo(),addDto.getCommissionPeriod(),addDto.getCommissionType());
+                if (commission != null) {
+                    throw new BusinessException("同一个保单且同一个期数且同一个项目的数据已存在，不能重复新增");
+                }
+
                 Policy policy = policyMap.get(addDto.getPolicyNo());
                 if (ObjectUtils.isEmpty(policy)) {
                     throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "保单号为" + addDto.getPolicyNo() + "的保单不存在");

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

@@ -1233,6 +1233,19 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         return commissionRecord.getExchangeRate();
     }
 
+    @Override
+    public Commission queryOne(String policyNo,
+                               Integer commissionPeriod,
+                               String commissionType) {
+
+        return this.baseMapper.selectOne(new LambdaQueryWrapper<Commission>()
+                .eq(Commission::getPolicyNo,policyNo)
+                .eq(Commission::getCommissionPeriod,commissionPeriod)
+                .eq(Commission::getCommissionType,commissionType)
+                .last(" limit 1 ")
+        );
+    }
+
     /**
      * 查询列表
      *