Merge branch 'develop' into feature-zhaji

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

@@ -138,15 +138,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			List<UpdateInsuranceSettleParam.SettleData> settleData = param.getSettleData();
 			List<TInsuranceSettle> list = new ArrayList<>();
 			for (UpdateInsuranceSettleParam.SettleData settleDatum : settleData) {
-				TInsuranceSettle settle = new TInsuranceSettle();
 				String settleId = settleDatum.getSn().split("_")[1];
-				settle.setId(settleId);
-				settle.setUpdateTime(pushTime);
-				settle.setSettleHandleStatus(settleDatum.getSettleStatus());
-				if (CommonConstants.THREE_STRING.equals(settleDatum.getSettleStatus())){
-					settle.setSettleDoneTime(pushTime);
+				if (StringUtils.isNotBlank(settleId)){
+					TInsuranceSettle byId = tInsuranceSettleService.getById(settleId);
+					if (!Optional.ofNullable(byId).isPresent()){
+						continue;
+					}
+					byId.setUpdateTime(pushTime);
+					byId.setSettleHandleStatus(settleDatum.getSettleStatus());
+					if (CommonConstants.THREE_STRING.equals(settleDatum.getSettleStatus())){
+						byId.setSettleDoneTime(pushTime);
+					}
+					list.add(byId);
 				}
-				list.add(settle);
 			}
 			if (CollectionUtils.isNotEmpty(list)){
 				tInsuranceSettleService.saveOrUpdateBatch(list);