From 6cc28b0853183a0ede9f1e3addd7603095d98133 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 19 七月 2023 15:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java | 9 ++++-----
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java | 4 ----
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 12 ++++++++++++
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
index 18c2ef5..86f53e9 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.supersavedriving.driver.modular.system.model.DivisionRecord;
-import com.supersavedriving.driver.modular.system.model.Driver;
import com.supersavedriving.driver.modular.system.model.Order;
import com.supersavedriving.driver.modular.system.model.RechargeRecord;
import com.supersavedriving.driver.modular.system.service.IDivisionRecordService;
@@ -56,9 +55,6 @@
@Autowired
private IDriverService driverService;
-
- @Autowired
- private RongYunUtil rongYunUtil;
@Autowired
private IRechargeRecordService rechargeRecordService;
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
index 9efdd92..9d5d489 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
@@ -1410,15 +1410,14 @@
new Timer().schedule(new TimerTask() {
@Override
public void run() {
- Order order1 = OrderServiceImpl.this.selectById(orderId);
- if(order1.getState() == 107){
- completeCollection_(order1);
+ try {
+ OrderServiceImpl.this.setOrderStatus(uid, orderId, payType, 108);
+ }catch (Exception e){
+ e.printStackTrace();
}
}
}, 60000);
}
-
-
return ResultUtil.success();
}
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 3b9edf8..2fa486c 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
@@ -420,6 +420,18 @@
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;", "(");
startAddress = startAddress.replaceAll("& #41;", ")");
--
Gitblit v1.7.1