订单明细

src/main/java/ieven/server/webapp/api/AlipayController.java

@@ -14,6 +14,7 @@ import ieven.server.webapp.service.alipay.AlipayService;
 import org.apache.commons.lang3.StringUtils;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -68,9 +69,17 @@ public class AlipayController {
                 return Mapped.ERROR("未查询到明细");
             } else {
                 Future<Long> totalFuture = this.dataService.countTotalByQuery(new Query(criteria));
-                List<DataMap> dataMaps =
-                        this.mongoTemplate.find(
-                                (new Query(criteria)).skip(skip).limit(pageSize), DataMap.class);
+                List<DataMap> dataMaps = new ArrayList<>();
+                if (filename.contains("对手透视")) {
+                    dataMaps =
+                            this.mongoTemplate.find(
+                                    (new Query(criteria).with(Sort.by(Sort.Direction.DESC, "共同主端数"))).skip(skip).limit(pageSize), DataMap.class);
+                } else {
+                    dataMaps =
+                            this.mongoTemplate.find(
+                                    (new Query(criteria)).skip(skip).limit(pageSize), DataMap.class);
+                }
+
                 Long total;
 
                 try {
@@ -105,7 +114,7 @@ public class AlipayController {
                 return Mapped.ERROR("未发现明细!");
             } else {
                 String fromFileId = oldFile.getFromFileId();
-                Fields fields = this.mongoTemplate.findOne( new Query(Criteria.where("fileId").is(fromFileId)), Fields.class);
+                Fields fields = this.mongoTemplate.findOne(new Query(Criteria.where("fileId").is(fromFileId)), Fields.class);
                 Mapped mapped = Mapped.OK();
                 mapped.put("result", fields);
                 return mapped;

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

@@ -10,6 +10,7 @@ public class TenpayHeaders {
     private static final Map<Integer, String> mappedNames = new HashMap<>();
 
     static {
+
         mappedHeaders.put(1, Arrays.asList(
                 "用户ID", "交易单号", "借贷类型", "交易类型", "交易金额(分)", "账户余额(分)", "交易时间", "银行类型", "交易说明", "商户名称", "发送方", "发送金额(分)", "接收方", "接收时间", "接收金额(分)", "银行卡号", "网银联单号1", "网银联单号2"));
 

src/main/java/ieven/server/webapp/service/alipay/AntiSecurityTrade3.java

@@ -5,7 +5,9 @@ import ieven.server.webapp.domain.alipay.HeaderProperties;
 import ieven.server.webapp.domain.data.DataMap;
 import ieven.server.webapp.domain.file.FileService;
 import ieven.server.webapp.service.Ops;
+import ieven.server.webapp.util.Common;
 import ieven.server.webapp.util.DataUtils;
+import ieven.server.webapp.util.excel.PublicStatic;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.bson.Document;
@@ -200,7 +202,8 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
         dataMap.put("交易对手户名", "");
       }
       dataMap.put("交易时间", DataUtils.transferDateToStr(origin.getString("交易时间")));
-      if ("".equals(dataMap.get("交易主体户名"))) {
+      String jyzthm=String.valueOf(dataMap.get("交易主体户名"));
+      if (StringUtils.isBlank(jyzthm)) {
         String account = (String) dataMap.getOrDefault("交易主体账号", "");
         if (StringUtils.isBlank(account) || "-".equals(account)) {
         } else {
@@ -209,6 +212,9 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
             dataMap.put("交易主体户名", newName);
           }
         }
+      }else {
+        String jyzthmStr = PublicStatic.removeAllBlank(jyzthm).replace("个人", "");
+        dataMap.put("交易主体户名", jyzthmStr);
       }
       if ("".equals((String) dataMap.get("交易对手户名"))) {
         String account = (String) dataMap.getOrDefault("交易对手账号", "");

src/main/java/ieven/server/webapp/service/alipay/AntiSecurityTradeEndAnalysis.java

@@ -131,7 +131,7 @@ public class AntiSecurityTradeEndAnalysis extends Ops implements Runnable {
             mainIds.add(mainId);
           } else {
             Set<String> mainIds = new HashSet<>();
-            mainIds.add(mainId);
+            mainIds.add(mainId+"("+alipayUsername+")");
             idToMainIds.put(alipayId, mainIds);
           }
         } catch (Exception exception) {

src/main/java/ieven/server/webapp/service/alipay/EndAnalysis.java

@@ -129,12 +129,13 @@ public class EndAnalysis extends Ops implements Runnable {
           oCount++;
           dataMap.put("总笔数", oCount);
           String mainId = (String) origin.get("支付宝用户ID");
+          String mainName = (String) origin.get("支付宝户名");
           if (idToMainIds.containsKey(alipayId)) {
             Set<String> mainIds = idToMainIds.get(alipayId);
             mainIds.add(mainId);
           } else {
             Set<String> mainIds = new HashSet<>();
-            mainIds.add(mainId);
+            mainIds.add(mainId+"("+mainName+")");
             idToMainIds.put(alipayId, mainIds);
           }
         } catch (Exception exception) {

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

@@ -129,12 +129,13 @@ public class TenpayTradesEndAnalysis extends Ops implements Runnable {
         oCount++;
         dataMap.put("总笔数", oCount);
         String mainId = (String) origin.get("交易主体账号");
+        String mainName = (String) origin.get("交易主体户名");
         if (idToMainIds.containsKey(alipayId)) {
           Set<String> mainIds = idToMainIds.get(alipayId);
           mainIds.add(mainId);
         } else {
           Set<String> mainIds = new HashSet<>();
-          mainIds.add(mainId);
+          mainIds.add(mainId+"("+mainName+")");
           idToMainIds.put(alipayId, mainIds);
         }
       } catch (Exception exception) {