From a5c2c7e633e0dba4b80c8a15fd34c38ae097befc Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 21 六月 2024 10:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 78a056d..58bce26 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
@@ -8,6 +8,7 @@
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.model.TOrderPrivateCar;
import com.stylefeng.guns.modular.system.service.ITDriverService;
+import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import org.springframework.stereotype.Controller;
@@ -38,6 +39,9 @@
@Autowired
private ITOrderLogisticsService tOrderLogisticsService;
+
+ @Autowired
+ private FleetEngineUtil fleetEngineUtil;
/**
* 跳转到小件物流订单首页
@@ -105,13 +109,23 @@
TOrderLogistics tOrderLogistics = tOrderLogisticsService.selectById(tOrderLogisticsId);
//修改之前司机状态 -- 空闲
- TDriver driver = itDriverService.selectById(tOrderLogistics.getDriverId());
- driver.setState(2);
- itDriverService.updateById(driver);
+ if(null != tOrderLogistics.getDriverId()){
+ TDriver driver = itDriverService.selectById(tOrderLogistics.getDriverId());
+ driver.setState(2);
+ itDriverService.updateById(driver);
+ }
tOrderLogistics.setState(10);
tOrderLogisticsService.updateById(tOrderLogistics);
+ //修改行程信息
+ try {
+ fleetEngineUtil.updateTrip("CANCELED", null, null, tOrderLogistics.getTripId(), null, null, null, null);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+
//增加推送
Map<String,String> map = new HashMap<>();
map.put("id", tOrderLogistics.getId().toString());
--
Gitblit v1.7.1