push

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

@@ -7,6 +7,7 @@ import com.yd.csf.service.dto.CommissionExpectedAddRequest;
 import com.yd.csf.service.dto.CommissionExpectedChangeStatusRequest;
 import com.yd.csf.service.dto.CommissionExpectedQueryRequest;
 import com.yd.csf.service.dto.CommissionExpectedUpdateRequest;
+import com.yd.csf.service.model.Commission;
 import com.yd.csf.service.model.CommissionExpected;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yd.csf.service.model.Policy;
@@ -88,4 +89,6 @@ public interface CommissionExpectedService extends IService<CommissionExpected>
     Boolean changeStatus(CommissionExpectedChangeStatusRequest commissionExpectedChangeStatusRequest);
 
     CommissionExpected queryOne(String commissionExpectedBizId);
+
+    CommissionExpected queryOne(String policyNo, Integer commissionPeriod, String commissionType);
 }

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

@@ -70,5 +70,5 @@ public interface CommissionService extends IService<Commission> {
      */
     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

@@ -92,6 +92,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
     private ApiInsuranceReconciliationCompanyFeignClient companyFeignClient;
     @Resource
     private CustomerService customerService;
+    @Resource
+    private CommissionExpectedService commissionExpectedService;
 
     // 用于对象转换的ObjectMapper
     private static final ObjectMapper objectMapper = new ObjectMapper();
@@ -738,9 +740,9 @@ 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("同一个保单且同一个期数且同一个项目的数据已存在，不能重复新增");
+                CommissionExpected expected = commissionExpectedService.queryOne(addDto.getPolicyNo(),addDto.getCommissionPeriod(),addDto.getCommissionType());
+                if (expected != null) {
+                    throw new BusinessException("同一个保单且同一个期数且同一个项目的预计来佣数据已存在，不能重复新增");
                 }
 
                 Policy policy = policyMap.get(addDto.getPolicyNo());
@@ -1531,6 +1533,19 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         );
     }
 
+    @Override
+    public CommissionExpected queryOne(String policyNo,
+                               Integer commissionPeriod,
+                               String commissionType) {
+
+        return this.baseMapper.selectOne(new LambdaQueryWrapper<CommissionExpected>()
+                .eq(CommissionExpected::getPolicyNo,policyNo)
+                .eq(CommissionExpected::getCommissionPeriod,commissionPeriod)
+                .eq(CommissionExpected::getCommissionType,commissionType)
+                .last(" limit 1 ")
+        );
+    }
+
     private Policy convertPolicy(PolicyFollow policyFollow,String effectiveDate,String coolingOffEndDate) {
         Policy policy = new Policy();
         BeanUtil.copyProperties(policyFollow, policy);

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

@@ -1233,18 +1233,6 @@ 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 ")
-        );
-    }
 
     /**
      * 查询列表