From 7b50ac09257d466ab5969262440cf13926b8c070 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 20 八月 2025 19:25:17 +0800
Subject: [PATCH] 修改bug
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 91be020..9d06f60 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -144,23 +144,27 @@
*/
@Override
public ResultUtil grabOrder(Integer orderId, Integer uid) throws Exception {
- OrderPrivateCar orderPrivateCar1 = orderPrivateCarService.selectById(orderId);
- if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && orderPrivateCar1.getState() != 1&& orderPrivateCar1.getState() != 11){
- return ResultUtil.error("订单已被抢了");
- }
- OrderTaxi orderTaxi = null;
- if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && (orderPrivateCar1.getState() == 1|| orderPrivateCar1.getState() == 11)){
- orderPrivateCarService.deleteById(orderId);
- OrderTaxi orderTaxi1 = setOrderTaxi(orderPrivateCar1);
- this.insert(orderTaxi1);
- orderTaxi = orderTaxi1;
+ OrderTaxi orderTaxi = this.selectById(orderId);
+ if(null != orderTaxi && orderTaxi.getType() == 2){
+ if(orderTaxi.getState() != 1){
+ return ResultUtil.error("订单已被抢了");
+ }
}else{
- orderTaxi = this.selectById(orderId);
+ OrderPrivateCar orderPrivateCar1 = orderPrivateCarService.selectById(orderId);
+ if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && orderPrivateCar1.getState() != 1&& orderPrivateCar1.getState() != 11){
+ return ResultUtil.error("订单已被抢了");
+ }
+ orderTaxi = null;
+ if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && (orderPrivateCar1.getState() == 1|| orderPrivateCar1.getState() == 11)){
+ orderPrivateCarService.deleteById(orderId);
+ OrderTaxi orderTaxi1 = setOrderTaxi(orderPrivateCar1);
+ this.insert(orderTaxi1);
+ orderTaxi = orderTaxi1;
+ }
}
if(null == orderTaxi){
return ResultUtil.error("订单已被抢了");
}
-
//处理摆渡车的情况
if(orderTaxi.getType() == 2){
--
Gitblit v1.7.1