Merge branch 'feature-zhaji' into 'develop'

Feature zhaji

See merge request !253

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -1153,7 +1153,10 @@ public class InsurancesConstants {
 	 */
 	public static final String EKP_ACTUAL_STATUS_ERROR = "实缴费用已进行结算";
 
-
+	/**
+	 * 存在与ekp系统交互异常，请联系管理员处理后再操作
+	 */
+	public static final String EKP_SEND_ERROR = "存在与ekp系统交互异常，请联系管理员处理后再操作";
 
 
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceEkp.java

 package com.yifu.cloud.plus.v1.yifu.insurances.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -164,9 +165,14 @@ public class TInsuranceEkp implements Serializable {
 	/**
 	 * 不重发原因
 	 */
+	@Schema(description = "不重发原因")
 	private String notResendMessage;
 
-
+	/**
+	 * EKP的 是否BPO：  是  否
+	 */
+	@Schema(description = "是否BPO", name = "bpoFlag")
+	private String bpoFlag;
     private static final long serialVersionUID = 1L;
 
 }
\ No newline at end of file

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

@@ -2951,6 +2951,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				listResult.add(param);
 				continue;
 			}else {
+				LambdaQueryWrapper<TInsuranceEkp> ekpLambdaQueryWrapper = new LambdaQueryWrapper<>();
+				ekpLambdaQueryWrapper.eq(TInsuranceEkp :: getDetailId,detail.getId()).eq(TInsuranceEkp ::getResendFlag,CommonConstants.ZERO_INT);
+				List<TInsuranceEkp> ekpList = tInsuranceEkpService.list(ekpLambdaQueryWrapper);
+				if(CollectionUtils.isNotEmpty(ekpList)){
+					param.setErrorMessage(InsurancesConstants.EKP_SEND_ERROR);
+					listResult.add(param);
+					continue;
+				}
 				// 如果保费不存在，保单号、保费必填
 				if (detail.getActualPremium() == null){
 					if (StringUtils.isBlank(param.getPolicyNo())){
@@ -5049,6 +5057,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				continue;
 			}
 			TInsuranceDetail insuranceDetail = getOne(queryWrapper);
+			LambdaQueryWrapper<TInsuranceEkp> ekpLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			ekpLambdaQueryWrapper.eq(TInsuranceEkp :: getDetailId,insuranceDetail.getId()).eq(TInsuranceEkp ::getResendFlag,CommonConstants.ZERO_INT);
+			List<TInsuranceEkp> ekpList = tInsuranceEkpService.list(ekpLambdaQueryWrapper);
+			if(CollectionUtils.isNotEmpty(ekpList)){
+				param.setErrorMessage(InsurancesConstants.EKP_SEND_ERROR);
+				errorList.add(param);
+				continue;
+			}
 			//如果保单信息为空
 			if (Common.isEmpty(insuranceDetail)){
 				param.setErrorMessage(InsurancesConstants.USER_DATA_IS_NOT_EXIST);
@@ -5535,6 +5551,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				continue;
 			}
 			TInsuranceDetail insuranceDetail = getOne(queryWrapper);
+			LambdaQueryWrapper<TInsuranceEkp> ekpLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			ekpLambdaQueryWrapper.eq(TInsuranceEkp :: getDetailId,insuranceDetail.getId()).eq(TInsuranceEkp ::getResendFlag,CommonConstants.ZERO_INT);
+			List<TInsuranceEkp> ekpList = tInsuranceEkpService.list(ekpLambdaQueryWrapper);
+			if(CollectionUtils.isNotEmpty(ekpList)){
+				param.setErrorMessage(InsurancesConstants.EKP_SEND_ERROR);
+				errorList.add(param);
+				continue;
+			}
 			//如果保单信息为空
 			if (Common.isEmpty(insuranceDetail)){
 				param.setErrorMessage(InsurancesConstants.USER_DATA_IS_NOT_EXIST);

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

@@ -112,11 +112,6 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 						}
 						ekpUpdate.set(TInsuranceEkp :: getResendFlag,CommonConstants.TWO_INT);
 						update(ekpUpdate);
-						if(!Common.isEmpty(settleVo)){
-							settleUpdate.set(TInsuranceSettle :: getEstimatePushTime,LocalDateTime.now())
-									.set(TInsuranceSettle ::getIsEstimatePush,CommonConstants.ONE_INT);
-							tInsuranceSettleService.update(settleUpdate);
-						}
 						continue;
 					} else{
 						ekpParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceEkpMapper.xml

@@ -34,6 +34,7 @@
 			<result property="pushType" column="PUSH_TYPE" jdbcType="TINYINT"/>
 			<result property="settleType" column="SETTLE_TYPE" jdbcType="VARCHAR"/>
 			<result property="notResendMessage" column="NOT_RESEND_MESSAGE" jdbcType="VARCHAR"/>
+			<result property="bpoFlag" column="BPO_FLAG" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -45,7 +46,7 @@
         POLICY_END,BUY_STANDARD,MEDICAL_QUOTA,
         DIE_DISABLE_QUOTA,ACTUAL_PREMIUM,ESTIMATE_PREMIUM,
         SETTLE_MONTH,INTERACTIVE_TYPE,RESEND_FLAG,
-        CREATE_TIME,PUSH_TIME,PUSH_TYPE,SETTLE_TYPE,NOT_RESEND_MESSAGE
+        CREATE_TIME,PUSH_TIME,PUSH_TYPE,SETTLE_TYPE,NOT_RESEND_MESSAGE,BPO_FLAG
     </sql>
 
 	<select id="getEkpRefundList" resultMap="BaseResultMap">