diff --git a/backend/app/controller/auth.js b/backend/app/controller/auth.js index de2a902..3dca084 100644 --- a/backend/app/controller/auth.js +++ b/backend/app/controller/auth.js @@ -215,6 +215,9 @@ class AuthController extends Controller { return { id: item.id, name: item.name, + // 主体停用时前端置灰不可选,并提示只能查看 + status: item.status, + disabled: Number(item.status) !== 1, account_name: (relation && relation.name) || null, account_avatar: (relation && relation.avatar) || null, }; diff --git a/backend/app/middleware/principal_check.js b/backend/app/middleware/principal_check.js index 7026a4b..2abb229 100644 --- a/backend/app/middleware/principal_check.js +++ b/backend/app/middleware/principal_check.js @@ -5,6 +5,7 @@ * 适用于“需要传入/关联主体ID(principal_id)”的请求: * - 取不到可校验的主体ID -> 400 * - 当前账号未与该主体绑定(principal_users 无记录)-> 403 + * - 主体已停用(principals.status=0)-> 只允许读(GET/HEAD/OPTIONS)与导出,其余写操作 403 * 校验通过后把 principalId 写入 ctx.state.principalId,供控制器做数据隔离(列表过滤、创建归属)。 * * 解析与鉴权规则: @@ -66,6 +67,38 @@ module.exports = (options = {}) => { } ctx.state.principalId = principalId; + + // 主体停用:数据只读(可查看 / 导出),写操作一律拒绝 + const principal = await ctx.service.cache.getPrincipal(principalId); + if (!principal) { + ctx.status = 404; + ctx.body = { code: 404, message: '主体不存在' }; + return; + } + const disabled = Number(principal.status) !== 1; + ctx.state.principalDisabled = disabled; + if (disabled && !isReadOnlyRequest(ctx)) { + ctx.status = 403; + ctx.body = { code: 403, message: '主体已停用,仅可查看与导出,不能新建、修改、推送或删除数据' }; + return; + } + await next(); }; }; + +/** 只读方法(不改变数据) */ +const READ_METHODS = new Set([ 'GET', 'HEAD', 'OPTIONS' ]); + +/** + * 停用主体下仍允许的“读”请求 + * - 常规 GET/HEAD/OPTIONS + * - 导出任务提交(POST /api/export-tasks):属于查看数据,按主体停用策略放行 + * @param {Object} ctx koa 上下文 + * @return {boolean} 是否放行 + */ +function isReadOnlyRequest(ctx) { + if (READ_METHODS.has(ctx.method)) return true; + if (ctx.method === 'POST' && ctx.path === '/api/export-tasks') return true; + return false; +} diff --git a/backend/app/schedule/fetchExternalShopOrders.js b/backend/app/schedule/fetchExternalShopOrders.js index 46e71d9..d8d146c 100644 --- a/backend/app/schedule/fetchExternalShopOrders.js +++ b/backend/app/schedule/fetchExternalShopOrders.js @@ -39,11 +39,15 @@ module.exports = { running = true; try { const Op = ctx.app.Sequelize.Op; + // 主体停用后不再自动拉单 + const enabledPrincipalIds = await ctx.service.cache.getEnabledPrincipalIds(); + if (!enabledPrincipalIds.length) return { shops: 0 }; const shops = await ctx.model.Shop.findAll({ where: { type: 2, status: 1, auto_fetch_order: 1, + principal_id: { [Op.in]: enabledPrincipalIds }, external_print_account_id: { [Op.ne]: null }, }, order: [[ 'id', 'ASC' ]], diff --git a/backend/app/service/cache.js b/backend/app/service/cache.js index 8025e0a..a74888d 100644 --- a/backend/app/service/cache.js +++ b/backend/app/service/cache.js @@ -148,7 +148,8 @@ class CacheService extends Service { /** * 用户可选主体列表(头部主体切换/下拉选择用,含该主体下的角色与默认标识) - * 只返回启用状态的关联:员工在某个主体下被停用后,登录后不再展示该主体 + * 只返回启用状态的关联:员工在某个主体下被停用后,登录后不再展示该主体; + * 主体本身停用时仍返回(前端置灰不可选、标注「已停用」),并按「启用优先」排序 * @param {Number} userId 用户ID * @return {Promise>} 主体选项列表 */ @@ -181,10 +182,31 @@ class CacheService extends Service { is_default: item.is_default, relation_status: item.status, }; - }).filter(Boolean); + }) + .filter(Boolean) + // 启用主体排在前面,保证切换/默认选择不会落在已停用主体上 + .sort((a, b) => { + const enabledDiff = (Number(b.status) === 1 ? 1 : 0) - (Number(a.status) === 1 ? 1 : 0); + if (enabledDiff) return enabledDiff; + return Number(b.is_default) - Number(a.is_default); + }); }); } + /** + * 已启用的主体ID列表(停用的主体不参与定时任务、推送与自动拉单) + * 不做缓存:任务频率低,且主体状态变更需要立即生效 + * @return {Promise>} 主体ID数组 + */ + async getEnabledPrincipalIds() { + const rows = await this.ctx.model.Principal.findAll({ + where: { status: 1 }, + attributes: [ 'id' ], + raw: true, + }); + return rows.map(row => Number(row.id)); + } + // ---------- 主体信息 ---------- /** diff --git a/backend/app/service/externalSendSync.js b/backend/app/service/externalSendSync.js index 0cc8fbd..c551ddd 100644 --- a/backend/app/service/externalSendSync.js +++ b/backend/app/service/externalSendSync.js @@ -258,10 +258,14 @@ class ExternalSendSyncService extends Service { async syncPending({ limit = 50 } = {}) { const { ctx } = this; const Op = ctx.app.Sequelize.Op; + // 主体停用后不再回传平台 + const enabledPrincipalIds = await ctx.service.cache.getEnabledPrincipalIds(); + if (!enabledPrincipalIds.length) return { total: 0, success: 0, failed: 0, exception: 0 }; const rows = await ctx.model.OrderStatusDelivery.findAll({ where: { external_send_status: { [Op.in]: [ SEND_STATUS.PENDING, SEND_STATUS.RETRY ] }, external_send_times: { [Op.lt]: MAX_SEND_TIMES }, + principal_id: { [Op.in]: enabledPrincipalIds }, }, order: [[ 'external_send_at', 'ASC' ]], limit, diff --git a/backend/app/service/orderDeliveryPush.js b/backend/app/service/orderDeliveryPush.js index e5b5f39..480be3f 100644 --- a/backend/app/service/orderDeliveryPush.js +++ b/backend/app/service/orderDeliveryPush.js @@ -318,6 +318,7 @@ class OrderDeliveryPushService extends Service { where: { status: 2, warehouse_id: { [Op.ne]: null }, + principal_id: { [Op.in]: await ctx.service.cache.getEnabledPrincipalIds() }, [Op.or]: [ { pushed_at: null }, { pushed_at: { [Op.lt]: throttleBefore } }, diff --git a/backend/app/service/orderSyncTask.js b/backend/app/service/orderSyncTask.js index 5bb78c1..af32f3c 100644 --- a/backend/app/service/orderSyncTask.js +++ b/backend/app/service/orderSyncTask.js @@ -327,6 +327,16 @@ class OrderSyncTaskService extends Service { const { ctx } = this; const Model = ctx.model.OrderSyncTask; + // 主体停用:不再拉单,任务直接标记失败并写明原因,避免排队卡死 + const principal = await ctx.service.cache.getPrincipal(task.principal_id); + if (!principal || Number(principal.status) !== 1) { + await Model.update( + { status: STATUS.FAILED, error_message: '主体已停用,不再拉取订单', finished_at: new Date(), progress: 100 }, + { where: { id: task.id } } + ); + return; + } + let shops = []; try { const access = await this.resolveAccess(task.created_by, task.principal_id); diff --git a/backend/app/service/orderWms.js b/backend/app/service/orderWms.js index e592028..41584c2 100644 --- a/backend/app/service/orderWms.js +++ b/backend/app/service/orderWms.js @@ -432,6 +432,7 @@ class OrderWmsService extends Service { const orders = await ctx.model.OrderStatusQueued.findAll({ where: { status: ORDER_STATUS.QUEUED, + principal_id: { [Op.in]: await ctx.service.cache.getEnabledPrincipalIds() }, [Op.or]: [ { pushed_at: null }, { pushed_at: { [Op.lt]: throttleBefore } }, diff --git a/backend/app/service/outboundOrderPush.js b/backend/app/service/outboundOrderPush.js index e3cc506..957602b 100644 --- a/backend/app/service/outboundOrderPush.js +++ b/backend/app/service/outboundOrderPush.js @@ -446,6 +446,7 @@ class OutboundOrderPushService extends Service { where: { status: 2, warehouse_id: { [Op.ne]: null }, + principal_id: { [Op.in]: await ctx.service.cache.getEnabledPrincipalIds() }, [Op.or]: [ { pushed_at: null }, { pushed_at: { [Op.lt]: throttleBefore } }, diff --git a/frontend/src/api/auth.ts b/frontend/src/api/auth.ts index 3390d7e..d770bda 100644 --- a/frontend/src/api/auth.ts +++ b/frontend/src/api/auth.ts @@ -17,7 +17,16 @@ export interface UserInfo { last_login_at: string | null created_at: string updated_at: string - principals?: { id: number; name: string; account_name?: string | null; account_avatar?: string | null }[] + principals?: { + id: number + name: string + /** 主体状态:1启用 0停用 */ + status?: number + /** 主体是否已停用(停用后下拉置灰不可选,数据只读) */ + disabled?: boolean + account_name?: string | null + account_avatar?: string | null + }[] } export interface RegisterPayload { diff --git a/frontend/src/layouts/BasicLayout.vue b/frontend/src/layouts/BasicLayout.vue index c313794..75fa58f 100644 --- a/frontend/src/layouts/BasicLayout.vue +++ b/frontend/src/layouts/BasicLayout.vue @@ -107,7 +107,7 @@ const accountProfile = computed(() => { }) onMounted(() => { - // 当前主体若已不在所属列表内(如切换账号),重置为第一个 + // 当前主体若已不在所属列表内(如切换账号),重置为第一个(后端已按「启用优先」排序) const ids = (auth.user?.principals || []).map((p) => p.id) principalStore.ensureValid(ids) // 计算标签条可见数量,处理溢出折叠 @@ -150,6 +150,13 @@ function goExport() { router.push('/export-tasks') } +/** 当前主体是否已停用(停用后只读:后端拒绝写操作) */ +const currentPrincipalDisabled = computed(() => { + const currentId = principalStore.currentId + const item = (auth.user?.principals || []).find(p => Number(p.id) === Number(currentId)) + return Boolean(item?.disabled) +}) + // 切换当前主体:持久化到 localStorage 并刷新页面以按新主体重新拉取数据 function onPrincipalChange(id: number) { principalStore.setCurrentId(id) @@ -214,8 +221,9 @@ function onPrincipalChange(id: number) { @@ -235,6 +243,14 @@ function onPrincipalChange(id: number) { 登录 + @@ -298,6 +314,11 @@ function onPrincipalChange(id: number) { z-index: 0; } +/* 主体停用提示:紧贴顶栏下方,不占页面主体高度 */ +.principal-disabled-tip { + border-radius: 0; +} + .user-area { display: flex; align-items: center; diff --git a/frontend/src/store/principal.ts b/frontend/src/store/principal.ts index ab4c34b..779456a 100644 --- a/frontend/src/store/principal.ts +++ b/frontend/src/store/principal.ts @@ -18,7 +18,10 @@ export const usePrincipalStore = defineStore('principal', () => { else localStorage.setItem(CURRENT_PRINCIPAL_KEY, String(id)) } - /** 若当前主体不在可选列表内,重置为列表第一个(或不选) */ + /** + * 若当前主体不在可选列表内,重置为列表第一个(或不选) + * @param principalIds 可选主体ID(后端已按「启用优先」排序) + */ function ensureValid(principalIds: number[]) { if (currentId.value == null) return if (!principalIds.includes(currentId.value)) {