From 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 16 五月 2025 10:27:41 +0800
Subject: [PATCH] 修改文档bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 3cfd671..6023a07 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
@@ -478,7 +478,7 @@
return orderService.confirmFees(language, orderId, orderType, type, travelFee, parkingFee, crossingFee, uid);
}catch (Exception e){
e.printStackTrace();
- return ResultUtil.runErr();
+ return ResultUtil.runErr(null, e.getMessage());
}
}
@@ -549,7 +549,7 @@
*/
@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);
//更新小号绑定关系
@@ -559,7 +559,7 @@
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();
@@ -711,7 +711,7 @@
return ResultUtil.success(MoneyInfoWarpper.getMoneyInfoWarpper(map));
}catch (Exception e){
e.printStackTrace();
- return ResultUtil.runErr();
+ return ResultUtil.runErr(null, e.getMessage());
}
}
@@ -995,7 +995,7 @@
try {
Thread.sleep(3000L);
} catch (InterruptedException e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
}else{
@@ -1017,7 +1017,7 @@
try {
Thread.sleep(3000L);
} catch (InterruptedException e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
}else{
@@ -1050,7 +1050,7 @@
try {
Thread.sleep(3000L);
} catch (InterruptedException e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
}else{
@@ -1072,7 +1072,7 @@
try {
Thread.sleep(3000L);
} catch (InterruptedException e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
}else{
--
Gitblit v1.7.1