对公转账代码优化

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorselfrecharge/DistributorSelfRechargeServiceImpl.java

@@ -36,13 +36,12 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import java.io.*;
 import java.math.BigDecimal;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.net.URL;
-import java.net.URLConnection;
+import java.net.*;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -231,7 +230,7 @@ public class DistributorSelfRechargeServiceImpl implements DistributorSelfRechar
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Long distributorCMBRecharge(Long distributorId,Long id, String payOrderId, Integer payStatus) {
+    public Long distributorCMBRecharge(Long distributorId, Long id, String payOrderId, Integer payStatus) {
         log.info("对公转账充值支付完成：{}，{},{}", id, payOrderId, payStatus);
         AtomicReference<Long> tradeLogId = new AtomicReference<>();
         DistributorSelfRechargeDO distributorSelfRecharge = distributorSelfRechargeMapper.selectById(id);
@@ -375,9 +374,14 @@ public class DistributorSelfRechargeServiceImpl implements DistributorSelfRechar
 
                         // 5. 读取数据
                         BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, "GBK"));
-                        String line;
-                        while ((line = reader.readLine()) != null) {
-                            log.error(line);
+                        String line0;
+                        List<String> lins = new ArrayList<>();
+                        while ((line0 = reader.readLine()) != null) {
+                            log.error("-------------------"+line0);
+                            lins.add(line0);
+                        }
+
+                        lins.forEach(line -> {
                             //省市代码|账号|账薄号|货币码|交易日期|日志号|交易时间|户名|账薄名|交易类型|交
                             //易行号|传票号|发生额标识|现转标志|交易金额|账户余额|上笔余额|凭证种类|交易码|
                             //凭证号|对方账号省市代码|对方账号|对方账号货币码|对方账号户名|对方账号开户行|
@@ -429,7 +433,7 @@ public class DistributorSelfRechargeServiceImpl implements DistributorSelfRechar
                             } catch (NumberFormatException e) {
                                 log.error("金额格式错误 | trsamt:{}", trsAmt, e);
                             }
-                        }
+                        });
 
                         // 6. 关闭资源
                         reader.close();