From 2e9c61a7e8f1e56e43a42175fa3e36ca07b9f600 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 14 一月 2025 11:29:19 +0800
Subject: [PATCH] 司机确认费用
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 3929711..5ea2ed5 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -5,10 +5,7 @@
import com.stylefeng.guns.modular.system.dao.DriverWorkMapper;
import com.stylefeng.guns.modular.system.dao.TUseMoneyMapper;
import com.stylefeng.guns.modular.system.model.*;
-import com.stylefeng.guns.modular.system.service.IDriverService;
-import com.stylefeng.guns.modular.system.service.IOrderCancelService;
-import com.stylefeng.guns.modular.system.service.IOrderService;
-import com.stylefeng.guns.modular.system.service.IReassignService;
+import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ChinaMobileUtil;
import com.stylefeng.guns.modular.system.util.PushUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
@@ -45,6 +42,8 @@
@Autowired
private IDriverService driverService;
+ @Autowired
+ private ICompanyService companyService;
@Autowired
private IReassignService reassignService;
@@ -224,8 +223,6 @@
}
- @Autowired
- private TUseMoneyMapper useMoneyMapper;
@Resource
private DriverWorkMapper driverWorkMapper;
@Autowired
@@ -302,9 +299,9 @@
}
// 抢单的时候 判断司机当前余额是否足够支付一笔软件使用费
Driver driver = driverService.selectById(uid);
- List<TUseMoney> tUseMoney = useMoneyMapper.selectList(null);
-
- if (tUseMoney.get(0).getMoney() > driver.getBalance()) {
+// List<TUseMoney> tUseMoney = useMoneyMapper.selectList(null);
+ Company company = companyService.selectById(driver.getCompanyId());
+ if (company.getDriverRestriction() > driver.getBalance()) {
// 将这个司机下线
driver.setState(1);
driverService.updateById(driver);
--
Gitblit v1.7.1