From b5b8789d8f621e81fd085a020f5c58568eadae71 Mon Sep 17 00:00:00 2001
From: wangrangrang <wangrangrang7077@dingtalk.com>
Date: Fri, 28 Jul 2023 15:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=AE=B0=E5=BD=95id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/manager/service/PushInvoiceService.java  |  2 +-
 .../manager/service/impl/PushInvoiceServiceImpl.java | 12 ++++++------
 .../order/service/impl/InvoicePushServiceImpl.java   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/PushInvoiceService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/PushInvoiceService.java
index afcf99dd..98acdd3c 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/PushInvoiceService.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/PushInvoiceService.java
@@ -71,7 +71,7 @@ public interface PushInvoiceService {
 
     public R processPushFail(CommonTsMqData commonTsMqData, String pushUrl, String msg, List<String> shList);
 
-    public void sendImageSys(String content, String pushType, PushInfo pushInfo);
+    public void sendImageSys(String content, String pushType, PushInfo pushInfo, Long id);
 
     public void successPush(Long pushInfoRecordId,String content,String result,PushInfo pushInfo,String pushtype);
 
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 c87fb7c6..58d804c4 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
@@ -468,7 +468,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                 }
                 try {
                     //推送影像系统
-                    sendImageSys(content,fpTsMqData.getPushType(),pushInfo);
+                    sendImageSys(content,fpTsMqData.getPushType(),pushInfo, null);
                 } catch (Exception e) {
                     String error=String.format("影像推送出现异常%s,推送类型%s",e,fpTsMqData.getPushType());
                     log.error(error);
@@ -672,7 +672,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
         return r;
     }
 
-    public void sendImageSys(String content, String pushType, PushInfo pushInfo){
+    public void sendImageSys(String content, String pushType, PushInfo pushInfo, Long id){
         PushInfo pushInfo1 = new PushInfo();
         pushInfo1.setId(pushInfo.getId());
         pushInfo1.setByzd1("YXXT");
@@ -688,7 +688,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
             if(!b){
                 String error=String.format("invoiceNo：%s not eleInvoice do not push",outputInvoiceRequest.getInvoiceList().get(0).getInvoiceNumber());
                 log.info(error);
-                failPush(null,content,error,error,pushInfo1,pushType);
+                failPush(id,content,error,error,pushInfo1,pushType);
                 return;
             }
         }
@@ -710,17 +710,17 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
             String data = jsonObject.getString("data");
             if("200".equals(status)){
                 //成功
-                successPush(null,content,data,pushInfo,pushType);
+                successPush(id,content,data,pushInfo,pushType);
             }else {
                 //失败
-                failPush(null,content,message,data,pushInfo,pushType);
+                failPush(id,content,message,data,pushInfo,pushType);
             }
             //暂时不保存状态
         } catch (Exception e) {
             String error=String.format("影像系统推送数据异常，%s ,推送类型为%s",e.getMessage(),pushType);
             log.error(error);
             e.printStackTrace();
-            failPush(null,content,error,e.getMessage(),pushInfo1,pushType);
+            failPush(id,content,error,e.getMessage(),pushInfo1,pushType);
         }
     }
 
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoicePushServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoicePushServiceImpl.java
index e41e4768..936eccbc 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoicePushServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoicePushServiceImpl.java
@@ -98,7 +98,7 @@ public class InvoicePushServiceImpl implements InvoicePushService {
             String pushType = pushInfoRecord.getInterfacePushType();
             try {
                 //推送影像系统
-                pushInvoiceService.sendImageSys(pushInfoRecord.getPushContent(), pushType, pushInfo);
+                pushInvoiceService.sendImageSys(pushInfoRecord.getPushContent(), pushType, pushInfo,pushInfoRecord.getId());
                 return r;
             } catch (Exception e) {
                 String error = String.format("影像推送出现异常%s,推送类型%s", e.getMessage(), pushType);