From af335bf1ef9104dc62c721e142eca790356d18b6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 四月 2025 09:42:25 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
index 2f022f8..d943f34 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
@@ -7,6 +7,7 @@
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.ITCarService;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.service.ITUserService;
import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil;
@@ -23,6 +24,7 @@
import com.stylefeng.guns.modular.system.service.ITOrderLogisticsService;
import javax.annotation.Resource;
+import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -50,6 +52,12 @@
@Resource
private OrderCancelMapper orderCancelMapper;
+
+ @Resource
+ private ITCarService carService;
+
+
+
/**
* 跳转到小件物流订单首页
@@ -115,7 +123,9 @@
@ResponseBody
public Object cancel(@RequestParam Integer tOrderLogisticsId) {
TOrderLogistics tOrderLogistics = tOrderLogisticsService.selectById(tOrderLogisticsId);
-
+ if(Arrays.asList(6, 7, 8, 9, 10).contains(tOrderLogistics.getState())){
+ return ERROR;
+ }
//修改之前司机状态 -- 空闲
if(null != tOrderLogistics.getDriverId()){
TDriver driver = itDriverService.selectById(tOrderLogistics.getDriverId());
@@ -139,19 +149,26 @@
orderCancelMapper.insert(orderCancel);
//修改行程信息
- boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", null, null, tOrderLogistics.getTripId(), null, null, null, null);
+ TCar car = carService.selectById(tOrderLogistics.getCarId());
+ //修改行程信息
+ boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tOrderLogistics.getTripId(), null, null, null, null);
if(!updateTrip){
for (int i = 0; i < 5; i++) {
- updateTrip = fleetEngineUtil.updateTrip("CANCELED", null, null, tOrderLogistics.getTripId(), null, null, null, null);
+ updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tOrderLogistics.getTripId(), null, null, null, null);
if(updateTrip){
+ tOrderLogistics.setIsover(1);
+ tOrderLogisticsService.updateById(tOrderLogistics);
break;
}
try {
Thread.sleep(3000L);
- }catch (Exception e){
- e.printStackTrace();
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
}
}
+ }else{
+ tOrderLogistics.setIsover(1);
+ tOrderLogisticsService.updateById(tOrderLogistics);
}
--
Gitblit v1.7.1