Merge branch 'feature-zhaji' into 'develop'

"feature-zhaJi:优化ekp异常重发交互逻辑"

See merge request !254

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

@@ -5525,7 +5525,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					param.setOldCustomerName(oldJsonObject.getCustomerName());
 					param.setNewDeptName(jsonObject.getDepartName());
 					param.setNewCustomerName(jsonObject.getCustomerName());
-					param.setOldCustomerCode(jsonObject.getCustomerCode());
+					param.setNewCustomerCode(jsonObject.getCustomerCode());
 					String settleType = jsonObject.getInsuranceSettleType();
 					if (StringUtils.isEmpty(settleType)){
 						param.setErrorMessage(InsurancesConstants.PROJECT_NOT_FIND_SETTLE_TYPE);

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

@@ -189,6 +189,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 						continue;
 					}else{
 						ekpParam.setInteractiveType(InsurancesConstants.UPDATE_SETTLE_BILL);
+						ekpParam.setSettleType(CommonConstants.EMPTY_STRING);
 						s = ekpInsuranceUtil.sendToEkp(ekpParam);
 						if(StringUtils.isNotBlank(s)){
 							ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT)