From fe2489749de15476eb1ad736577b7eaf69176b5f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 04 八月 2025 18:39:39 +0800
Subject: [PATCH] update
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 56 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 10b334c..57f5b56 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -64,6 +64,10 @@
@Autowired
private IOpenCityService openCityService;
+ @Autowired
+ private ICarService carService;
+
+
@@ -257,6 +261,18 @@
if(null == driverWork1){
return ResultUtil.error("您已下班，无法接单");
}
+
+ Driver driver = driverService.selectById(uid);
+
+ //判断车辆是否正在使用中
+ Car car = carService.selectById(driver.getCarId());
+ if(car.getUseDriverId() != null && !car.getUseDriverId().equals(uid)){
+ return ResultUtil.error("当前绑定车辆正在使用中，请更换车辆");
+ }else if(car.getUseDriverId()==null){
+ car.setUseDriverId(uid);
+ carService.updateById(car);
+ }
+
return orderService.grabOrder(orderId, orderType, uid);
}catch (Exception e){
e.printStackTrace();
@@ -315,6 +331,9 @@
return ResultUtil.runErr();
}
}
+
+
+
@ResponseBody
@PostMapping("/api/order/queryOrderInfo1")
@@ -538,6 +557,10 @@
return ResultUtil.runErr();
}
}
+
+
+
+
@ResponseBody
@PostMapping("/api/order/cancleOrder")
@@ -555,6 +578,9 @@
return ResultUtil.runErr();
}
}
+
+
+
@ResponseBody
@PostMapping("/api/order/updatePeopleNum")
@ApiOperation(value = "修改人数", tags = {"司机端-服务中"}, notes = "")
@@ -572,6 +598,8 @@
return ResultUtil.runErr();
}
}
+
+
@ResponseBody
@PostMapping("/api/order/confirmFees1")
@@ -707,30 +735,7 @@
}
- @ResponseBody
- @PostMapping("/base/order/test")
- public String test(String phoneA, String phoneB){
- try {
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(phoneA, phoneB, (System.currentTimeMillis() + 86400000));
- System.err.println(JSON.toJSONString(map));
- }catch (Exception e){
- e.printStackTrace();
- return "";
- }
- return null;
- }
- @ResponseBody
- @PostMapping("/base/order/test_")
- public String test(String bindId){
- try {
- Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(bindId, null, null);
- }catch (Exception e){
- e.printStackTrace();
- return "";
- }
- return null;
- }
/**
@@ -763,6 +768,9 @@
}
+
+
+
@ResponseBody
@PostMapping("/api/order/queryVoiceBroadcast")
@ApiOperation(value = "接单后获取语音播报内容", tags = {"司机端-首页"}, notes = "")
@@ -809,6 +817,8 @@
}
}
+
+
@ResponseBody
--
Gitblit v1.7.1