From 0497d8e96ea25d4b1f88d86bc521d4421e4aef46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Mon, 29 Jun 2026 15:32:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5YMS=E7=94=A8=E6=88=B7BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/UserApplicationService.java       | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

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) {