Merge branch 'fix-trans-log-20230324' into 'master'

fix

See merge request !14

src/main/java/cn/quantgroup/customer/rest/TransactionReceiptRecordRest.java

@@ -100,6 +100,11 @@ public class TransactionReceiptRecordRest {
 
     }
 
+    @RequestMapping(value = "/trans/key", method = RequestMethod.GET)
+    public void transKey(String key) {
+        transactionReceiptRecordService.deleteRedis(key);
+    }
+
     @RequestMapping(value = "/orderQuery/checkRedis", method = RequestMethod.GET)
     public JsonResult redisTest(String type) {
         if(type.equals("1")){

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

@@ -461,16 +461,20 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
         sftpUtil.logout();
         log.info("uploadFile | 断开ftp");
         log.info("[TransactionReceiptRecordServiceImpl.kdspOperationUrl  调用kdsp-op 接口end]");
-        if(CollectionUtils.isEmpty(emailList)){
-            log.info("没有签章成功的文件可以发送");
+        try {
+            if(CollectionUtils.isEmpty(emailList)){
+                log.info("没有签章成功的文件可以发送");
 //            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-        } else {
-            log.info("[TransactionReceiptRecordServiceImpl.sendCustomerTransactionHtmlMail  发送邮件begin]");
-            sendCustomerTransactionHtmlMail(transactionReceiptRecordList.size(),emailList.size(),transactionReceiptRecordList.size()-emailList.size());
-            log.info("[TransactionReceiptRecordServiceImpl.sendCustomerTransactionHtmlMail  发送邮件end]");
+            } else {
+                log.info("[TransactionReceiptRecordServiceImpl.sendCustomerTransactionHtmlMail  发送邮件begin]");
+                sendCustomerTransactionHtmlMail(transactionReceiptRecordList.size(),emailList.size(),transactionReceiptRecordList.size()-emailList.size());
+                log.info("[TransactionReceiptRecordServiceImpl.sendCustomerTransactionHtmlMail  发送邮件end]");
+            }
+        } catch (Exception e) {
+            log.error("邮件发送失败", e);
+        } finally {
+            deleteRedis("exportZipFile");
         }
-        deleteRedis("exportZipFile");
-
     }
 
     private  void getHeaders(HttpServletRequest request) {