From 9df4d380024c50e30fc0a97dfbd807e8ac7fa590 Mon Sep 17 00:00:00 2001
From: wangrangrang <wangrangrang7077@dingtalk.com>
Date: Tue, 8 Aug 2023 13:30:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BC=82=E5=B8=B8=EF=BC=8C?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=BC=82=E5=B8=B8=E5=BD=B1=E5=93=8D=E4=B8=BB?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PushInvoiceServiceImpl.java  | 92 ++++++++++---------
 1 file changed, 50 insertions(+), 42 deletions(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
index 8127eda4..537d49bd 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
@@ -364,52 +364,60 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
     }
 
     public void successPush(Long pushInfoRecordId,String content,String result,PushInfo pushInfo,String pushType){
-        PushInfoRecord pushInfoRecord = new PushInfoRecord();
-        pushInfoRecord.setId(Long.parseLong(DistributedKeyMaker.generateShotKey()));
-        pushInfoRecord.setRetryCount(0);
-        if(pushInfo!=null){
-            pushInfoRecord.setPushInfoId(pushInfo.getId());
-            pushInfoRecord.setQyType(pushInfo.getByzd1());
-        }
-        if(pushInfoRecordId!=null){
-            pushInfoRecord=pushInfoRecordMapper.selectByPrimaryKey(pushInfoRecordId);
-            pushInfoRecord.setRetryCount(pushInfoRecord.getRetryCount()+1);
-            pushInfoRecordMapper.updateByPrimaryKeySelective(pushInfoRecord);
-        }
-        pushInfoRecord.setPushContent(content);
-        pushInfoRecord.setInterfacePushType(pushType);
-        pushInfoRecord.setPushStatus("success");
-        pushInfoRecord.setResult(result);
-        pushInfoRecord.setCreateTime(new Date());
-        if(pushInfoRecordId!=null){
-            pushInfoRecordMapper.updateByPrimaryKey(pushInfoRecord);
-        }else {
-            pushInfoRecordMapper.insert(pushInfoRecord);
+        try {
+            PushInfoRecord pushInfoRecord = new PushInfoRecord();
+            pushInfoRecord.setId(Long.parseLong(DistributedKeyMaker.generateShotKey()));
+            pushInfoRecord.setRetryCount(0);
+            if(pushInfo!=null){
+                pushInfoRecord.setPushInfoId(pushInfo.getId());
+                pushInfoRecord.setQyType(pushInfo.getByzd1());
+            }
+            if(pushInfoRecordId!=null){
+                pushInfoRecord=pushInfoRecordMapper.selectByPrimaryKey(pushInfoRecordId);
+                pushInfoRecord.setRetryCount(pushInfoRecord.getRetryCount()+1);
+                pushInfoRecordMapper.updateByPrimaryKeySelective(pushInfoRecord);
+            }
+            pushInfoRecord.setPushContent(content);
+            pushInfoRecord.setInterfacePushType(pushType);
+            pushInfoRecord.setPushStatus("success");
+            pushInfoRecord.setResult(result);
+            pushInfoRecord.setCreateTime(new Date());
+            if(pushInfoRecordId!=null){
+                pushInfoRecordMapper.updateByPrimaryKey(pushInfoRecord);
+            }else {
+                pushInfoRecordMapper.insert(pushInfoRecord);
+            }
+        } catch (Exception e) {
+            log.error("记录推送成功日志出错，"+e.getMessage());
         }
     }
 
     public void failPush(Long pushInfoRecordId,String content,String result,String failReason,PushInfo pushInfo,String pushType){
-        PushInfoRecord pushInfoRecord = new PushInfoRecord();
-        pushInfoRecord.setId(Long.parseLong(DistributedKeyMaker.generateShotKey()));
-        pushInfoRecord.setRetryCount(0);
-        if(pushInfo!=null){
-            pushInfoRecord.setPushInfoId(pushInfo.getId());
-            pushInfoRecord.setQyType(pushInfo.getByzd1());
-        }
-        if(pushInfoRecordId!=null){
-            pushInfoRecord=pushInfoRecordMapper.selectByPrimaryKey(pushInfoRecordId);
-            pushInfoRecord.setRetryCount(pushInfoRecord.getRetryCount()+1);
-        }
-        pushInfoRecord.setPushContent(content);
-        pushInfoRecord.setInterfacePushType(pushType);
-        pushInfoRecord.setPushStatus("fail");
-        pushInfoRecord.setResult(result);
-        pushInfoRecord.setFailReason(failReason);
-        pushInfoRecord.setCreateTime(new Date());
-        if(pushInfoRecordId!=null){
-            pushInfoRecordMapper.updateByPrimaryKey(pushInfoRecord);
-        }else {
-            pushInfoRecordMapper.insert(pushInfoRecord);
+        try {
+            PushInfoRecord pushInfoRecord = new PushInfoRecord();
+            pushInfoRecord.setId(Long.parseLong(DistributedKeyMaker.generateShotKey()));
+            pushInfoRecord.setRetryCount(0);
+            if(pushInfo!=null){
+                pushInfoRecord.setPushInfoId(pushInfo.getId());
+                pushInfoRecord.setQyType(pushInfo.getByzd1());
+            }
+            if(pushInfoRecordId!=null){
+                pushInfoRecord=pushInfoRecordMapper.selectByPrimaryKey(pushInfoRecordId);
+                pushInfoRecord.setRetryCount(pushInfoRecord.getRetryCount()+1);
+            }
+            pushInfoRecord.setPushContent(content);
+            pushInfoRecord.setInterfacePushType(pushType);
+            pushInfoRecord.setPushStatus("fail");
+            pushInfoRecord.setResult(result);
+            pushInfoRecord.setFailReason(failReason);
+            pushInfoRecord.setCreateTime(new Date());
+            if(pushInfoRecordId!=null){
+                pushInfoRecordMapper.updateByPrimaryKey(pushInfoRecord);
+            }else {
+                pushInfoRecordMapper.insert(pushInfoRecord);
+            }
+        } catch (NumberFormatException e) {
+            log.error("记录推送失败日志出错，"+e.getMessage());
         }
     }