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

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java

@@ -618,7 +618,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 											errorMessageList), yfSocialImportThreadPoolExecutor);
 							completableFutureList.add(listCompletableFuture);
 						}
-
 						// 阻塞当前线程，等待所有的线程执行完毕
 						boolean computeFlag;
 						do {
@@ -634,12 +633,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			 			log.error("社保缴费库数据批量导入异常：" + e);
 						redisUtil.remove(key);
 					}
-					// -----------------------------线程池处理list，批量保存社保信息结束--------------------------------
-					//最后一个推送
-					log.info("社保批量导入耗时:{}", (System.currentTimeMillis() - start) + "");
-					redisUtil.remove(key);
 				}
 			}
+			redisUtil.remove(key);
 		}
 	}