Merge branch 'fix-trans-record-log-20230323' into 'master'

fix

See merge request !12

src/main/java/cn/quantgroup/customer/service/impl/TransactionReceiptRecordServiceImpl.java

@@ -217,7 +217,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
             throw new  RuntimeException("读取数据异常");
         }
         long end = System.currentTimeMillis();
-        log.info("TransactionReceiptRecordServiceImpl importTransactionReceiptRecord read end,读取数据总耗时:",end-begin);
+        log.info("TransactionReceiptRecordServiceImpl importTransactionReceiptRecord read end,读取数据总耗时:{}",end-begin);
         log.info("TransactionReceiptRecordServiceImpl importTransactionReceiptRecord save begin");
         if(readList.size()>0){
             //0代表初始状态，1代表导入成功，2代表导入失败
@@ -339,7 +339,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
         //查询需要导出的数据-导入成功的数据,但未导出成功的数据
         String accessToken = request.getHeader("Access-Token");
         List<TransactionReceiptRecord> transactionReceiptRecordList= transactionReceiptRecordRepo.selectRecordsByImportStatusAndExportStatus(VoucherExportStatus.EXPORT_SUCCESS.getCode(),limit);
-        log.info("[TransactionReceiptRecordServiceImpl.exportZipFile transactionReceiptRecordList] 可导出数据为：",transactionReceiptRecordList.size());
+        log.info("[TransactionReceiptRecordServiceImpl.exportZipFile transactionReceiptRecordList] 可导出数据数：{}",transactionReceiptRecordList.size());
         if(CollectionUtils.isEmpty(transactionReceiptRecordList)){
             deleteRedis("exportZipFile");
             log.info("没有可以导出得数据");
@@ -350,9 +350,9 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
         if(maxExportBatchNo == null || maxExportBatchNo ==0 ){
             maxExportBatchNo = 1;
         }
-        maxExportBatchNo = maxExportBatchNo.intValue()+1;
+        maxExportBatchNo = maxExportBatchNo +1;
         List <Map<String,Object>> emailList =new ArrayList<>();
-        log.info("[TransactionReceiptRecordServiceImpl.kdspOperationUrl  调用kdsp-op 接口begin]", System.currentTimeMillis());
+        log.info("[TransactionReceiptRecordServiceImpl.kdspOperationUrl  调用kdsp-op 接口begin] time:{}", System.currentTimeMillis());
         SFTPUtil sftpUtil = new SFTPUtil(username,password,host,port);
         sftpUtil.login();
         log.info("uploadFile | 成功连接ftp");
@@ -381,7 +381,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
                 paramList.add(param);
                 //得到json字符串
                 String result = httpService.post(url, header, paramList);
-                log.info("调用kdsp查询订单接口返回结果，result:",result);
+                log.info("调用kdsp查询订单接口返回结果，result:{}",result);
                 //转换成json 对象
                 if(StringUtils.isBlank(result)){
                     deleteRedis("exportZipFile");
@@ -453,7 +453,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
                 sftpUtil.logout();
                 log.info("uploadFile | 断开ftp");
                 deleteRedis("exportZipFile");
-                log.error("[TransactionReceiptRecordServiceImpl][exportZipFile] 网络通讯异常,userId:{},ex:{}", ExceptionUtils.getStackTrace(e));
+                log.error("[TransactionReceiptRecordServiceImpl][exportZipFile] 网络通讯异常,记录id:{},ex:{}", record.getId(), ExceptionUtils.getStackTrace(e));
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 throw new RuntimeException("导出文件出错了");
             }