From 5dacdee9b54c78372b68140e2b068d03a620eab9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 19:00:52 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
index 8bb5fa4..7ce2dbc 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
@@ -60,6 +60,8 @@
@Resource
private MongoTemplate mongoTemplate;
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
/**
* 跳转到出租车订单首页
@@ -148,7 +150,7 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tOrderTaxiService.getTaxiOrderList(page, beginTime, endTime, ShiroExtUtil.getUser().getRoleType(), ShiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state));
+ page.setRecords(tOrderTaxiService.getTaxiOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state));
return super.packForBT(page);
}
@@ -167,7 +169,7 @@
}
private ResultUtil resultUtil;
-
+
/**
* 获取订单轨迹
*
@@ -176,7 +178,7 @@
*/
@ResponseBody
@RequestMapping(value = "/getOrderTrack", method = RequestMethod.POST)
- public ResultUtil getOrderTrack(String orderDetailId) {
+ public ResultUtil getOrderTrack(Integer orderDetailId) {
if (ToolUtil.isNotEmpty(orderDetailId)) {
try {
Query query = new Query()
@@ -274,6 +276,12 @@
@RequestMapping(value = "/add")
@ResponseBody
public Object add(TOrderTaxi tOrderTaxi) {
+ if (ToolUtil.isEmpty(tOrderTaxi.getStartLat()) || ToolUtil.isEmpty(tOrderTaxi.getStartLon())) {
+ return "请选择有效的上车地点";
+ }
+ if (ToolUtil.isEmpty(tOrderTaxi.getEndLat()) || ToolUtil.isEmpty(tOrderTaxi.getEndLon())) {
+ return "请选择有效的下车地点";
+ }
TUser user = userService.selectOne(new EntityWrapper<TUser>().eq("phone", tOrderTaxi.getPassengersPhone()));
if (ToolUtil.isNotEmpty(user)) {/// 用户是平台用户
tOrderTaxi.setOrderNum("TAXI" + String.valueOf(1000000 + tOrderTaxiService.selectList(null).size() + 1).substring(1));
@@ -307,7 +315,7 @@
tUser.setInsertTime(DateUtil.parseTime(DateUtil.getTime()));
tUser.setPhone(tOrderTaxi.getPassengersPhone());
tUser.setName(tOrderTaxi.getPassengers());
- tUser.setNickName("QYT" + String.valueOf(1000000 + userService.selectList(null).size() + 1).substring(1));
+ tUser.setNickName("GRJY" + String.valueOf(1000000 + userService.selectList(null).size() + 1).substring(1));
userService.insert(tUser);
/// 存入订单信息
--
Gitblit v1.7.1