解决冲突

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 R sendImageSys(String content, String pushType, PushInfo pushInfo, Long id);
+    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/order/service/impl/InvoicePushServiceImpl.java

@@ -98,7 +98,8 @@ public class InvoicePushServiceImpl implements InvoicePushService {
             String pushType = pushInfoRecord.getInterfacePushType();
             try {
                 //推送影像系统
-                r=pushInvoiceService.sendImageSys(pushInfoRecord.getPushContent(), pushType, pushInfo,pushInfoRecord.getId());
+                pushInvoiceService.sendImageSys(pushInfoRecord.getPushContent(), pushType, pushInfo,pushInfoRecord.getId());
+                r.put(OrderManagementConstant.CODE, "0000");
                 return r;
             } catch (Exception e) {
                 String error = String.format("影像推送出现异常%s,推送类型%s", e.getMessage(), pushType);