From 83dcd7bc1231b088b36878822023b290fe81d8d8 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 27 五月 2024 17:25:20 +0800
Subject: [PATCH] 新增功能
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index 5d53ae6..ba5640b 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -13,8 +13,8 @@
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
-import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,17 +57,14 @@
@Autowired
private ITDriverService tDriverService;
- @Autowired
- private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
@Resource
private OrderCancelMapper orderCancelMapper;
- @Value("${pushMinistryOfTransport}")
- private boolean pushMinistryOfTransport;
-
@Value("${filePath}")
private String filePath;
+
+ @Autowired
+ private FleetEngineUtil fleetEngineUtil;
@@ -302,29 +299,27 @@
OrderCancel orderCancel = new OrderCancel();
orderCancel.setOrderId(tOrderPrivateCarId);
orderCancel.setOrderType(1);
- orderCancel.setReason("平台取消订单");
- orderCancel.setRemark("平台取消订单");
+ orderCancel.setReason("The platform cancels the order");
+ orderCancel.setRemark("The platform cancels the order");
orderCancel.setUserType(2);
orderCancel.setState(2);
orderCancel.setInsertTime(new Date());
orderCancelMapper.insert(orderCancel);
-
+
+ //修改行程信息
+ try {
+ fleetEngineUtil.updateTrip("CANCELED", null, null, 1, tOrderPrivateCar.getId(), null, null, null, null);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+
//增加推送
Map<String,String> map = new HashMap<>();
map.put("id", tOrderPrivateCar.getId().toString());
map.put("orderType", "1");
String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
System.out.println("专车取消:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){//上传数据
- pushMinistryOfTransportUtil.orderCancel(tOrderPrivateCarId);
- }
- }
- }).start();
-
return SUCCESS_TIP;
}
--
Gitblit v1.7.1