From 572e818c0a74fc0faf4a10928ab1c2cb4b6bd266 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 19 七月 2023 15:01:33 +0800
Subject: [PATCH] 修改重复完成订单bug修改
---
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 ----
2 files changed, 4 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();
}
--
Gitblit v1.7.1