|
@ -447,9 +447,7 @@ public class CCBDataAnalysisHelper { |
|
|
List<PlateNumberInfo> plateNumberInfoList = new ArrayList<>(); |
|
|
List<PlateNumberInfo> plateNumberInfoList = new ArrayList<>(); |
|
|
for (CCBCurrentBankStatementEntity entity : entityList) { |
|
|
for (CCBCurrentBankStatementEntity entity : entityList) { |
|
|
String sourceFile = entity.getSourceFile(); |
|
|
String sourceFile = entity.getSourceFile(); |
|
|
if(StrUtil.isEmpty(sourceFile)){ |
|
|
|
|
|
continue; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
try { |
|
|
boolean isSame = false; |
|
|
boolean isSame = false; |
|
|
|
|
|
|
|
@ -521,7 +519,7 @@ public class CCBDataAnalysisHelper { |
|
|
bs.setTransCurrencyType(Constants.CURRENCY_TYPE_CHINA); |
|
|
bs.setTransCurrencyType(Constants.CURRENCY_TYPE_CHINA); |
|
|
|
|
|
|
|
|
// 2 交易金额 可能是double或者int类型 |
|
|
// 2 交易金额 可能是double或者int类型 |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
if(StrUtil.isEmpty(entity.getLoanFlag()) && entity.getExpenditureAmount() != null && entity.getIncomeAmount() != null){ |
|
|
if(StrUtil.isEmpty(entity.getLoanFlag()) && entity.getExpenditureAmount() != null && entity.getIncomeAmount() != null){ |
|
|
BigDecimal expenditureAmount = BigDecimal.valueOf(Double.parseDouble(entity.getExpenditureAmount())); |
|
|
BigDecimal expenditureAmount = BigDecimal.valueOf(Double.parseDouble(entity.getExpenditureAmount())); |
|
|
BigDecimal incomeAmount = BigDecimal.valueOf(Double.parseDouble(entity.getIncomeAmount())); |
|
|
BigDecimal incomeAmount = BigDecimal.valueOf(Double.parseDouble(entity.getIncomeAmount())); |
|
@ -535,6 +533,10 @@ public class CCBDataAnalysisHelper { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
throw new AnalyzeDataFailedException("金额解析异常", e, sourceFile); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// 3 余额 |
|
|
// 3 余额 |
|
|
bs.setBalance(BigDecimal.valueOf(Double.parseDouble(entity.getBalance()))); |
|
|
bs.setBalance(BigDecimal.valueOf(Double.parseDouble(entity.getBalance()))); |
|
|
// 4 交易日期 |
|
|
// 4 交易日期 |
|
@ -551,6 +553,8 @@ public class CCBDataAnalysisHelper { |
|
|
log.error("日期转换异常", e); |
|
|
log.error("日期转换异常", e); |
|
|
throw new AnalyzeDataFailedException(StrUtil.format("日期转换异常:{}", transDate), e, sourceFile); |
|
|
throw new AnalyzeDataFailedException(StrUtil.format("日期转换异常:{}", transDate), e, sourceFile); |
|
|
} |
|
|
} |
|
|
|
|
|
}else { |
|
|
|
|
|
continue; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
String counterpartyName = entity.getCounterpartyName(); |
|
|
String counterpartyName = entity.getCounterpartyName(); |
|
|