From dda9ffb76b585bb5bcf5282def424999448fa915 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 28 七月 2025 17:57:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index 49c8fb3..72db972 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -27,8 +27,6 @@
import com.stylefeng.guns.modular.system.warpper.OrderListWarpper;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
-import org.redisson.api.RLock;
-import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
@@ -97,8 +95,8 @@
@Autowired
private IAdditionalFeeService additionalFeeService;
- @Autowired
- private RedissonClient redissonClient;
+// @Autowired
+// private RedissonClient redissonClient;
@Autowired
private IOpenCityService openCityService;
@@ -511,10 +509,10 @@
public ResultUtil grabOrder(Integer orderId, Integer orderType, Integer uid) throws Exception {
//专车和出租是批量下单，所以这里需要将两种类型的抢单操作通过一个锁来一起控制
if(1 == orderType || 2 == orderType){
- RLock lock = redissonClient.getLock("grabOrder:" + orderId);
- if(!lock.tryLock()){
- return ResultUtil.error("抢单失败，请稍后重试");
- }
+// RLock lock = redissonClient.getLock("grabOrder:" + orderId);
+// if(!lock.tryLock()){
+// return ResultUtil.error("抢单失败，请稍后重试");
+// }
try {
if(1 == orderType){
return orderPrivateCarService.grabOrder(orderId, uid);
@@ -525,7 +523,7 @@
}catch (Exception e){
e.printStackTrace();
}finally {
- lock.unlock();
+// lock.unlock();
}
}
switch (orderType){
--
Gitblit v1.7.1