From ed60e03c0458d97b6852dcb84b8ccafba70d2137 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 22 八月 2025 16:20:05 +0800
Subject: [PATCH] 提交代码
---
user/guns-admin/src/main/java/com/supersavedriving/user/config/QYTConfig.java | 30 ++++++++++++++++++++++++++++++
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 7 -------
2 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/config/QYTConfig.java b/user/guns-admin/src/main/java/com/supersavedriving/user/config/QYTConfig.java
new file mode 100644
index 0000000..77703a9
--- /dev/null
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/config/QYTConfig.java
@@ -0,0 +1,30 @@
+package com.supersavedriving.user.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+
+/**
+ * @author zhibing.pu
+ * @Date 2025/8/12 13:58
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "qyt")
+public class QYTConfig {
+ /**
+ * 出行网关接口地址
+ */
+ private String chuxingUrl;
+ /**
+ * 长连接地址
+ */
+ private String socketUri;
+ /**
+ * 管理后台url
+ */
+ private String adminUrl;
+
+
+}
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 d658f5c..132dce8 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
@@ -435,11 +435,6 @@
*/
@Override
public ResultUtil travelOrder(Integer uid, TravelOrder travelOrder) throws Exception {
- RLock lock1 = redissonClient.getLock("travelOrder:" + uid);
- boolean lock2 = lock1.tryLock(5, 10, TimeUnit.SECONDS);
- if(!lock2){
- return ResultUtil.error("系统繁忙，请稍后重试");
- }
try {
List<Integer> state = Arrays.asList(101, 102, 103, 104, 105, 106, 107, 201, 401);
Order order = this.selectOne(new EntityWrapper<Order>().eq("userId", uid).eq("status", 1).in("state", state));
@@ -558,8 +553,6 @@
return ResultUtil.success(order.getId());
}catch (Exception e){
e.printStackTrace();
- }finally {
- lock1.unlock();
}
return ResultUtil.error("系统异常");
}
--
Gitblit v1.7.1