代码重构

src/main/java/ieven/server/webapp/domain/tenpay/TenpayHeaders.java

@@ -80,6 +80,12 @@ public class TenpayHeaders {
             "备注1",
             "备注2"));
 
+    mappedHeaders.put(
+        6,
+        Arrays.asList(
+            "用户ID", "交易单号", "借贷类型", "交易类型", "交易金额(分)", "账户余额(分)", "交易时间", "银行类型", "交易说明", "商户名称",
+            "发送方", "发送金额(分)", "接收方", "接收时间", "接收金额(分)", "银行卡号", "对手银行卡号", "网银联单号1", "网银联单号2"));
+
     mappedNames.put(1, "财付通-订单明细");
   }
 }

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

@@ -42,12 +42,13 @@ public class TenpayOrders extends Ops implements Runnable {
   @Override
   public void run() {
     log.info("财付通-订单明细开始");
-
+    List<String> origheaders = TenpayHeaders.getHeaders(6);
     List<String> headers = TenpayHeaders.getHeaders(1);
     List<Fields> matched = matchHeaders(originFields, headers);
     String newFileId = "";
     if (CollectionUtils.isNotEmpty(matched)) {
-      newFileId = createLogicAndDeleteOld("财付通-订单明细", modelId, headers, mongoTemplate, fileService);
+      newFileId =
+          createLogicAndDeleteOld("财付通-订单明细", modelId, origheaders, mongoTemplate, fileService);
       for (Fields fields : matched) {
         String fileId = fields.getFileId();
         MongoCursor<Document> cursor = getCursor(fileId, mongoTemplate);
@@ -78,7 +79,7 @@ public class TenpayOrders extends Ops implements Runnable {
         }
       }
     }
-    List<String> origheaders = TenpayHeaders.getHeaders(1);
+
     headers = TenpayHeaders.getHeaders(5);
     matched = matchHeaders(originFields, headers);
 
@@ -116,14 +117,14 @@ public class TenpayOrders extends Ops implements Runnable {
             newDoc.put("银行卡号", originDoc.getString("用户银行卡号"));
             newDoc.put("发送方", originDoc.getString("用户ID"));
             newDoc.put("接收方", originDoc.getString("对手方ID"));
-            newDoc.put("接收方银行卡号", originDoc.getString("对手方银行卡号"));
+            newDoc.put("对手银行卡号", originDoc.getString("对手方银行卡号"));
           }
           if (f1.equals("入")) {
             newDoc.put("接收金额(分)", originDoc.getString("交易金额(分)"));
             newDoc.put("银行卡号", originDoc.getString("对手方银行卡号"));
             newDoc.put("发送方", originDoc.getString("对手方ID"));
             newDoc.put("接收方", originDoc.getString("用户ID"));
-            newDoc.put("接收方银行卡号", originDoc.getString("用户银行卡号"));
+            newDoc.put("对手银行卡号", originDoc.getString("用户银行卡号"));
           }
           newDoc.put("网银联单号1", originDoc.getString("用户侧网银联单号"));
           newDoc.put("网银联单号2", originDoc.getString("对手侧网银联单号"));

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

@@ -77,7 +77,7 @@ public class TenpayTrades extends Ops implements Runnable {
           dataMap.put("交易主体银行名称", "");
           dataMap.put("交易主体户名", accountToName.getOrDefault(origin.getString("发送方"), ""));
           dataMap.put("交易对手账号", origin.getString("接收方"));
-          dataMap.put("交易对手银行卡号", origin.getString("接收方银行卡号"));
+          dataMap.put("交易对手银行卡号", origin.getString("对手银行卡号"));
           dataMap.put("交易对手银行名称", "");
           dataMap.put(
               "交易对手户名",
@@ -88,7 +88,7 @@ public class TenpayTrades extends Ops implements Runnable {
           if (StringUtils.isBlank(origin.getString("接收方"))) {
             dataMap.put("交易主体账号", userId);
           }
-          dataMap.put("交易主体银行卡号", origin.getString("接收方银行卡号"));
+          dataMap.put("交易主体银行卡号", origin.getString("对手银行卡号"));
           dataMap.put("交易主体银行名称", "");
           dataMap.put(
               "交易主体户名",