diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java index 8e66812ac..4a147a23e 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java @@ -1860,20 +1860,8 @@ public class UserApplicationService { userDO.setUserName("用户" + userDO.getUserPhone().substring(userDO.getUserPhone().length() - 4)); } UserEntity userEntity = userDomainService.addUser(userDO); - //同步网货平台员工信息 - try { - wlhyDomainService.addOrEditPlatformUser1(userEntity); - } catch (Exception e) { - log.warn("同步网货平台员工信息失败,但不影响用户保存: {}", e.getMessage()); - } - //同步商城用户 - try { - userMallDomainService.syncDriverUserInfo(userEntity); - } catch (Exception e) { - log.warn("同步商城用户失败,但不影响用户保存: {}", e.getMessage()); - } //给小程序注册用户分配默认普通用户角色(must) - userEntity.setUserPassword("Aa123456"); // YMS同步需要密码 + userEntity.setUserPassword("Aa123456"); // 三方同步需要密码 try { RoleDo mustRoleDo = new RoleDo(); mustRoleDo.setRoleCode(RoleEnum.MUST.getCode()); @@ -1890,9 +1878,9 @@ public class UserApplicationService { userRoleDomainService.addUserRole(mustUserRoleDo); } userDO.setRoleCode(RoleEnum.MUST.getCode()); - userDO.setRoleName(RoleEnum.MUST.getName()); + userDO.setRoleName(mustRoleEntity.getRoleName()); userEntity.setRoleCode(RoleEnum.MUST.getCode()); - userEntity.setRoleName(RoleEnum.MUST.getName()); + userEntity.setRoleName(mustRoleEntity.getRoleName()); } } catch (Exception e) { log.warn("分配默认角色失败,但不影响用户保存: {}", e.getMessage()); @@ -1902,7 +1890,17 @@ public class UserApplicationService { .set(UserEntity::getRoleCode, userDO.getRoleCode()) .set(UserEntity::getRoleName, userDO.getRoleName()) .eq(UserEntity::getUserId, userEntity.getUserId())); - //同步YMS平台员工信息(放在角色分配之后,确保roleCode已设置) + //同步三方平台(放在角色分配之后,确保roleCode已设置) + try { + wlhyDomainService.addOrEditPlatformUser1(userEntity); + } catch (Exception e) { + log.warn("同步网货平台员工信息失败,但不影响用户保存: {}", e.getMessage()); + } + try { + userMallDomainService.syncDriverUserInfo(userEntity); + } catch (Exception e) { + log.warn("同步商城用户失败,但不影响用户保存: {}", e.getMessage()); + } try { ymsDomainService.addOrEditYmsUser(userEntity); } catch (Exception e) {