From 31ce6be2d56798d9509e6d90335999064351f7f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 10 十二月 2024 16:06:26 +0800
Subject: [PATCH] 12.10
---
DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index da143a0..dd65c64 100644
--- a/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -2,10 +2,7 @@
import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.modular.system.model.OrderCrossCity;
-import com.stylefeng.guns.modular.system.model.OrderPosition;
-import com.stylefeng.guns.modular.system.model.OrderPrivateCar;
-import com.stylefeng.guns.modular.system.model.Reassign;
+import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
//import com.stylefeng.guns.modular.system.util.ICBCPayUtil;
import com.stylefeng.guns.modular.system.util.PayMoneyUtil;
@@ -60,8 +57,8 @@
// @Autowired
// private ICBCPayUtil icbcPayUtil;
-
-
+ @Autowired
+ private IOrderTransferService orderTransferService;
/**
* 获取订单列表
* @param type
@@ -100,6 +97,11 @@
if(type == 2){//跨城
list = orderCrossCityService.queryOrderList(search, orderSource, state, lineId, pageNum, size, uid);
}
+
+ if(type ==7){//接送机
+ list = orderTransferService.queryOrderList(search, orderSource, state, pageNum, size, uid);
+ }
+
return ResultUtil.success(OrderListWarpper.getOrderListWarppers(list));
}catch (Exception e){
e.printStackTrace();
@@ -131,6 +133,9 @@
if(orderType == 2){//跨城
map = orderCrossCityService.queryOrderInfo(orderId);
}
+ if(orderType == 7){//专车
+ map = orderTransferService.queryOrderInfo(orderId);
+ }
return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
}catch (Exception e){
e.printStackTrace();
@@ -160,6 +165,9 @@
}
if(orderType == 2){//跨城
return orderCrossCityService.cancelOrder(orderId);
+ }
+ if(orderType == 7){//接送机
+ return orderTransferService.cancelOrder(orderId);
}
return ResultUtil.success();
}catch (Exception e){
@@ -294,6 +302,12 @@
orderPrivateCar.setOldState(null);
orderPrivateCarService.updateAllColumnById(orderPrivateCar);
}
+ if(reassign.getOrderType() == 7){//专车
+ OrderTransferCar orderPrivateCar = orderTransferService.selectById(reassign.getOrderId());
+ orderPrivateCar.setState(orderPrivateCar.getOldState());
+ orderPrivateCar.setOldState(null);
+ orderTransferService.updateAllColumnById(orderPrivateCar);
+ }
if(reassign.getOrderType() == 3){//跨城
OrderCrossCity orderCrossCity = orderCrossCityService.selectById(reassign.getOrderId());
orderCrossCity.setState(orderCrossCity.getOldState());
--
Gitblit v1.7.1