From 17c2f02cd0876961d59c8158f87b1b49736fcb3b Mon Sep 17 00:00:00 2001
From: "583641232@qq.com" <583641232@qq.com>
Date: Wed, 14 Aug 2024 15:41:26 +0800
Subject: [PATCH] :sparkles:  config

---
 .../domain/ImportOpeningAccountInfo.java      |  4 +--
 .../helper/CCBDataAnalysisHelper.java         | 32 +++++++++++--------
 .../ReadCCBCurrentAccountInfoListener.java    |  2 +-
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/ImportOpeningAccountInfo.java b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/ImportOpeningAccountInfo.java
index df287ed..f5caa86 100644
--- a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/ImportOpeningAccountInfo.java
+++ b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/ImportOpeningAccountInfo.java
@@ -57,8 +57,8 @@ public class ImportOpeningAccountInfo {
     @ExcelProperty({"开户日期","开卡日期"})
     private String openingAccountDate;
 
-    @ExcelProperty("账户余额")
-    private BigDecimal balance;
+//    @ExcelProperty("账户余额")
+//    private BigDecimal balance;
 
     @ExcelProperty({"系统账户状态", "账户状态"})
     private String status;
diff --git a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CCBDataAnalysisHelper.java b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CCBDataAnalysisHelper.java
index 46b14eb..7fedd4f 100644
--- a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CCBDataAnalysisHelper.java
+++ b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CCBDataAnalysisHelper.java
@@ -447,9 +447,7 @@ public class CCBDataAnalysisHelper {
         List<PlateNumberInfo> plateNumberInfoList = new ArrayList<>();
         for (CCBCurrentBankStatementEntity entity : entityList) {
             String sourceFile = entity.getSourceFile();
-            if(StrUtil.isEmpty(sourceFile)){
-                continue;
-            }
+
             try {
             boolean isSame = false;
 
@@ -521,18 +519,22 @@ public class CCBDataAnalysisHelper {
             bs.setTransCurrencyType(Constants.CURRENCY_TYPE_CHINA);
 
             // 2 交易金额 可能是double或者int类型
+                try {
+                    if(StrUtil.isEmpty(entity.getLoanFlag()) && entity.getExpenditureAmount() != null && entity.getIncomeAmount() != null){
+                        BigDecimal expenditureAmount = BigDecimal.valueOf(Double.parseDouble(entity.getExpenditureAmount()));
+                        BigDecimal incomeAmount = BigDecimal.valueOf(Double.parseDouble(entity.getIncomeAmount()));
+                        bs.setTransactionAmount(incomeAmount.subtract(expenditureAmount));
+                    }else {
+                        BigDecimal transactionAmount = new BigDecimal(entity.getTransactionAmount());
+                        if(entity.getLoanFlag().contains("借")){
+                            bs.setTransactionAmount(transactionAmount.negate());
+                        } else {
+                            bs.setTransactionAmount(transactionAmount);
+                        }
+                    }
 
-            if(StrUtil.isEmpty(entity.getLoanFlag()) && entity.getExpenditureAmount() != null && entity.getIncomeAmount() != null){
-                BigDecimal expenditureAmount = BigDecimal.valueOf(Double.parseDouble(entity.getExpenditureAmount()));
-                BigDecimal incomeAmount = BigDecimal.valueOf(Double.parseDouble(entity.getIncomeAmount()));
-                bs.setTransactionAmount(incomeAmount.subtract(expenditureAmount));
-            }else {
-                BigDecimal transactionAmount = new BigDecimal(entity.getTransactionAmount());
-                if(entity.getLoanFlag().contains("借")){
-                    bs.setTransactionAmount(transactionAmount.negate());
-                } else {
-                    bs.setTransactionAmount(transactionAmount);
-                }
+                } catch (Exception e) {
+                throw new AnalyzeDataFailedException("金额解析异常", e, sourceFile);
             }
 
             // 3 余额
@@ -551,6 +553,8 @@ public class CCBDataAnalysisHelper {
                     log.error("日期转换异常", e);
                     throw new AnalyzeDataFailedException(StrUtil.format("日期转换异常:{}", transDate), e, sourceFile);
                 }
+            }else {
+                continue;
             }
 
             String counterpartyName = entity.getCounterpartyName();
diff --git a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/listener/ReadCCBCurrentAccountInfoListener.java b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/listener/ReadCCBCurrentAccountInfoListener.java
index a17aff8..174e4b9 100644
--- a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/listener/ReadCCBCurrentAccountInfoListener.java
+++ b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/listener/ReadCCBCurrentAccountInfoListener.java
@@ -40,7 +40,7 @@ public class ReadCCBCurrentAccountInfoListener implements ReadListener<CCBCurren
     public void invoke(CCBCurrentAccountInfoEntity entry, AnalysisContext analysisContext) {
 
         entry.setId(IdUtil.objectId());
-
+        entry.setSourceFile(sourceFile);
         cacheList.add(entry);
 
         if (cacheList.size() >= BATCH_SIZE) {