小程序登录同步YMS用户BUG修改
This commit is contained in:
+14
-16
@@ -1860,20 +1860,8 @@ public class UserApplicationService {
|
|||||||
userDO.setUserName("用户" + userDO.getUserPhone().substring(userDO.getUserPhone().length() - 4));
|
userDO.setUserName("用户" + userDO.getUserPhone().substring(userDO.getUserPhone().length() - 4));
|
||||||
}
|
}
|
||||||
UserEntity userEntity = userDomainService.addUser(userDO);
|
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)
|
//给小程序注册用户分配默认普通用户角色(must)
|
||||||
userEntity.setUserPassword("Aa123456"); // YMS同步需要密码
|
userEntity.setUserPassword("Aa123456"); // 三方同步需要密码
|
||||||
try {
|
try {
|
||||||
RoleDo mustRoleDo = new RoleDo();
|
RoleDo mustRoleDo = new RoleDo();
|
||||||
mustRoleDo.setRoleCode(RoleEnum.MUST.getCode());
|
mustRoleDo.setRoleCode(RoleEnum.MUST.getCode());
|
||||||
@@ -1890,9 +1878,9 @@ public class UserApplicationService {
|
|||||||
userRoleDomainService.addUserRole(mustUserRoleDo);
|
userRoleDomainService.addUserRole(mustUserRoleDo);
|
||||||
}
|
}
|
||||||
userDO.setRoleCode(RoleEnum.MUST.getCode());
|
userDO.setRoleCode(RoleEnum.MUST.getCode());
|
||||||
userDO.setRoleName(RoleEnum.MUST.getName());
|
userDO.setRoleName(mustRoleEntity.getRoleName());
|
||||||
userEntity.setRoleCode(RoleEnum.MUST.getCode());
|
userEntity.setRoleCode(RoleEnum.MUST.getCode());
|
||||||
userEntity.setRoleName(RoleEnum.MUST.getName());
|
userEntity.setRoleName(mustRoleEntity.getRoleName());
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.warn("分配默认角色失败,但不影响用户保存: {}", e.getMessage());
|
log.warn("分配默认角色失败,但不影响用户保存: {}", e.getMessage());
|
||||||
@@ -1902,7 +1890,17 @@ public class UserApplicationService {
|
|||||||
.set(UserEntity::getRoleCode, userDO.getRoleCode())
|
.set(UserEntity::getRoleCode, userDO.getRoleCode())
|
||||||
.set(UserEntity::getRoleName, userDO.getRoleName())
|
.set(UserEntity::getRoleName, userDO.getRoleName())
|
||||||
.eq(UserEntity::getUserId, userEntity.getUserId()));
|
.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 {
|
try {
|
||||||
ymsDomainService.addOrEditYmsUser(userEntity);
|
ymsDomainService.addOrEditYmsUser(userEntity);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|||||||
Reference in New Issue
Block a user