财付通订单详情

src/main/java/ieven/server/webapp/domain/file/FileService.java

@@ -68,7 +68,7 @@ public class FileService {
             "五联单-IP地址分析",
             "五联单-收货地址分析"
     };
-    String[] order3 = {"财付通-开户信息", "财付通-订单明细", "财付通-交易明细", "财付通-账户透视", "财付通-对手透视", "财付通-手机明细"};
+    String[] order3 = {"财付通-开户信息", "财付通-订单明细","财付通-订单明细2", "财付通-交易明细", "财付通-账户透视", "财付通-对手透视", "财付通-手机明细"};
     @Autowired
     private GridFsTemplate gridFsTemplate;
     @Autowired

src/main/java/ieven/server/webapp/service/FieldsService.java

@@ -66,9 +66,9 @@ public class FieldsService extends Ops {
     fields = matchHeaders(originFields, TenpayHeaders.getHeaders(2));
     this.updateLogicalFile(fields, "财付通-订单明细");
     fields = matchHeaders(originFields, TenpayHeaders.getHeaders(7));
-    this.updateLogicalFile(fields, "财付通-订单明细");
+    this.updateLogicalFile(fields, "财付通-订单明细2");
     fields = matchHeaders(originFields, TenpayHeaders.getHeaders(8));
-    this.updateLogicalFile(fields, "财付通-订单明细");
+    this.updateLogicalFile(fields, "财付通-订单明细2");
     // 财付通-手机明细
     fields = matchHeaders(originFields, TenpayHeaders.getHeaders(4));
     this.updateLogicalFile(fields, "财付通-手机明细");

src/main/java/ieven/server/webapp/service/Ops.java

@@ -116,6 +116,17 @@ public class Ops {
                 .cursor();
     }
 
+    protected MongoCursor<Document> getCursor(List<String> inputFileId, MongoTemplate mongoTemplate) {
+        Query query = new Query(Criteria.where("fileId").in(inputFileId));
+        // 查询游标
+        return mongoTemplate
+                .getCollection("data")
+                .find(query.getQueryObject())
+                .batchSize(1000)
+                .noCursorTimeout(true)
+                .cursor();
+    }
+
     protected List<Fields> checkFields(List<Fields> fieldsList, int requireType) {
         List<String> requireHeaders = AlipayHeaders.getHeaders(requireType);
         List<Fields> checked = new ArrayList<>();

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

@@ -55,7 +55,7 @@ public class TenpayOrders0422 extends Ops implements Runnable {
         List<Fields> matched = matchHeaders(originFields, headers);
         // 以下为处理另一种格式的财付通数据
         if (CollectionUtils.isNotEmpty(matched)) {
-            String newFileId = createLogicAndDeleteOld("财付通-订单明细", modelId, TenpayHeaders.getHeaders(6), mongoTemplate, fileService);
+            String newFileId = createLogicAndDeleteOld("财付通-订单明细2", modelId, TenpayHeaders.getHeaders(8), mongoTemplate, fileService);
             for (Fields fields : matched) {
                 String fileId = fields.getFileId();
                 MongoCursor<Document> cursor = getCursor(fileId, mongoTemplate);

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

@@ -45,10 +45,15 @@ public class TenpayTrades extends Ops implements Runnable {
         log.info("财付通-交易明细开始");
         String antiSecurityFileId = "";
 
-        String dateFileId = getFileId("财付通-订单明细", modelId, mongoTemplate);
+        String dateFileId2 = getFileId("财付通-订单明细2", modelId, mongoTemplate);
+        String dateFileId1 = getFileId("财付通-订单明细", modelId, mongoTemplate);
+
+        List<String>list=new ArrayList<>();
+        list.add(dateFileId2);
+        list.add(dateFileId1);
         // 遍历登录日志全表
-        if (StringUtils.isNotBlank(dateFileId)) {
-            MongoCursor<Document> cursor = getCursor(dateFileId, mongoTemplate);
+        if (StringUtils.isNotBlank(dateFileId2)) {
+            MongoCursor<Document> cursor = getCursor(list, mongoTemplate);
             if (cursor.hasNext()) {
                 antiSecurityFileId = createLogicAndDeleteOld("财付通-交易明细", modelId, TenpayHeaders.getHeaders(2), mongoTemplate, fileService);
             }