From 6771fff413935485b5dce61769f133a44533d15c Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期六, 30 五月 2026 14:35:14 +0800
Subject: [PATCH] fix
---
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 15ade09..28bd3d6 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -796,10 +796,25 @@
*/
@Override
public List<BaseWarpper> queryMyBusiness(Integer uid) throws Exception {
+ Driver driver = this.selectById(uid);
+ if (driver == null) {
+ return new ArrayList<>();
+ }
+ Company company = null;
+ if (driver.getFranchiseeId() != null && driver.getFranchiseeId() > 0) {
+ company = companyMapper.selectById(driver.getFranchiseeId());
+ }
+ if (company == null && driver.getCompanyId() != null && driver.getCompanyId() > 0) {
+ company = companyMapper.selectById(driver.getCompanyId());
+ }
+
List<DriverService> list = driverServiceMapper.queryMyBusiness(uid);
List<BaseWarpper> maps = new ArrayList<>();
for (DriverService d : list){
if(d.getType() == 6){
+ continue;
+ }
+ if (!isBusinessOpen(company, d.getType())) {
continue;
}
BaseWarpper baseWarpper = new BaseWarpper();
@@ -829,6 +844,28 @@
return maps;
}
+ private boolean isBusinessOpen(Company company, Integer type) {
+ if (company == null || type == null) {
+ return true;
+ }
+ switch (type) {
+ case 1:
+ return company.getIsSpe() != null && company.getIsSpe() == 1;
+ case 2:
+ return company.getIsTaxi() != null && company.getIsTaxi() == 1;
+ case 3:
+ return company.getIsCross() != null && company.getIsCross() == 1;
+ case 4:
+ return company.getIsSameLogistics() != null && company.getIsSameLogistics() == 1;
+ case 5:
+ return company.getIsCrossLogistics() != null && company.getIsCrossLogistics() == 1;
+ case 6:
+ return company.getIsCharter() != null && company.getIsCharter() == 1;
+ default:
+ return false;
+ }
+ }
+
/**
* 获取个人中心详情
--
Gitblit v1.7.1