Merge branch 'feature/push_record' into test

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);
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java

@@ -469,7 +469,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);
@@ -683,7 +683,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");
@@ -699,7 +699,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;
             }
         }
@@ -721,17 +721,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);
         }
     }
 

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);