财付通-订单详情1

pom.xml

@@ -132,6 +132,16 @@
             <artifactId>aliyun-sdk-oss</artifactId>
             <version>2.5.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>33.2.0-jre</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>33.2.0-jre</version>
+        </dependency>
     </dependencies>
 
     <build>

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

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

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

@@ -55,7 +55,7 @@ public class FieldsService extends Ops {
     this.updateLogicalFile(fields, "治安平台订单数据");
     // 财付通 开户信息
     fields = matchHeaders(originFields, TenpayHeaders.getHeaders(3));
-    this.updateLogicalFile(fields, "财付通-开户信息");
+    this.updateLogicalFile(fields, "财付通-注册信息");
     // 财付通-订单明细
     fields = matchHeaders(originFields, TenpayHeaders.getHeaders(6));
     this.updateLogicalFile(fields, "财付通-订单明细");

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

@@ -51,7 +51,7 @@ public class TenpayAccount extends Ops implements Runnable {
     List<Fields> matched = matchHeaders(originFields, headers);
     if (CollectionUtils.isNotEmpty(matched)) {
       String newFileId =
-          createLogicAndDeleteOld("财付通-开户信息", modelId, headers, mongoTemplate, fileService);
+          createLogicAndDeleteOld("财付通-注册信息", modelId, headers, mongoTemplate, fileService);
       for (Fields fields : matched) {
         String fileId = fields.getFileId();
         MongoCursor<Document> cursor = getCursor(fileId, mongoTemplate);

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

@@ -71,17 +71,35 @@ public class TenpayOrders0422 extends Ops implements Runnable {
                     newDoc.put("fileId", newFileId);
                     newDoc.put("用户ID", originDoc.getString("用户ID"));
                     newDoc.put("交易单号", originDoc.getString("交易单号"));
+                    newDoc.put("大单号", originDoc.getString("大单号"));
+                    newDoc.put("用户侧账号名称", originDoc.getString("用户侧账号名称"));
                     String f1 = originDoc.getString("借贷类型");
                     newDoc.put("借贷类型", originDoc.getString("借贷类型"));
-                    newDoc.put("交易类型", originDoc.getString("交易用途类型"));
+                    newDoc.put("交易业务类型", originDoc.getString("交易业务类型"));
+                    newDoc.put("交易用途类型", originDoc.getString("交易用途类型"));
+                    newDoc.put("交易时间", originDoc.getString("交易时间"));
                     newDoc.put("交易金额(分)", originDoc.getString("交易金额(分)"));
                     newDoc.put("账户余额(分)", originDoc.getString("账户余额(分)"));
-                    newDoc.put("交易时间", originDoc.getString("交易时间"));
-                    newDoc.put("银行类型", originDoc.getString("交易业务类型"));
-                    newDoc.put("交易说明", originDoc.getString("备注1") + originDoc.getString("备注2"));
-                    if (f1.equals("出")) {
+                    newDoc.put("用户银行卡号", originDoc.getString("用户银行卡号"));
+                    newDoc.put("用户侧银行名称", originDoc.getString("用户侧银行名称"));
+                    newDoc.put("用户侧网银联单号", originDoc.getString("用户侧网银联单号"));
+                    newDoc.put("网联/银联", originDoc.getString("网联/银联"));
+                    newDoc.put("第三方账户名称", originDoc.getString("第三方账户名称"));
+                    newDoc.put("对手方ID", originDoc.getString("对手方ID"));
+                    newDoc.put("对手侧账户名称", originDoc.getString("对手侧账户名称"));
+                    newDoc.put("对手方银行卡号", originDoc.getString("对手方银行卡号"));
+                    newDoc.put("对手侧银行名称", originDoc.getString("对手侧银行名称"));
+                    newDoc.put("对手侧网银联单号", originDoc.getString("对手侧网银联单号"));
+                    newDoc.put("对手方接收时间", originDoc.getString("对手方接收时间"));
+                    newDoc.put("对手方接收金额(分)", originDoc.getString("对手方接收金额(分)"));
+                    newDoc.put("备注1", originDoc.getString("备注1"));
+                    newDoc.put("备注2", originDoc.getString("备注2"));
+
+                   /* if (f1.equals("出")) {
                         newDoc.put("发送金额(分)", originDoc.getString("交易金额(元)"));
-                        newDoc.put("银行卡号", originDoc.getString("用户银行卡号"));
+                        newDoc.put("用户银行卡号", originDoc.getString("用户银行卡号"));
+                        newDoc.put("用户侧银行名称", originDoc.getString("用户侧银行名称"));
+                        newDoc.put("用户侧网银联单号", originDoc.getString("用户侧网银联单号"));
                         newDoc.put("发送方", originDoc.getString("用户ID"));
                         newDoc.put("接收方", originDoc.getString("对手方ID"));
                         newDoc.put("对手银行卡号", originDoc.getString("对手方银行卡号"));
@@ -94,7 +112,7 @@ public class TenpayOrders0422 extends Ops implements Runnable {
                         newDoc.put("对手银行卡号", originDoc.getString("用户银行卡号"));
                     }
                     newDoc.put("网银联单号1", originDoc.getString("用户侧网银联单号"));
-                    newDoc.put("网银联单号2", originDoc.getString("对手侧网银联单号"));
+                    newDoc.put("网银联单号2", originDoc.getString("对手侧网银联单号"));*/
                     needToSave.add(newDoc);
                     if (needToSave.size() >= 1000) {
                         saveLines(new ArrayList<>(needToSave), mongoTemplate);

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

@@ -1,6 +1,7 @@
 package ieven.server.webapp.service.tenpay;
 
 import cn.hutool.core.util.NumberUtil;
+import com.google.common.collect.Lists;
 import com.mongodb.client.MongoCursor;
 import ieven.server.webapp.domain.data.DataMap;
 import ieven.server.webapp.domain.file.FileService;
@@ -76,26 +77,26 @@ public class TenpayTrades extends Ops implements Runnable {
                     if (StringUtils.isBlank(origin.getString("发送方"))) {
                         dataMap.put("交易主体账号", userId);
                     }
-                    dataMap.put("交易主体银行卡号", origin.getString("银行卡号"));
-                    dataMap.put("交易主体银行名称", "");
-                    dataMap.put("交易主体户名", accountToName.getOrDefault(origin.getString("发送方"), ""));
+                    dataMap.put("交易主体银行卡号", getValue(origin, Lists.newArrayList("银行卡号","用户银行卡号")));
+                    dataMap.put("交易主体银行名称", getValue(origin, Lists.newArrayList("用户侧银行名称")));
+                    dataMap.put("交易主体户名", getValue(origin, Lists.newArrayList("发送方","用户侧账号名称")));
                     dataMap.put("交易对手账号", origin.getString("接收方"));
-                    dataMap.put("交易对手银行卡号", origin.getString("对手银行卡号"));
-                    dataMap.put("交易对手银行名称", "");
-                    dataMap.put("交易对手户名", accountToName.getOrDefault(StringUtils.trimToEmpty(origin.getString("接收方")), ""));
+                    dataMap.put("交易对手银行卡号",getValue(origin, Lists.newArrayList("对手银行卡号","对手方银行卡号")));
+                    dataMap.put("交易对手银行名称", getValue(origin, Lists.newArrayList("对手侧银行名称")));
+                    dataMap.put("交易对手户名", getValue(origin, Lists.newArrayList("接收方","对手侧账户名称")));
                 }
                 if ("入".equals(flag)) {
                     dataMap.put("交易主体账号", StringUtils.trimToEmpty(origin.getString("接收方")));
                     if (StringUtils.isBlank(origin.getString("接收方"))) {
                         dataMap.put("交易主体账号", userId);
                     }
-                    dataMap.put("交易主体银行卡号", origin.getString("对手银行卡号"));
-                    dataMap.put("交易主体银行名称", "");
-                    dataMap.put("交易主体户名", accountToName.getOrDefault(StringUtils.trimToEmpty(origin.getString("接收方")), ""));
+                    dataMap.put("交易主体银行卡号", getValue(origin, Lists.newArrayList("对手银行卡号","对手方银行卡号")));
+                    dataMap.put("交易主体银行名称", getValue(origin, Lists.newArrayList("对手侧银行名称")));
+                    dataMap.put("交易主体户名", getValue(origin, Lists.newArrayList("接收方","对手侧账户名称")));
                     dataMap.put("交易对手账号", StringUtils.trimToEmpty(origin.getString("发送方")));
-                    dataMap.put("交易对手银行卡号", origin.getString("银行卡号"));
-                    dataMap.put("交易对手银行名称", "");
-                    dataMap.put("交易对手户名", accountToName.getOrDefault(StringUtils.trimToEmpty(origin.getString("发送方")), ""));
+                    dataMap.put("交易对手银行卡号", getValue(origin, Lists.newArrayList("银行卡号","用户银行卡号")));
+                    dataMap.put("交易对手银行名称", getValue(origin, Lists.newArrayList("用户侧银行名称")));
+                    dataMap.put("交易对手户名",  getValue(origin, Lists.newArrayList("发送方","用户侧账号名称")));
                 }
                 dataMap.put("借贷类型", flag);
                 dataMap.put("交易类型", origin.getString("交易类型"));
@@ -149,4 +150,15 @@ public class TenpayTrades extends Ops implements Runnable {
         this.latch.countDown();
         log.info("财付通-交易明细结束");
     }
+
+    public String getValue(Document origin,List<String>dataList){
+        String value="";
+        for (String s : dataList) {
+            value = accountToName.getOrDefault(StringUtils.trimToEmpty(origin.getString(s)), "");
+            if(StringUtils.isNotBlank(value)){
+                return value;
+            }
+        }
+        return value;
+    }
 }