Merge remote-tracking branch 'origin/develop' into develop

k8s-bash-test/yifu-insurances-deployment.yaml

@@ -63,7 +63,7 @@ spec:                 # 资源规范字段
               #cpu: 300m # CPU，1核心 = 1000m
             requests:             # 容器运行时，最低资源需求，也就是说最少需要多少资源容器才能正常运行
               #cpu: 100m
-              memory: "500Mi"
+              memory: "1024Mi"
           #livenessProbe: # pod 内部健康检查的设置
           #  httpGet: # 通过httpget检查健康，返回200-399之间，则认为容器正常
           #    path: /healthCheck # URI地址

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -5125,6 +5125,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				continue;
 			}
 			TInsuranceDetail insuranceDetail = getOne(queryWrapper);
+			//如果保单信息为空
+			if (Common.isEmpty(insuranceDetail)){
+				param.setErrorMessage(InsurancesConstants.USER_DATA_IS_NOT_EXIST);
+				errorList.add(param);
+				continue;
+			}
 			LambdaQueryWrapper<TInsuranceEkp> ekpLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			ekpLambdaQueryWrapper.eq(TInsuranceEkp :: getDetailId,insuranceDetail.getId()).eq(TInsuranceEkp ::getResendFlag,CommonConstants.ZERO_INT);
 			List<TInsuranceEkp> ekpList = tInsuranceEkpService.list(ekpLambdaQueryWrapper);
@@ -5133,12 +5139,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
-			//如果保单信息为空
-			if (Common.isEmpty(insuranceDetail)){
-				param.setErrorMessage(InsurancesConstants.USER_DATA_IS_NOT_EXIST);
-				errorList.add(param);
-				continue;
-			}
 			Integer buyType = insuranceDetail.getBuyType();
 			//替换类型无法变更结算月
 			if (CommonConstants.FOUR_INT == buyType){
@@ -5619,6 +5619,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				continue;
 			}
 			TInsuranceDetail insuranceDetail = getOne(queryWrapper);
+			//如果保单信息为空
+			if (Common.isEmpty(insuranceDetail)){
+				param.setErrorMessage(InsurancesConstants.USER_DATA_IS_NOT_EXIST);
+				errorList.add(param);
+				continue;
+			}
 			LambdaQueryWrapper<TInsuranceEkp> ekpLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			ekpLambdaQueryWrapper.eq(TInsuranceEkp :: getDetailId,insuranceDetail.getId()).eq(TInsuranceEkp ::getResendFlag,CommonConstants.ZERO_INT);
 			List<TInsuranceEkp> ekpList = tInsuranceEkpService.list(ekpLambdaQueryWrapper);
@@ -5627,12 +5633,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
-			//如果保单信息为空
-			if (Common.isEmpty(insuranceDetail)){
-				param.setErrorMessage(InsurancesConstants.USER_DATA_IS_NOT_EXIST);
-				errorList.add(param);
-				continue;
-			}
 			//旧项目ID不在当前权限范围内
 			if(deptNoList.stream().noneMatch(u ->u.equals(oldDeptNo))){
 				param.setErrorMessage(InsurancesConstants.OLD_DEPT_NO_NOT_IN_DEPT_LIST);