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, Long id);
+    public R 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

@@ -683,7 +683,8 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
         return r;
     }
 
-    public void sendImageSys(String content, String pushType, PushInfo pushInfo, Long id){
+    public R sendImageSys(String content, String pushType, PushInfo pushInfo, Long id){
+        R r = new R();
         PushInfo pushInfo1 = new PushInfo();
         pushInfo1.setId(pushInfo.getId());
         pushInfo1.setByzd1("YXXT");
@@ -700,7 +701,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                 String error=String.format("invoiceNo：%s not eleInvoice do not push",outputInvoiceRequest.getInvoiceList().get(0).getInvoiceNumber());
                 log.info(error);
                 failPush(id,content,error,error,pushInfo1,pushType);
-                return;
+                r.put(OrderManagementConstant.CODE, "9999");
+                r.put(OrderManagementConstant.ALL_MESSAGE, error);
+                return r;
             }
         }
 
@@ -732,7 +735,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
             log.error(error);
             e.printStackTrace();
             failPush(id,content,error,e.getMessage(),pushInfo1,pushType);
+            r.put(OrderManagementConstant.CODE, "9999");
+            r.put(OrderManagementConstant.ALL_MESSAGE, error);
+            return r;
         }
+        return r;
     }
 
 

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,pushInfoRecord.getId());
+                r=pushInvoiceService.sendImageSys(pushInfoRecord.getPushContent(), pushType, pushInfo,pushInfoRecord.getId());
                 return r;
             } catch (Exception e) {
                 String error = String.format("影像推送出现异常%s,推送类型%s", e.getMessage(), pushType);