组织排队开关，新增用户司机同步yms，oms预约单修改

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

@@ -30,6 +30,7 @@ import com.mhd.system.api.FinanceServiceFeign;
 import com.mhd.system.api.OrganizationServiceFeign;
 import com.mhd.system.api.TicketServiceFeign;
 import com.mhd.system.api.TransportFeign;
+import com.mhd.system.api.YmsServiceFeign;
 import com.mhd.system.api.domain.PlatformUserDTO;
 import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO;
 import com.mhd.system.api.domain.WlhyLoginUser;
@@ -181,6 +182,8 @@ public class UserApplicationService {
     private TicketServiceFeign ticketServiceFeign;
     @Resource
     private UserWlhyDomainService wlhyDomainService;
+    @Resource
+    private UserYmsDomainService ymsDomainService;
 
     @Resource
     private UserShipperApplicationService userShipperApplicationService;
@@ -1381,6 +1384,7 @@ public class UserApplicationService {
     @Transactional(rollbackFor = Exception.class)
     public UserPo addUserYG(UserDO userDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
+        String password = userDO.getPlainPassword();
         if (ObjectUtil.isNull(loginUser)) {
             throw new DigitalLogisticsException(UserError.TIMEOUT);
         }
@@ -1484,6 +1488,20 @@ public class UserApplicationService {
                 // 如果业务要求必须同步成功，可以取消下面的注释，让异常抛出
                 // throw e;
             }
+            //获取组织信息
+            Long organizationId = loginUser.getUserPo().getOrganizationId();
+            Integer isQueue = userMapper.getOrdIsQueue(organizationId);
+
+            if (isQueue==1) {
+                //同步YMS员工信息
+                try {
+                    userEntity.setUserPassword(password);
+                    ymsDomainService.addOrEditYmsUser(userEntity);
+                } catch (Exception e) {
+                    // 同步YMS失败时，记录日志但不影响用户保存
+                    log.warn("同步YMS员工信息失败，但不影响用户保存: {}", e.getMessage());
+                }
+            }
             return userPo;
         }
     }
@@ -2096,6 +2114,8 @@ public class UserApplicationService {
         UserEntity userEntity = userDomainService.updateUser(userDO);
         //同步网货平台员工信息
         wlhyDomainService.addOrEditPlatformUser(userEntity);
+        //同步yms员工信息
+        ymsDomainService.addOrEditYmsUser(userEntity);
         BeanUtils.copyProperties(userPo, userEntity);
 
 

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

@@ -29,6 +29,7 @@ import com.mhd.common.core.utils.poi.WpsImg;
 import com.mhd.system.api.FinanceServiceFeign;
 import com.mhd.system.api.TransportFeign;
 import com.mhd.system.api.WlhyServiceFeign;
+import com.mhd.system.api.YmsServiceFeign;
 import com.mhd.system.api.service.webSocket.AsyncWebSocketApplicationService;
 import com.mhd.user.application.strategy.VehicleBindingStrategy;
 import com.mhd.user.domain.motorcade.entity.Motorcade;
@@ -119,6 +120,8 @@ public class UserDriverApplicationService {
     private AsyncJPushApplicationService asyncJPushApplicationService;
     @Resource
     private SpecialLogisticsFeign specialLogisticsFeign;
+    @Resource
+    private UserYmsDomainService ymsDomainService;
 
     @Resource
     private UserDataPermissionApplicationService userDataPermissionApplicationService;
@@ -184,6 +187,7 @@ public class UserDriverApplicationService {
     private DriverVehicleBindMapper driverVehicleBindMapper;
     @Autowired
     private UserMapper userMapper;
+    private YmsServiceFeign ymsServiceFeign;
 
     /**
      * @Description 承运人列表查询
@@ -515,6 +519,28 @@ public class UserDriverApplicationService {
 
         // 同步信息到网络货运平台
         wlhyDomainService.saveOrUpdateDriverInfo(userDriverDO);
+        Long organizationId = loginUser.getUserPo().getOrganizationId();
+        Integer isQueue = userMapper.getOrdIsQueue(organizationId);
+        if (isQueue==1) {
+            // 同步YMS员工信息
+            try {
+                UserEntity userEntity = new UserEntity();
+                userEntity.setUserId(userDriverDO.getUserId());
+                userEntity.setUserAccount(userDriverDO.getUserAccount());
+                userEntity.setUserName(userDriverDO.getUserName());
+                userEntity.setUserPhone(userDriverDO.getUserPhone());
+                userEntity.setUserPassword("Aa123456");
+                userEntity.setOrganizationId(userDriverDO.getOrganizationId());
+                userEntity.setOrganizationName(userDriverDO.getOrganizationName());
+                userEntity.setTopOrganizationId(userDriverDO.getTopOrganizationId());
+                userEntity.setUserAuthStatus(userDriverDO.getUserAuthStatus());
+                userEntity.setBusinessType(userDriverDO.getBusinessType());
+                ymsDomainService.addOrEditYmsUser(userEntity);
+            } catch (Exception e) {
+                // 同步YMS失败时，记录日志但不影响用户保存
+                log.warn("同步YMS员工信息失败，但不影响用户保存: {}", e.getMessage());
+            }
+        }
 
         // 自动审核或提交审核
         if (ObjectUtil.equal(configSwitch.getAutomaticCheckUserInfo(), UserDriverConstants.AUTOMATIC_CHECK_ENABLED)) {