优化修改

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

@@ -58,10 +58,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLEncoder;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 收入明细表
@@ -322,14 +318,12 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 
 	@Override
 	public void pushDetail() {
-		ThreadPoolExecutor threadPool = new ThreadPoolExecutor(50, 50, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(10));
 		List<TIncome> list = baseMapper.selectList(Wrappers.<TIncome>query().lambda()
 				.eq(TIncome::getSendStatus, CommonConstants.ZERO_STRING));
-		ConcurrentHashMap<String,Integer> map = new ConcurrentHashMap<>();
-		ConcurrentHashMap<String,String> idMap = new ConcurrentHashMap<>();
+		Map<String, Integer> map = new HashMap<>();
+		Map<String, String> idMap = new HashMap<>();
 		//收入更新
 		List<TIncome> updateList = new ArrayList<>();
-		threadPool.execute(() -> {
 		for (TIncome income : list) {
 			String sendBack = this.getSendBack(income);
 			income.setSendTime(new Date());
@@ -343,7 +337,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 					updateList.clear();
 				}
 			} else {
-					if (map.get(sendBack) > 0) {
+				if (Common.isNotNull(map.get(sendBack)) && map.get(sendBack) > 0) {
 					int i = map.get(sendBack) + 1;
 					map.put(sendBack, i);
 					idMap.put(sendBack, income.getId());
@@ -368,7 +362,6 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 				}
 			}
 		}
-		});
 		for (Map.Entry<String, Integer> entry : map.entrySet()) {
 			TSendEkpError error = new TSendEkpError();
 			error.setCreateTime(new Date());