From 7e7462d129b81ed8cba5d05e218ae71c38c5efe1 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期一, 15 六月 2026 17:32:48 +0800
Subject: [PATCH] 添加支付方式字段并优化订单处理逻辑
---
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 35 +++++------------------------------
1 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
index 5b4b29e..c745bf9 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -71,15 +71,6 @@
@Autowired
private ITDriverServiceService tDriverServiceService;
- @Autowired
- private ITOrderPrivateCarService orderPrivateCarService;
-
- @Autowired
- private ITOrderTaxiService orderTaxiService;
-
- @Autowired
- private ITOrderCrossCityService orderCrossCityService;
-
@Autowired
private ITCarService tCarService;
@@ -793,7 +784,7 @@
return null;
}
for (Integer cancelledType : cancelledTypes) {
- if (hasDriverUnfinishedOrder(driverIds, cancelledType)) {
+ if (hasDriverEnabledService(driverIds, cancelledType)) {
return "当前公司内存在司机正在使用" + getServiceName(cancelledType) + "业务，无法变动";
}
}
@@ -852,29 +843,13 @@
}
}
- private boolean hasDriverUnfinishedOrder(List<Integer> driverIds, Integer serviceType) {
+ private boolean hasDriverEnabledService(List<Integer> driverIds, Integer serviceType) {
if (driverIds == null || driverIds.isEmpty() || serviceType == null) {
return false;
}
- if (Integer.valueOf(1).equals(serviceType)) {
- return orderPrivateCarService.selectCount(new EntityWrapper<TOrderPrivateCar>()
- .eq("isDelete", 1)
- .in("driverId", driverIds)
- .notIn("state", 8, 9, 10, 12)) > 0;
- }
- if (Integer.valueOf(2).equals(serviceType)) {
- return orderTaxiService.selectCount(new EntityWrapper<TOrderTaxi>()
- .eq("isDelete", 1)
- .in("driverId", driverIds)
- .notIn("state", 8, 9, 10, 12)) > 0;
- }
- if (Integer.valueOf(3).equals(serviceType)) {
- return orderCrossCityService.selectCount(new EntityWrapper<TOrderCrossCity>()
- .eq("isDelete", 1)
- .in("driverId", driverIds)
- .notIn("state", 8, 9, 10, 12)) > 0;
- }
- return false;
+ return tDriverServiceService.selectCount(new EntityWrapper<TDriverService>()
+ .in("driverId", driverIds)
+ .eq("type", serviceType)) > 0;
}
private String getServiceName(Integer serviceType) {
--
Gitblit v1.7.1