From 753c4aede53b07041841d9aa94859b59e366bd5d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 18:47:39 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 14 +-------------
1 files changed, 1 insertions(+), 13 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 3bb9e92..b49da12 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
@@ -170,7 +170,7 @@
int i = 0;
Double scope = 5D;
while (true){
- List<NearbyDriverWarpper> nearbyDriverWarppers = driverService.queryDriverPosition(estimatedCosts.getLng().toString(), estimatedCosts.getLat().toString(), scope);
+ List<NearbyDriverWarpper> nearbyDriverWarppers = driverService.queryDriverPosition(estimatedCosts.getStartLng().toString(), estimatedCosts.getStartLat().toString(), scope);
if(nearbyDriverWarppers.size() == 0){
scope += 5;
i++;
@@ -419,18 +419,6 @@
if(null != order){
return ResultUtil.error("您还有正在进行的订单");
}
-
- String value = redisUtil.getValue("USER" + uid);
- if(ToolUtil.isEmpty(value)){
- redisUtil.setStrValue("USER" + uid, System.currentTimeMillis() + "", 60);
- }else{
- Long s = System.currentTimeMillis() - Long.valueOf(value);
- if(s.compareTo(60000L) < 0){//1分钟
- return ResultUtil.error("数据处理中");
- }
- redisUtil.setStrValue("USER" + uid, System.currentTimeMillis() + "", 60);
- }
-
String startAddress = travelOrder.getStartAddress();
startAddress = startAddress.replaceAll("& #40;", "(");
--
Gitblit v1.7.1