From b1f2f102034b4433201225b67a9fc78c08e532f0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 06 六月 2025 18:35:03 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 80ef095..e5be16e 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -549,17 +549,17 @@
*/
@ResponseBody
@PostMapping("/base/order/pushOrderState")
- public String pushOrderState(Integer language, Integer orderId, Integer orderType){
+ public String pushOrderState(Integer language, Integer orderId, Integer orderType, String from){
try {
Map<String, Object> map = orderService.queryOrderInfo(language, orderId, orderType);
//更新小号绑定关系
- orderService.RebindMidAxbBindSend(orderId, orderType);
+// orderService.RebindMidAxbBindSend(orderId, orderType);
pushUtil.pushOrderReassign(Integer.valueOf(String.valueOf(map.get("driverId"))), 2,Integer.valueOf(String.valueOf(map.get("orderId"))), orderType, "");
pushUtil.pushOrderReassign(Integer.valueOf(String.valueOf(map.get("userId"))), 1,Integer.valueOf(String.valueOf(map.get("orderId"))), orderType, "");
pushUtil.pushOrderState(1, Integer.valueOf(String.valueOf(map.get("userId"))), Integer.valueOf(String.valueOf(map.get("orderId"))), orderType,
- Integer.valueOf(String.valueOf(map.get("orderState"))), 0, "");
+ Integer.valueOf(String.valueOf(map.get("orderState"))), 0, "", from);
return JSON.toJSONString(ResultUtil.success());
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1