代码重构

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

@@ -61,11 +61,15 @@ public class TenpayTrades extends Ops implements Runnable {
         origin = cursor.next();
         DataMap dataMap = new DataMap();
         dataMap.put("fileId", antiSecurityFileId);
-        dataMap.put("用户ID", origin.getString("用户ID").replace("[", "").replace("]", ""));
+        String userId = origin.getString("用户ID").replace("[", "").replace("]", "");
+        dataMap.put("用户ID", userId);
         dataMap.put("交易单号", origin.getString("交易单号").replace("[", "").replace("]", ""));
         String flag = origin.getString("借贷类型");
         if ("出".equals(flag)) {
           dataMap.put("交易主体账号", origin.getString("发送方"));
+          if (StringUtils.isBlank(origin.getString("发送方"))) {
+            dataMap.put("交易主体账号", userId);
+          }
           dataMap.put("交易主体银行卡号", "");
           dataMap.put("交易主体银行名称", origin.getString("商户名称"));
           dataMap.put("交易主体户名", accountToName.getOrDefault(origin.getString("发送方"), ""));
@@ -76,6 +80,9 @@ public class TenpayTrades extends Ops implements Runnable {
         }
         if ("入".equals(flag)) {
           dataMap.put("交易主体账号", origin.getString("接收方"));
+          if (StringUtils.isBlank(origin.getString("接收方"))) {
+            dataMap.put("交易主体账号", userId);
+          }
           dataMap.put("交易主体银行卡号", origin.getString(""));
           dataMap.put("交易主体银行名称", origin.getString(""));
           dataMap.put("交易主体户名", accountToName.getOrDefault(origin.getString("接收方"), ""));
@@ -90,7 +97,6 @@ public class TenpayTrades extends Ops implements Runnable {
         dataMap.put("交易类型", origin.getString("交易类型"));
         dataMap.put("交易时间", origin.getString("交易时间"));
         String string5 = origin.getString("交易金额(分)");
-        System.out.println(string5);
         dataMap.put(
             "交易金额(元)",
             NumberUtil.roundStr(