From accbb6091a09327389f2d9363921213951eefdb6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 05 八月 2025 20:48:21 +0800
Subject: [PATCH] 提交新版本
---
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 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 5d53ae6..fce77c8 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,9 +79,22 @@
@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";
+ }
+
+
+ /**
+ * 跳转到专车订单首页
+ */
+ @RequestMapping("/abnormalOrder")
+ public String abnormalOrder(Model model) {
+ //服务专车车型
+ List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+ model.addAttribute("carmodelList",carmodelList);
+ return PREFIX + "tAbnormalOrder.html";
}
/**
@@ -99,8 +113,9 @@
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";
}
+
/**
* 跳转到出租车订单轨迹页面
*/
@@ -135,6 +150,35 @@
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
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);
+ }
+
+
+ /**
+ * 获取专车订单列表
+ */
+ @RequestMapping(value = "/abnormalList")
+ @ResponseBody
+ public Object abnormalList(String insertTime,
+ String orderNum,
+ Integer orderSource,
+ String userName,
+ String userPhone,
+ String passengers,
+ String passengersPhone,
+ Integer serverCarModelId,
+ String driver,
+ Integer state,
+ Integer smsNumber) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tOrderPrivateCarService.getAbnormalOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,serverCarModelId,driver,state,smsNumber));
return super.packForBT(page);
}
@@ -203,7 +247,6 @@
return SUCCESS_TIP;
}
-
@RequestMapping(value = "/frozenOrder")
@ResponseBody
public Object frozenOrder(@RequestParam Integer tOrderPrivateCarId) {
@@ -255,7 +298,7 @@
if(orderPrivateCar.getIsplatPay()==2){
return "error";
}
- //添加已收入明细
+ //添加已收入明细
TCompany company = companyService.selectById(orderPrivateCar.getCompanyId());
Double taxi = company.getSpeMoney().doubleValue();
BigDecimal d = null;//企业收入
@@ -277,6 +320,7 @@
driver.setBalance((null != driver.getBalance() ? driver.getBalance() : BigDecimal.ZERO).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN));
driverService.updateById(driver);
orderPrivateCar.setIsplatPay(2);
+ orderPrivateCar.setState(8);
tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1