From 821fc2f632f8b974a2c0fc37630e13c5fbe6086c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 26 九月 2025 17:26:16 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
index 6e03051..f4d3d87 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -371,6 +371,7 @@
Map<String,String> map = new HashMap<>();
map.put("id", tOrderPrivateCar.getId().toString());
map.put("orderType", "1");
+ map.put("from", "admin");
String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
System.out.println("专车取消:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
}
@@ -459,6 +460,7 @@
Map<String,String> map = new HashMap<>();
map.put("id", orderCrossCity.getId().toString());
map.put("orderType", "3");
+ map.put("from", "admin");
String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
System.out.println("跨城出行取消:【orderId="+orderCrossCity.getId().toString()+"】,调用接口:"+result);
@@ -594,6 +596,7 @@
Map<String,String> map = new HashMap<>();
map.put("id", tOrderLogistics.getId().toString());
map.put("orderType", tOrderLogistics.getType().toString());
+ map.put("from", "admin");
String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
System.out.println("小件物流取消:【orderId="+tOrderLogistics.getId().toString()+"】,调用接口:"+result);
}
@@ -667,7 +670,7 @@
public void run() {
try {
// 使用Runtime执行命令
- Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
+ Process process = Runtime.getRuntime().exec("sudo rm -rf /data/nginx/html/files/audio/" + fileName);
// 读取命令的输出
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
String line;
@@ -686,8 +689,7 @@
orderPrivateCar.setDriverId(driver1.getId());
orderPrivateCar.setCarId(driver1.getCarId());
- orderPrivateCar.setCompanyId(driver1.getFranchiseeId() != null && driver1.getFranchiseeId() != 0 ? driver1.getFranchiseeId() : (
- driver1.getCompanyId() != null && driver1.getCompanyId() != 0 ? driver1.getCompanyId() : 1));
+ orderPrivateCar.setCompanyId(driver1.getCompanyId());
orderPrivateCar.setSnatchOrderTime(new Date());
orderPrivateCar.setState(orderPrivateCar.getOldState());
orderPrivateCar.setOldState(null);
@@ -1033,6 +1035,7 @@
Map<String,String> map = new HashMap<>();
map.put("orderId", tOrderCrossCity.getId().toString());
map.put("orderType", "3");
+ map.put("from", "admin");
String result = HttpRequestUtil.postRequest(PushURL.order_push_url, map);
System.out.println("跨城出行改派:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result);
return SUCCESS_TIP;
@@ -1092,7 +1095,7 @@
public void run() {
try {
// 使用Runtime执行命令
- Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + finalFileName);
+ Process process = Runtime.getRuntime().exec("sudo rm -rf /data/nginx/html/files/audio/" + finalFileName);
// 读取命令的输出
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
String line;
@@ -1112,8 +1115,7 @@
orderLogistics.setDriverId(driver1.getId());
orderLogistics.setCarId(driver1.getCarId());
- orderLogistics.setCompanyId(driver1.getFranchiseeId() != null && driver1.getFranchiseeId() != 0 ? driver1.getFranchiseeId() : (
- driver1.getCompanyId() != null && driver1.getCompanyId() != 0 ? driver1.getCompanyId() : 1));
+ orderLogistics.setCompanyId(driver1.getCompanyId());
orderLogistics.setState(orderLogistics.getOldState());
orderLogistics.setOldState(null);
orderLogistics.setSnatchOrderTime(new Date());
--
Gitblit v1.7.1