Merge branch 'v16.9_youhua_20240611' into dev

performance-web/src/main/java/com/clx/performance/extranal/user/TruckService.java → performance-web/src/main/java/com/clx/performance/extranal/user/TruckUserService.java

@@ -3,7 +3,7 @@ package com.clx.performance.extranal.user;
 import com.clx.user.vo.feign.TruckInfoFeignVo;
 import com.msl.common.base.Optional;
 
-public interface TruckService {
+public interface TruckUserService {
 
     Optional<TruckInfoFeignVo> getTruckInfo(Integer truckId);
 

performance-web/src/main/java/com/clx/performance/extranal/user/impl/TruckServiceImpl.java → performance-web/src/main/java/com/clx/performance/extranal/user/impl/TruckUserServiceImpl.java

 package com.clx.performance.extranal.user.impl;
 
-import com.clx.performance.extranal.user.TruckService;
+import com.clx.performance.extranal.user.TruckUserService;
 import com.clx.user.feign.TruckFeign;
 import com.clx.user.vo.feign.TruckInfoFeignVo;
 import com.msl.common.base.Optional;
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
 @Service
 @Slf4j
 @AllArgsConstructor
-public class TruckServiceImpl implements TruckService {
+public class TruckUserServiceImpl implements TruckUserService {
     private final TruckFeign truckFeign;
 
     @Override

performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

@@ -19,7 +19,7 @@ import com.clx.performance.enums.DtsOperationTypeEnum;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.event.OrderChildCancelEvent;
 import com.clx.performance.extranal.user.DriverService;
-import com.clx.performance.extranal.user.TruckService;
+import com.clx.performance.extranal.user.TruckUserService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderChildImage;
 import com.clx.performance.service.LastTruckService;
@@ -51,7 +51,7 @@ public class OrderChildDtsListener  {
     private final DriverService driverService;
     private final ApplicationEventPublisher applicationEventPublisher;
     private final ThirdAppConfig thirdAppConfig;
-    private final TruckService truckService;
+    private final TruckUserService truckService;
     private final OrderChildImageDao orderChildImageDao;