From 8911724ef0dad89ca1d5705dd4fb7ee0ca860f2a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 八月 2023 15:36:53 +0800
Subject: [PATCH] 合并代码
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
index 78592c1..29c57b5 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
@@ -12,6 +12,7 @@
import com.supersavedriving.driver.modular.system.util.MallBook.model.ReceiveUser;
import com.supersavedriving.driver.modular.system.util.MallBook.util.RSASignature;
import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
+import com.supersavedriving.driver.modular.system.util.PushUtil;
import com.supersavedriving.driver.modular.system.util.rongyun.RongYunUtil;
import com.supersavedriving.driver.modular.system.util.rongyun.model.CloudRecordingCallback;
import com.supersavedriving.driver.modular.system.warpper.*;
@@ -62,6 +63,9 @@
@Autowired
private IDivisionRecordService divisionRecordService;
+
+ @Autowired
+ private PushUtil pushUtil;
@@ -644,4 +648,17 @@
e.printStackTrace();
}
}
+
+
+ /**
+ * 管理后台调用推送
+ * @param id
+ * @param type
+ * @param pushOrderInfoWarpper
+ */
+ @ResponseBody
+ @PostMapping("/base/order/pushOrderInfo")
+ public void pushOrderInfo(Integer id, Integer type, PushOrderInfoWarpper pushOrderInfoWarpper){
+ pushUtil.pushOrderInfo(id, type, pushOrderInfoWarpper);
+ }
}
--
Gitblit v1.7.1