From ba6b508a44cb1f0730c6a27a5d73b8d2ae8f1d4b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 19 八月 2025 18:43:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 34 +++++++---------------------------
1 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
index b7090e1..ff0fc60 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -15,10 +15,8 @@
import com.supersavedriving.user.modular.system.util.MallBook.model.*;
import com.supersavedriving.user.modular.system.util.MallBook.util.Transfer;
import com.supersavedriving.user.modular.system.util.MallBook.util.TrhRequest;
-import com.supersavedriving.user.modular.system.util.juhe.WeatherUtil;
import com.supersavedriving.user.modular.system.util.mongodb.model.Location;
import com.supersavedriving.user.modular.system.warpper.*;
-import io.swagger.models.auth.In;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.slf4j.Logger;
@@ -37,9 +35,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.math.MathContext;
import java.math.RoundingMode;
-import java.net.InetAddress;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
@@ -440,7 +436,7 @@
@Override
public ResultUtil travelOrder(Integer uid, TravelOrder travelOrder) throws Exception {
RLock lock1 = redissonClient.getLock("travelOrder:" + uid);
- boolean lock2 = lock1.tryLock(5, TimeUnit.SECONDS);
+ boolean lock2 = lock1.tryLock(5, 10, TimeUnit.SECONDS);
if(!lock2){
return ResultUtil.error("系统繁忙，请稍后重试");
}
@@ -544,10 +540,7 @@
pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
}else{
//推单
- Order finalOrder = order;
- new Thread(()->{
- pushOrder(finalOrder.getId());
- }).start();
+ pushOrder(order.getId());
}
}
}
@@ -568,6 +561,7 @@
* 订单推送逻辑
*/
public void pushOrder(Long orderId){
+ RLock lock1 = redissonClient.getLock("pushOrder:" + orderId);
try {
Order order = this.selectById(orderId);
/**
@@ -577,28 +571,14 @@
* 合适司：积分 > 评分 > 距离
* 3.司机没有接单直接将订单置入大厅
*/
- boolean lock = redisUtil.lock(5);
- if(!lock){
- int num1 = 1;
- while (num1 <= 10){
- Thread.sleep(3000);//等待3秒
- lock = redisUtil.lock(5);
- if(lock){
- break;
- }else{
- num1++;
- }
- }
- }
- if(!lock){
+ boolean lock2 = lock1.tryLock(5, 10, TimeUnit.SECONDS);
+ if(!lock2){
order.setHallOrder(1);
this.updateById(order);
ExtraPushOrder(order);
- redisUtil.unlock();
}
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
if(null == systemConfig){
- redisUtil.unlock();
return;
}
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
@@ -786,10 +766,10 @@
ExtraPushOrder(order);
redisUtil.setStrValue("lobbyOrder", "true");
}
- redisUtil.unlock();
}catch (Exception e){
e.printStackTrace();
- redisUtil.unlock();
+ }finally {
+ lock1.unlock();
}
}
--
Gitblit v1.7.1