|
|
@@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
+import shop.alien.entity.result.R;
|
|
|
import shop.alien.entity.store.StorePlatformMenu;
|
|
|
import shop.alien.entity.store.StorePlatformRole;
|
|
|
import shop.alien.entity.store.StorePlatformUserRole;
|
|
|
@@ -215,10 +216,10 @@ public class StorePlatformUserRoleServiceImpl extends ServiceImpl<StorePlatformU
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public boolean createAccountAndAssignRole(String phone, String accountName, Integer storeId, Long roleId) {
|
|
|
+ public R<String> createAccountAndAssignRole(String phone, String accountName, Integer storeId, Long roleId) {
|
|
|
if (phone == null || phone.isEmpty() || storeId == null || roleId == null) {
|
|
|
log.error("参数不能为空: phone={}, storeId={}, roleId={}", phone, storeId, roleId);
|
|
|
- return false;
|
|
|
+ return R.fail("参数不能为空");
|
|
|
}
|
|
|
|
|
|
try {
|
|
|
@@ -239,7 +240,7 @@ public class StorePlatformUserRoleServiceImpl extends ServiceImpl<StorePlatformU
|
|
|
|
|
|
if (existingSubAccount != null) {
|
|
|
log.error("该手机号在当前店铺已存在子账号,不支持创建: phone={}, storeId={}", phone, storeId);
|
|
|
- return false;
|
|
|
+ return R.fail("该手机号在当前店铺已存在子账号,不支持创建");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -253,7 +254,7 @@ public class StorePlatformUserRoleServiceImpl extends ServiceImpl<StorePlatformU
|
|
|
|
|
|
if (existingAccountName != null) {
|
|
|
log.error("该账号名称在当前店铺已存在子账号,不支持创建: accountName={}, storeId={}", accountName, storeId);
|
|
|
- return false;
|
|
|
+ return R.fail("该账号名称在当前店铺已存在子账号,不支持创建");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -267,7 +268,7 @@ public class StorePlatformUserRoleServiceImpl extends ServiceImpl<StorePlatformU
|
|
|
int storeIdNew = storeUser.getStoreId();
|
|
|
if (storeIdNew == storeId) {
|
|
|
log.error("该手机号为当前当前店铺手机号,请勿重复创建: phone={}, storeId={}", phone, storeId);
|
|
|
- return false;
|
|
|
+ return R.fail("该手机号为当前当前店铺手机号,请勿重复创建");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -292,7 +293,7 @@ public class StorePlatformUserRoleServiceImpl extends ServiceImpl<StorePlatformU
|
|
|
int insertResult = storeUserMapper.insert(newUser);
|
|
|
if (insertResult <= 0) {
|
|
|
log.error("插入 store_user 表失败: phone={}", phone);
|
|
|
- return false;
|
|
|
+ return R.fail("创建子账号失败");
|
|
|
}
|
|
|
userId = newUser.getId();
|
|
|
log.info("成功创建新用户: phone={}, userId={}", phone, userId);
|
|
|
@@ -321,17 +322,17 @@ public class StorePlatformUserRoleServiceImpl extends ServiceImpl<StorePlatformU
|
|
|
boolean insertRoleResult = this.save(userRole);
|
|
|
if (!insertRoleResult) {
|
|
|
log.error("插入 store_platform_user_role 表失败: userId={}, storeId={}, roleId={}", userId, storeId, roleId);
|
|
|
- return false;
|
|
|
+ return R.fail("创建子账号失败");
|
|
|
}
|
|
|
log.info("成功分配角色: userId={}, storeId={}, roleId={}", userId, storeId, roleId);
|
|
|
} else {
|
|
|
log.info("用户角色关系已存在: userId={}, storeId={}, roleId={}", userId, storeId, roleId);
|
|
|
}
|
|
|
|
|
|
- return true;
|
|
|
+ return R.success("创建子账号成功");
|
|
|
} catch (Exception e) {
|
|
|
log.error("创建账号并分配角色失败: phone={}, storeId={}, roleId={}", phone, storeId, roleId, e);
|
|
|
- return false;
|
|
|
+ return R.fail("创建账号并分配角色失败");
|
|
|
}
|
|
|
}
|
|
|
|