Merge branch 'feature-zhaji' into 'develop'

"feature-zhaJi:修改ekp交互信息"

See merge request fangxinjiang/yifu!218

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

@@ -1026,14 +1026,14 @@ public class InsurancesConstants {
 
 
 	/**
-	 * 预估单
+	 * 预估
 	 */
-	public static final String ESTIMATE_SETTLE_BILL = "预估单";
+	public static final String ESTIMATE_SETTLE_BILL = "预估";
 
 	/**
-	 * 实缴单
+	 * 实缴
 	 */
-	public static final String ACTUAL_SETTLE_BILL = "实缴单";
+	public static final String ACTUAL_SETTLE_BILL = "实缴";
 
 	/**
 	 * 新增结算单
@@ -1041,15 +1041,20 @@ public class InsurancesConstants {
 	public static final String NEW_SETTLE_BILL = "新增结算单";
 
 	/**
-	 * 结算中
+	 * 更新结算单信息
 	 */
 	public static final String UPDATE_SETTLE_BILL = "更新结算单信息";
 
 	/**
-	 * 结算中
+	 * 作废结算单信息
 	 */
 	public static final String ABOLISH_SETTLE_BILL = "作废结算单信息";
 
+	/**
+	 * 红冲结算单信息
+	 */
+	public static final String CORRECT_SETTLE_BILL = "红冲结算单信息";
+
 
 
 }

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

@@ -1257,7 +1257,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		}
 		updateBatchById(successList);
 		if (CollectionUtils.isNotEmpty(successList)){
-			threadPool.execute(() -> {
+			//threadPool.execute(() -> {
 			//根据结算类型是合并结算，推送预估保费到ekp(上面已经算好，这里直接判断有预估保费的就推送)
 			for (TInsuranceDetail tInsuranceDetail : successList) {
 				Integer settleType = tInsuranceDetail.getSettleType();
@@ -1275,7 +1275,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					}
 				}
 			}
-			});
+			//});
 		}
 		//根据项目编码获取项目名称
 		setProjectNameByDeptNo(errorList);