From 6408a348e14193b0f625673d4e4b22b9fbd1e369 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 08 八月 2025 18:10:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index 3da9322..4c185fd 100644
--- a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -10,6 +10,7 @@
import com.stylefeng.guns.core.util.ExcelExportUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.controller.util.PushUtil;
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
@@ -78,10 +79,12 @@
@RequestMapping("")
public String index(Model model) {
//服务专车车型
- List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+ List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1)
+ );
model.addAttribute("carmodelList",carmodelList);
return PREFIX + "tOrderPrivateCar.html";
}
+
/**
* 跳转到专车订单首页
@@ -106,12 +109,22 @@
/**
* 跳转到修改专车订单
*/
+ @RequestMapping("/tOrderPrivateCar_orderDetailByOrderNumber/{orderNumber}")
+ public String tOrderPrivateCarUpdate(@PathVariable String orderNumber, Model model) {
+ Map<String, Object> item = tOrderPrivateCarService.getPrivateCarOrderDetailByOrderNumber(orderNumber);
+ model.addAttribute("item",item);
+ return PREFIX + "tOrderPrivateCar_orderDetail.html";
+ }
+ /**
+ * 跳转到修改专车订单
+ */
@RequestMapping("/toChangeMoney/{tOrderPrivateCarId}")
public String toChangeMoney(@PathVariable Integer tOrderPrivateCarId, Model model) {
Map<String, Object> item = tOrderPrivateCarService.getPrivateCarOrderDetailById(tOrderPrivateCarId);
model.addAttribute("item",item);
- return PREFIX + "toChangeMoney.html";
+ return PREFIX + "toChangeMoney.html.html";
}
+
/**
* 跳转到出租车订单轨迹页面
*/
@@ -148,6 +161,7 @@
page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,serverCarModelId,driver,state,smsNumber));
return super.packForBT(page);
}
+
/**
* 获取专车订单列表
@@ -241,7 +255,6 @@
orderPrivateCar.updateById();
return SUCCESS_TIP;
}
-
@RequestMapping(value = "/frozenOrder")
@ResponseBody
--
Gitblit v1.7.1