Merge branch 'dev' into dev_WMS20260401

# Conflicts:
#	mhd-user-center/src/main/resources/bootstrap.yml
#	mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java
#	mhd_oms/src/main/resources/bootstrap.yml
#	mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml

mhd-user-center/src/main/java/com/mhd/user/application/service/UserDriverApplicationService.java

@@ -416,6 +416,17 @@ public class UserDriverApplicationService {
         VehiclePo vehicleData = vehicle.getData();
         log.info("查到到车辆信息:{}",vehicleData);
 
+        // 如果车辆存在且当前用户与该车辆的绑定关系已存在，则跳过绑定，避免重复创建绑定记录
+        if (vehicleData != null && vehicleData.getVehicleId() != null) {
+            DriverVehicleBind existingBind = driverVehicleBindDomainService.getBindInfoListByVehicle(
+                vehicleData.getVehicleId(), driver.getUserId());
+            if (ObjectUtil.isNotNull(existingBind)) {
+                log.info("用户[{}]与车辆[{}]的绑定关系已存在，跳过绑定操作",
+                    driver.getUserId(), driver.getVehicleLicensePlateNumber());
+                return;
+            }
+        }
+
         DriverVehicleBind driverVehicleBind = driverVehicleBindDomainService.isVehicleBinding(driver.getVehicleLicensePlateNumber());
         Boolean isBound=false;
         if(ObjectUtil.isNotNull(driverVehicleBind)&&!driverVehicleBind.getDriverBindId().equals(driver.getUserId())){

mhd-user-center/src/main/java/com/mhd/user/application/service/UserDriverEnterpriseApplicationService.java

@@ -568,6 +568,15 @@ public class UserDriverEnterpriseApplicationService {
     public Map<String, Object> captainAuth(UserDriverEnterpriseDo userDriverEnterpriseDo) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Map<String, Object> result = new HashMap<>();
+        if (org.apache.commons.lang3.StringUtils.isBlank(userDriverEnterpriseDo.getUserAccount())) {
+            throw new ServiceException("用户账号不能为空");
+        }
+        if (org.apache.commons.lang3.StringUtils.isBlank(userDriverEnterpriseDo.getUserName())) {
+            throw new ServiceException("用户姓名不能为空");
+        }
+        if (org.apache.commons.lang3.StringUtils.isBlank(userDriverEnterpriseDo.getUserPhone())) {
+            throw new ServiceException("用户电话不能为空");
+        }
 
         // 1. 前置检查：如果用户已存在，检查是否已加入其他车队
         performPreChecks(userDriverEnterpriseDo);

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDriverDomainService.java

@@ -326,6 +326,9 @@ public class UserDriverDomainService {
 
     public UserDriverPo getDriverDataByUserId(Long userId) {
         UserDriverPo userDriverPo=userDriverRepositoryInterface.getDriverDataByUserId(userId);
+        if (userDriverPo == null) {
+            return null;
+        }
         R<List<VehiclePo>> vehicleR=transportFeign.getVehiclePosByUserId(userDriverPo.getUserId());
         if (R.SUCCESS == vehicleR.getCode() && vehicleR.getData() != null && !vehicleR.getData().isEmpty()) {
             userDriverPo.setVehicleList(vehicleR.getData());