代码重构

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

@@ -78,6 +78,7 @@ public class TenpayOrders extends Ops implements Runnable {
         }
       }
     }
+    List<String> origheaders = TenpayHeaders.getHeaders(1);
     headers = TenpayHeaders.getHeaders(5);
     matched = matchHeaders(originFields, headers);
 
@@ -85,7 +86,7 @@ public class TenpayOrders extends Ops implements Runnable {
     if (CollectionUtils.isNotEmpty(matched)) {
       if (StringUtils.isBlank(newFileId)) {
         newFileId =
-            createLogicAndDeleteOld("财付通-订单明细", modelId, headers, mongoTemplate, fileService);
+            createLogicAndDeleteOld("财付通-订单明细", modelId, origheaders, mongoTemplate, fileService);
       }
       for (Fields fields : matched) {
         String fileId = fields.getFileId();
@@ -111,15 +112,18 @@ public class TenpayOrders extends Ops implements Runnable {
           newDoc.put("银行类型", originDoc.getString("交易用途类型"));
           newDoc.put("交易说明", newFileId);
           newDoc.put("商户名称", newFileId);
-          newDoc.put("发送方", originDoc.getString("用户ID"));
+
           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("对手方ID"));
           if (f1.equals("入")) {
             newDoc.put("接收金额(分)", originDoc.getString("交易金额(分)"));
             newDoc.put("银行卡号", originDoc.getString("对手方银行卡号"));
+            newDoc.put("发送方", originDoc.getString("对手方ID"));
+            newDoc.put("接收方", originDoc.getString("用户ID"));
           }
           newDoc.put("网银联单号1", originDoc.getString("备注1"));
           newDoc.put("网银联单号2", originDoc.getString("备注2"));