修改交易明细交易主体账号显示问题

src/main/java/ieven/server/webapp/service/datastatic/DataStaticAnalysisTotal.java

@@ -112,7 +112,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                             }
 
                         }
-                        saveLines(new ArrayList<>(newDataList), mongoTemplate);
+                        saveLines(newDataList, mongoTemplate);
                         needToSaveall.clear();
                     }
 

src/main/java/ieven/server/webapp/service/tenpay/TenpayTrades.java

@@ -189,12 +189,17 @@ public class TenpayTrades extends Ops implements Runnable {
                 DataMap dataMap = new DataMap();
                 dataMap.put("fileId", antiSecurityFileId);
                 String userId = origin.getString("用户ID").replace("[", "").replace("]", "");
+                String dsUserId = origin.getString("对手方ID").replace("[", "").replace("]", "");
                 dataMap.put("用户ID", userId);
                 String lognumber = origin.getString("交易单号");
                 if (StringUtils.isBlank(lognumber)) {
                     continue;
                 }
                 dataMap.put("交易主体户名", origin.getString("用户侧账号名称"));
+                dataMap.put("交易主体账号", origin.getString("用户侧账号名称"));
+                if (StringUtils.isBlank(origin.getString("用户侧账号名称"))) {
+                    dataMap.put("交易主体账号", userId);
+                }
                 dataMap.put("交易主体银行卡号", origin.getString("用户银行卡号"));
                 dataMap.put("交易主体银行名称", origin.getString("用户侧银行名称"));
                 dataMap.put("交易对手户名", origin.getString("对手侧账户名称"));
@@ -202,8 +207,12 @@ public class TenpayTrades extends Ops implements Runnable {
                 dataMap.put("交易对手银行名称", origin.getString("对手侧银行名称"));
                 dataMap.put("交易单号", lognumber.replace("[", "").replace("]", ""));
                 dataMap.put("借贷类型", origin.getString("借贷类型"));
-                dataMap.put("交易主体账号", origin.getString("用户侧账号名称"));
-                dataMap.put("交易对手账号",  origin.getString("对手侧账户名称"));
+
+                dataMap.put("交易对手账号", origin.getString("对手侧账户名称"));
+                if (StringUtils.isBlank(origin.getString("对手侧账户名称"))) {
+                    dataMap.put("交易对手账号", dsUserId);
+                }
+
                 dataMap.put("交易时间", origin.getString("交易时间"));
                 String string5 = origin.getString("交易金额(分)");
                 if (!NumberUtil.isNumber(string5)) {