From bd97b880543c77d6265ae489e7d0cb6d3f97ebdb Mon Sep 17 00:00:00 2001 From: weicw <594098497@qq.com> Date: Tue, 27 Oct 2026 22:15:25 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20=E5=88=A0=E9=99=A4=20DriverWaybillS?= =?UTF-8?q?erviceImpl=20=E6=97=A0=E7=94=A8=E7=9A=84=20IMpUserClient=20?= =?UTF-8?q?=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 该字段已无使用点，连带删掉 import 与 11 个测试构造实参；currentDriver 的注释改为只陈述当前归属判据。 --- .../transport/service/impl/DriverWaybillServiceImpl.java | 5 +---- .../transport/service/impl/DriverNodePunchPhotoTest.java | 2 -- .../transport/service/impl/DriverPunchFinishFlagTest.java | 2 -- .../transport/service/impl/DriverPunchNodeCardTest.java | 2 -- .../transport/service/impl/DriverTripAcceptRejectTest.java | 2 -- .../transport/service/impl/DriverTripCardTest.java | 4 ---- .../service/impl/DriverWaybillAutoCompleteTest.java | 2 -- .../service/impl/DriverWaybillCardLocationTest.java | 2 -- .../transport/service/impl/DriverWaybillNodePunchTest.java | 2 -- .../transport/service/impl/DriverWaybillOwnershipTest.java | 2 -- .../service/impl/DriverWaybillRejectDetachTest.java | 2 -- .../transport/service/impl/DriverWaybillTabStatusTest.java | 2 -- 12 files changed, 1 insertion(+), 28 deletions(-) diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java index 8aab3912..9433a569 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java @@ -34,7 +34,6 @@ import org.springblade.core.tool.jackson.JsonUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.Func; -import org.springblade.system.feign.IMpUserClient; import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper; @@ -152,7 +151,6 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService { private final IWaybillService waybillService; private final IDriverService driverService; - private final IMpUserClient mpUserClient; private final IProcessConfigService processConfigService; private final ITransportVehicleService transportVehicleService; private final CertificationGate certificationGate; @@ -923,8 +921,7 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService { /** * 当前登录司机：只按登录用户 ID 查司机档案，查不到即「无归属」。 *

- * 曾经查不到档案时按手机号回退匹配 driver.mobile，这让两个同号档案可以互相冒充， - * 已删除：手机号在归属链路上不再有任何作用。 + * 归属判据：driver_id = 当前登录人的司机档案 id；driver_phone 不参与判定。 */ private Driver currentDriver() { Long userId = AuthUtil.getUserId(); diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverNodePunchPhotoTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverNodePunchPhotoTest.java index bc544d0a..98dcafb8 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverNodePunchPhotoTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverNodePunchPhotoTest.java @@ -12,7 +12,6 @@ import org.mockito.MockedStatic; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.jackson.JsonUtil; -import org.springblade.system.feign.IMpUserClient; import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper; @@ -95,7 +94,6 @@ class DriverNodePunchPhotoTest { service = new DriverWaybillServiceImpl( waybillService, driverService, - mock(IMpUserClient.class), mock(IProcessConfigService.class), mock(ITransportVehicleService.class), mock(CertificationGate.class), diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchFinishFlagTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchFinishFlagTest.java index 06667c50..132a3b98 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchFinishFlagTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchFinishFlagTest.java @@ -7,7 +7,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.springblade.system.feign.IMpUserClient; import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper; @@ -92,7 +91,6 @@ class DriverPunchFinishFlagTest { service = new DriverWaybillServiceImpl( waybillService, mock(IDriverService.class), - mock(IMpUserClient.class), mock(IProcessConfigService.class), mock(ITransportVehicleService.class), mock(CertificationGate.class), diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchNodeCardTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchNodeCardTest.java index 0009525f..25c4b5ed 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchNodeCardTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchNodeCardTest.java @@ -10,7 +10,6 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.springblade.core.tool.jackson.JsonUtil; -import org.springblade.system.feign.IMpUserClient; import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper; @@ -87,7 +86,6 @@ class DriverPunchNodeCardTest { service = new DriverWaybillServiceImpl( waybillService, mock(IDriverService.class), - mock(IMpUserClient.class), mock(IProcessConfigService.class), mock(ITransportVehicleService.class), mock(CertificationGate.class), diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripAcceptRejectTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripAcceptRejectTest.java index 8e8e474d..cad12c15 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripAcceptRejectTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripAcceptRejectTest.java @@ -14,7 +14,6 @@ import org.mockito.MockedStatic; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.system.feign.IMpUserClient; import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper; @@ -88,7 +87,6 @@ class DriverTripAcceptRejectTest { service = new DriverWaybillServiceImpl( waybillService, driverService, - mock(IMpUserClient.class), mock(IProcessConfigService.class), mock(ITransportVehicleService.class), certificationGate, diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripCardTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripCardTest.java index d783008e..c0034f02 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripCardTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripCardTest.java @@ -10,7 +10,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.MockedStatic; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.system.feign.IMpUserClient; import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper; @@ -74,7 +73,6 @@ class DriverTripCardTest { private IWaybillService waybillService; private IDriverService driverService; - private IMpUserClient mpUserClient; private ITripQueryService tripQueryService; private WaybillEnroutePunchMapper enroutePunchMapper; private WaybillNodePunchMapper nodePunchMapper; @@ -94,14 +92,12 @@ class DriverTripCardTest { void setUp() { waybillService = mock(IWaybillService.class); driverService = mock(IDriverService.class); - mpUserClient = mock(IMpUserClient.class); tripQueryService = mock(ITripQueryService.class); enroutePunchMapper = mock(WaybillEnroutePunchMapper.class); nodePunchMapper = mock(WaybillNodePunchMapper.class); service = new DriverWaybillServiceImpl( waybillService, driverService, - mpUserClient, mock(IProcessConfigService.class), mock(ITransportVehicleService.class), mock(CertificationGate.class), diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillAutoCompleteTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillAutoCompleteTest.java index 42b742fe..ab2bd8e5 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillAutoCompleteTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillAutoCompleteTest.java @@ -11,7 +11,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.MockedStatic; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.system.feign.IMpUserClient; import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper; @@ -116,7 +115,6 @@ class DriverWaybillAutoCompleteTest { service = new DriverWaybillServiceImpl( waybillService, driverService, - mock(IMpUserClient.class), mock(IProcessConfigService.class), mock(ITransportVehicleService.class), mock(CertificationGate.class), diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillCardLocationTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillCardLocationTest.java index 13ace47b..af981add 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillCardLocationTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillCardLocationTest.java @@ -7,7 +7,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.springblade.system.feign.IMpUserClient; import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper; @@ -73,7 +72,6 @@ class DriverWaybillCardLocationTest { service = new DriverWaybillServiceImpl( waybillService, mock(IDriverService.class), - mock(IMpUserClient.class), mock(IProcessConfigService.class), mock(ITransportVehicleService.class), mock(CertificationGate.class), diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillNodePunchTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillNodePunchTest.java index f1223d3c..8c4ad4ec 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillNodePunchTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillNodePunchTest.java @@ -7,7 +7,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.springblade.system.feign.IMpUserClient; import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper; @@ -55,7 +54,6 @@ class DriverWaybillNodePunchTest { service = new DriverWaybillServiceImpl( mock(IWaybillService.class), mock(IDriverService.class), - mock(IMpUserClient.class), mock(IProcessConfigService.class), mock(ITransportVehicleService.class), mock(CertificationGate.class), diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillOwnershipTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillOwnershipTest.java index ad19610d..2dc1e234 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillOwnershipTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillOwnershipTest.java @@ -12,7 +12,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.MockedStatic; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.system.feign.IMpUserClient; import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper; @@ -76,7 +75,6 @@ class DriverWaybillOwnershipTest { service = new DriverWaybillServiceImpl( waybillService, driverService, - mock(IMpUserClient.class), mock(IProcessConfigService.class), mock(ITransportVehicleService.class), mock(CertificationGate.class), diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillRejectDetachTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillRejectDetachTest.java index 228d5800..dc4b349c 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillRejectDetachTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillRejectDetachTest.java @@ -15,7 +15,6 @@ import org.mockito.ArgumentMatchers; import org.mockito.MockedStatic; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.system.feign.IMpUserClient; import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper; @@ -87,7 +86,6 @@ class DriverWaybillRejectDetachTest { service = new DriverWaybillServiceImpl( waybillService, driverService, - mock(IMpUserClient.class), mock(IProcessConfigService.class), mock(ITransportVehicleService.class), certificationGate, diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillTabStatusTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillTabStatusTest.java index 256eff6b..029adb95 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillTabStatusTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillTabStatusTest.java @@ -12,7 +12,6 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.system.feign.IMpUserClient; import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper; @@ -86,7 +85,6 @@ class DriverWaybillTabStatusTest { service = new DriverWaybillServiceImpl( waybillService, driverService, - mock(IMpUserClient.class), mock(IProcessConfigService.class), mock(ITransportVehicleService.class), mock(CertificationGate.class),