diff --git a/app/service/openapi.js b/app/service/openapi.js index 09cbf7f..11f737f 100644 --- a/app/service/openapi.js +++ b/app/service/openapi.js @@ -41,14 +41,71 @@ class OpenapiService extends Service { return methodService || null; } + /** + * 解析 OpenAPI 合约信息(interface_type_id=2 必须绑定有效合约)。 + * 查询 ApiApp 并强制关联 StoreWarehouse,校验 store_id 必须存在。 + * @param {string} appKey 开放接口 app_key。 + * @return {Promise} 包含 storeId、warehouseId、appKey、customerId、warehouseCode 的信息对象。 + */ + async resolveOpenapiContract(appKey) { + const { ctx, app } = this; + const normalizedAppKey = String(appKey || '').trim(); + if (!normalizedAppKey) { + throw new Error('app_key 缺失'); + } + + const appConfig = await ctx.model.ApiApp.findOne({ + attributes: [ + 'id', + 'warehouse_id', + 'qimen_warehouse_code', + [ app.Sequelize.col('contract.store_id'), 'store_id' ], + ], + where: { + self_app_key: normalizedAppKey, + is_enabled: 1, + }, + include: [ + { + model: ctx.model.StoreWarehouse, + as: 'contract', + attributes: [], + required: true, + }, + ], + raw: true, + }); + + if (!appConfig || !appConfig.warehouse_id) { + throw new Error(`无法解析仓库信息,请检查 app_key: ${normalizedAppKey}`); + } + + if (!appConfig.store_id) { + throw new Error(`未找到 app_key 对应的货主合约关系: ${normalizedAppKey}`); + } + + const warehouseId = appConfig.warehouse_id; + + return { + storeId: appConfig.store_id, + warehouseId, + appKey: normalizedAppKey, + customerId: null, + warehouseCode: appConfig.qimen_warehouse_code || String(warehouseId), + }; + } + /** * 分发 openapi method 到 openapiMethods 目录。 + * 分发前统一注入合约上下文(storeId/warehouseId/appKey 等), + * 确保所有下游方法可通过 this.getInfo() 获取货主范围信息。 * @param {string} methodName method 名称。 * @param {Object} body 请求体。 * @param {Object} query 请求 query。 + * @param {Object} contractInfo 合约上下文信息。 * @return {Promise} method 执行结果。 */ - async dispatchOpenapiMethod(methodName, body, query) { + async dispatchOpenapiMethod(methodName, body, query, contractInfo) { const { servicePath, actionName } = this.resolveOpenapiMethod(methodName); const methodService = this.getOpenapiMethodService(servicePath); @@ -62,6 +119,17 @@ class OpenapiService extends Service { }; } + // 统一注入合约上下文到方法服务实例 + if (contractInfo && typeof methodService.setInfo === 'function') { + methodService.setInfo( + contractInfo.storeId, + contractInfo.warehouseId, + contractInfo.appKey, + contractInfo.customerId, + contractInfo.warehouseCode + ); + } + const methodResult = await methodService[actionName]({ body, query, @@ -241,10 +309,26 @@ class OpenapiService extends Service { }; } - return await this.dispatchOpenapiMethod(query.method, body, { + // interface_type_id=2(OPENAPI)必须解析合约并注入货主信息 + let contractInfo = null; + try { + contractInfo = await this.resolveOpenapiContract(appKey); + } catch (error) { + return { + ok: false, + httpStatus: 403, + code: 403, + message: `合约校验失败: ${error.message}`, + data: null, + }; + } + + const queryWithAppKey = { ...query, app_key: appConfig.appKey, - }); + }; + + return await this.dispatchOpenapiMethod(query.method, body, queryWithAppKey, contractInfo); } } diff --git a/app/service/openapiMethods/deliveryorder.js b/app/service/openapiMethods/deliveryorder.js index 8cbda55..842d596 100644 --- a/app/service/openapiMethods/deliveryorder.js +++ b/app/service/openapiMethods/deliveryorder.js @@ -3,62 +3,16 @@ const MainService = require('../main'); class OpenapiDeliveryorderService extends MainService { - /** - * 通过 app_key 解析仓库与货主信息。 - * 查询 ApiApp 并关联 StoreWarehouse 以获取 storeId、warehouseId。 - * @param {string} appKey 开放接口 app_key。 - * @return {Promise} 包含 storeId、warehouseId、appKey、customerId、warehouseCode 的信息对象。 - */ - async resolveAppInfo(appKey) { - const { ctx, app } = this; - const normalizedAppKey = String(appKey || '').trim(); - if (!normalizedAppKey) { - throw new Error('app_key 缺失'); - } - - const appConfig = await ctx.model.ApiApp.findOne({ - attributes: [ - 'id', - 'warehouse_id', - [ app.Sequelize.col('contract.store_id'), 'store_id' ], - ], - where: { - self_app_key: normalizedAppKey, - is_enabled: 1, - }, - include: [ - { - model: ctx.model.StoreWarehouse, - as: 'contract', - attributes: [], - required: false, - }, - ], - raw: true, - }); - - if (!appConfig || !appConfig.warehouse_id) { - throw new Error(`无法解析仓库信息,请检查 app_key: ${normalizedAppKey}`); - } - - return { - storeId: appConfig.store_id || null, - warehouseId: appConfig.warehouse_id, - appKey: normalizedAppKey, - customerId: null, - warehouseCode: '', - }; - } - /** * 查询发货单。 + * 上下文(storeId/warehouseId/appKey)已由 dispatchOpenapiMethod 统一注入。 * @param {Object} payload 调用参数。 * @param {Object} payload.body 请求体数据,需包含 deliveryOrderCode。 - * @param {Object} payload.query 请求 query 数据,需包含 app_key。 + * @param {Object} payload.query 请求 query 数据。 * @return {Promise} 查询结果,成功时返回订单详情,失败时返回错误信息。 */ async query(payload = {}) { - const { body = {}, query = {} } = payload; + const { body = {} } = payload; const { deliveryOrderCode } = body; if (!deliveryOrderCode) { @@ -66,10 +20,13 @@ class OpenapiDeliveryorderService extends MainService { } try { - const info = await this.resolveAppInfo(query.app_key); - const DeliveryModel = await this.ctx.model.OrderDeliveryFactory.getCurrentModel(info.warehouseId); + const { storeId, warehouseId } = this.getInfo(); + const DeliveryModel = await this.ctx.model.OrderDeliveryFactory.getCurrentModel(warehouseId); const order = await DeliveryModel.findOne({ - where: { delivery_order_code: deliveryOrderCode }, + where: { + delivery_order_code: deliveryOrderCode, + store_id: storeId, + }, }); if (order) { @@ -101,13 +58,14 @@ class OpenapiDeliveryorderService extends MainService { /** * 创建发货单。 + * 上下文(storeId/warehouseId/appKey)已由 dispatchOpenapiMethod 统一注入。 * @param {Object} payload 调用参数。 * @param {Object} payload.body 请求体数据,需包含 deliveryOrder 与 orderLines。 - * @param {Object} payload.query 请求 query 数据,需包含 app_key。 + * @param {Object} payload.query 请求 query 数据。 * @return {Promise} 创建结果,成功时返回订单ID等,失败时返回错误信息。 */ async create(payload = {}) { - const { body = {}, query = {} } = payload; + const { body = {} } = payload; const { deliveryOrder, orderLines } = body; if (!deliveryOrder || !deliveryOrder.deliveryOrderCode) { @@ -118,15 +76,6 @@ class OpenapiDeliveryorderService extends MainService { } try { - const info = await this.resolveAppInfo(query.app_key); - this.setInfo( - info.storeId, - info.warehouseId, - info.appKey, - info.customerId, - info.warehouseCode - ); - const data = { request: { deliveryOrder, @@ -144,7 +93,7 @@ class OpenapiDeliveryorderService extends MainService { return this.success(res.message, { createTime: this.app.formatDate(new Date()), deliveryOrderId: res.data.orderId, - warehouseCode: info.warehouseCode, + warehouseCode: this.warehouseCode, logisticsCode: '', }); } diff --git a/app/service/openapiMethods/entryorder.js b/app/service/openapiMethods/entryorder.js index 7029ba9..eef1e56 100644 --- a/app/service/openapiMethods/entryorder.js +++ b/app/service/openapiMethods/entryorder.js @@ -8,67 +8,17 @@ const MainService = require('../main'); */ class OpenapiEntryorderService extends MainService { - /** - * 通过 app_key 解析仓库与货主信息。 - * 查询 ApiApp 并关联 StoreWarehouse 以获取 storeId、warehouseId。 - * warehouseCode 优先使用 qimen_warehouse_code,为空时回退使用 warehouseId。 - * @param {string} appKey 开放接口 app_key。 - * @return {Promise} 包含 storeId、warehouseId、appKey、customerId、warehouseCode 的信息对象。 - */ - async resolveAppInfo(appKey) { - const { ctx, app } = this; - const normalizedAppKey = String(appKey || '').trim(); - if (!normalizedAppKey) { - throw new Error('app_key 缺失'); - } - - const appConfig = await ctx.model.ApiApp.findOne({ - attributes: [ - 'id', - 'warehouse_id', - 'qimen_warehouse_code', - [ app.Sequelize.col('contract.store_id'), 'store_id' ], - ], - where: { - self_app_key: normalizedAppKey, - is_enabled: 1, - }, - include: [ - { - model: ctx.model.StoreWarehouse, - as: 'contract', - attributes: [], - required: false, - }, - ], - raw: true, - }); - - if (!appConfig || !appConfig.warehouse_id) { - throw new Error(`无法解析仓库信息,请检查 app_key: ${normalizedAppKey}`); - } - - const warehouseId = appConfig.warehouse_id; - - return { - storeId: appConfig.store_id || null, - warehouseId, - appKey: normalizedAppKey, - customerId: null, - warehouseCode: appConfig.qimen_warehouse_code || String(warehouseId), - }; - } - /** * 创建入库单。 + * 上下文(storeId/warehouseId/appKey/warehouseCode)已由 dispatchOpenapiMethod 统一注入。 * 接收外部系统的入库单数据,校验后通过底层 entryOrder 服务完成入库单创建。 * @param {Object} payload 调用参数。 * @param {Object} payload.body 请求体数据,包含 entryOrder(入库单信息)和 orderLines(明细行)。 - * @param {Object} payload.query 请求 query 数据,需包含 app_key。 + * @param {Object} payload.query 请求 query 数据。 * @return {Promise} 创建结果,成功时返回 entryOrderId、entryOrderCode、status 和 createTime。 */ async create(payload = {}) { - const { body = {}, query = {} } = payload; + const { body = {} } = payload; const { entryOrder, orderLines } = body; if (!entryOrder || !entryOrder.entryOrderCode) { @@ -101,15 +51,6 @@ class OpenapiEntryorderService extends MainService { }; try { - const info = await this.resolveAppInfo(query.app_key); - this.setInfo( - info.storeId, - info.warehouseId, - info.appKey, - info.customerId, - info.warehouseCode - ); - const data = { request: { entryOrder: mappedEntryOrder, @@ -140,14 +81,15 @@ class OpenapiEntryorderService extends MainService { /** * 查询入库单。 + * 上下文(storeId/warehouseId)已由 dispatchOpenapiMethod 统一注入。 * 根据入库单号查询入库单详情,包括基本信息与商品明细。 * @param {Object} payload 调用参数。 * @param {Object} payload.body 请求体数据,需包含 entryOrderCode(入库单号)。 - * @param {Object} payload.query 请求 query 数据,需包含 app_key。 + * @param {Object} payload.query 请求 query 数据。 * @return {Promise} 查询结果,成功时返回入库单详情。 */ async query(payload = {}) { - const { body = {}, query = {} } = payload; + const { body = {} } = payload; const { entryOrderCode } = body; if (!entryOrderCode) { @@ -155,11 +97,11 @@ class OpenapiEntryorderService extends MainService { } try { - const info = await this.resolveAppInfo(query.app_key); + const { storeId, warehouseId, warehouseCode } = this.getInfo(); const order = await this.ctx.service.systems.entryOrder.findByOrderCode( entryOrderCode, - info.warehouseId, - info.storeId + warehouseId, + storeId ); if (!order) { @@ -189,7 +131,7 @@ class OpenapiEntryorderService extends MainService { createTime: order.created_at || '', operateTime: order.updated_at || '', operatorName: order.operator_name || '', - warehouseCode: order.warehouse_code || info.warehouseCode, + warehouseCode: order.warehouse_code || warehouseCode, ownerCode: order.store_code || '', totalOrderLines: order.total_order_lines || 0, orderLines, diff --git a/app/service/openapiMethods/inventory.js b/app/service/openapiMethods/inventory.js index 6b9a65b..b841741 100644 --- a/app/service/openapiMethods/inventory.js +++ b/app/service/openapiMethods/inventory.js @@ -8,82 +8,33 @@ const MainService = require('../main'); */ class OpenapiInventoryService extends MainService { - /** - * 通过 app_key 解析仓库与货主信息。 - * 查询 ApiApp 并关联 StoreWarehouse 以获取 storeId、warehouseId。 - * warehouseCode 优先使用 qimen_warehouse_code,为空时回退使用 warehouseId; - * ownerCode 优先使用 store_id,为空时回退使用空字符串。 - * @param {string} appKey 开放接口 app_key。 - * @return {Promise} 包含 storeId、warehouseId、appKey、customerId、warehouseCode、ownerCode 的信息对象。 - */ - async resolveAppInfo(appKey) { - const { ctx, app } = this; - const normalizedAppKey = String(appKey || '').trim(); - if (!normalizedAppKey) { - throw new Error('app_key 缺失'); - } - - const appConfig = await ctx.model.ApiApp.findOne({ - attributes: [ - 'id', - 'warehouse_id', - 'qimen_warehouse_code', - [ app.Sequelize.col('contract.store_id'), 'store_id' ], - ], - where: { - self_app_key: normalizedAppKey, - is_enabled: 1, - }, - include: [ - { - model: ctx.model.StoreWarehouse, - as: 'contract', - attributes: [], - required: false, - }, - ], - raw: true, - }); - - if (!appConfig || !appConfig.warehouse_id) { - throw new Error(`无法解析仓库信息,请检查 app_key: ${normalizedAppKey}`); - } - - const warehouseId = appConfig.warehouse_id; - const storeId = appConfig.store_id || null; - - return { - storeId, - warehouseId, - appKey: normalizedAppKey, - customerId: null, - warehouseCode: appConfig.qimen_warehouse_code || String(warehouseId), - ownerCode: storeId ? String(storeId) : '', - }; - } - /** * 库存查询。 + * 上下文(storeId)已由 dispatchOpenapiMethod 统一注入,查询结果按货主范围校验。 * 根据商品 ID 列表查询对应的库存信息,包括总库存、锁定量和可用量。 * @param {Object} payload 调用参数。 * @param {Object} payload.body 请求体数据,需包含 itemIds(商品 ID 数组)。 - * @param {Object} payload.query 请求 query 数据,需包含 app_key。 + * @param {Object} payload.query 请求 query 数据。 * @return {Promise} 查询结果,成功时返回 items 数组。 */ async query(payload = {}) { - const { body = {}, query = {} } = payload; + const { body = {} } = payload; const { itemIds } = body; if (!Array.isArray(itemIds) || itemIds.length === 0) { return this.fail('itemIds 参数缺失或为空'); } - await this.resolveAppInfo(query.app_key); + const { storeId } = this.getInfo(); const items = []; for (const itemId of itemIds) { const result = await this.ctx.service.systems.stockStore.getItemStorages(itemId); if (result.success && result.data) { + // 按货主范围过滤:仅返回属于当前合约货主的库存 + if (Number(result.data.storage.storeId) !== Number(storeId)) { + continue; + } items.push({ itemId: result.data.stock.id, itemCode: result.data.stock.item_code, diff --git a/app/service/openapiMethods/order.js b/app/service/openapiMethods/order.js index 78adc1c..5365ab9 100644 --- a/app/service/openapiMethods/order.js +++ b/app/service/openapiMethods/order.js @@ -3,59 +3,13 @@ const MainService = require('../main'); class OpenapiOrderService extends MainService { - /** - * 通过 app_key 解析仓库与货主信息。 - * 查询 ApiApp 并关联 StoreWarehouse 以获取 storeId、warehouseId。 - * @param {string} appKey 开放接口 app_key。 - * @return {Promise} 包含 storeId、warehouseId、appKey、customerId、warehouseCode 的信息对象。 - */ - async resolveAppInfo(appKey) { - const { ctx, app } = this; - const normalizedAppKey = String(appKey || '').trim(); - if (!normalizedAppKey) { - throw new Error('app_key 缺失'); - } - - const appConfig = await ctx.model.ApiApp.findOne({ - attributes: [ - 'id', - 'warehouse_id', - [ app.Sequelize.col('contract.store_id'), 'store_id' ], - ], - where: { - self_app_key: normalizedAppKey, - is_enabled: 1, - }, - include: [ - { - model: ctx.model.StoreWarehouse, - as: 'contract', - attributes: [], - required: false, - }, - ], - raw: true, - }); - - if (!appConfig || !appConfig.warehouse_id) { - throw new Error(`无法解析仓库信息,请检查 app_key: ${normalizedAppKey}`); - } - - return { - storeId: appConfig.store_id || null, - warehouseId: appConfig.warehouse_id, - appKey: normalizedAppKey, - customerId: null, - warehouseCode: '', - }; - } - /** * 取消发货单。 + * 上下文(storeId/warehouseId/appKey)已由 dispatchOpenapiMethod 统一注入。 * 当前仅支持出库单类型(JYCK/HHCK/BFCK → ORDER),非出库单类型返回不支持。 * @param {Object} payload 调用参数。 * @param {Object} payload.body 请求体数据,包含 orderCode、orderType。 - * @param {Object} payload.query 请求 query 数据,包含 app_key。 + * @param {Object} payload.query 请求 query 数据。 * @return {Promise} 取消结果,成功时返回成功消息,失败时返回错误信息。 */ async cancel(payload = {}) { @@ -76,16 +30,16 @@ class OpenapiOrderService extends MainService { } try { - const info = await this.resolveAppInfo(query.app_key); + const { storeId, warehouseId, appKey: ctxAppKey } = this.getInfo(); - const DeliveryModel = await ctx.model.OrderDeliveryFactory.getCurrentModel(info.warehouseId); + const DeliveryModel = await ctx.model.OrderDeliveryFactory.getCurrentModel(warehouseId); const transaction = await ctx.model.transaction(); try { const existingOrder = await DeliveryModel.findOne({ where: { delivery_order_code: normalizedOrderCode, - warehouse_id: info.warehouseId, - store_id: info.storeId, + warehouse_id: warehouseId, + store_id: storeId, }, transaction, lock: transaction.LOCK.UPDATE, @@ -123,7 +77,7 @@ class OpenapiOrderService extends MainService { // 释放储位分配锁定库存 await this.releaseStockLockForCancel({ orderId: existingOrder.id, - warehouseId: info.warehouseId, + warehouseId, transaction, }); @@ -132,7 +86,7 @@ class OpenapiOrderService extends MainService { // 写入取消操作日志(不影响主流程) try { if (this.ctx.model && this.ctx.model.OperationLog) { - const appKey = String(query.app_key || '').trim(); + const appKey = String(query.app_key || ctxAppKey || '').trim(); await this.ctx.model.OperationLog.create({ business_type: 'order', business_id: String(existingOrder.id), @@ -140,7 +94,7 @@ class OpenapiOrderService extends MainService { operator_id: null, operator_name: appKey ? `openapi:${appKey}` : 'openapi', external_log_type: 'NONE', - warehouse_id: info.warehouseId || null, + warehouse_id: warehouseId || null, platform_code: appKey || 'SYSTEM', message: 'OpenAPI 取消订单', }); @@ -153,7 +107,7 @@ class OpenapiOrderService extends MainService { try { const callbackService = this.ctx.service.openapi && this.ctx.service.openapi.callback; if (callbackService && typeof callbackService.sendByAppKey === 'function') { - const appKey = String(query.app_key || '').trim(); + const appKey = String(query.app_key || ctxAppKey || '').trim(); if (appKey) { callbackService.sendByAppKey({ appKey, diff --git a/app/service/openapiMethods/singleitem.js b/app/service/openapiMethods/singleitem.js index 5aad33b..3fb2c87 100644 --- a/app/service/openapiMethods/singleitem.js +++ b/app/service/openapiMethods/singleitem.js @@ -8,70 +8,17 @@ const MainService = require('../main'); */ class OpenapiSingleitemService extends MainService { - /** - * 通过 app_key 解析仓库与货主信息。 - * 查询 ApiApp 并关联 StoreWarehouse 以获取 storeId、warehouseId。 - * warehouseCode 优先使用 qimen_warehouse_code,为空时回退使用 warehouseId; - * ownerCode 优先使用 store_id,为空时回退使用空字符串。 - * @param {string} appKey 开放接口 app_key。 - * @return {Promise} 包含 storeId、warehouseId、appKey、customerId、warehouseCode、ownerCode 的信息对象。 - */ - async resolveAppInfo(appKey) { - const { ctx, app } = this; - const normalizedAppKey = String(appKey || '').trim(); - if (!normalizedAppKey) { - throw new Error('app_key 缺失'); - } - - const appConfig = await ctx.model.ApiApp.findOne({ - attributes: [ - 'id', - 'warehouse_id', - 'qimen_warehouse_code', - [ app.Sequelize.col('contract.store_id'), 'store_id' ], - ], - where: { - self_app_key: normalizedAppKey, - is_enabled: 1, - }, - include: [ - { - model: ctx.model.StoreWarehouse, - as: 'contract', - attributes: [], - required: false, - }, - ], - raw: true, - }); - - if (!appConfig || !appConfig.warehouse_id) { - throw new Error(`无法解析仓库信息,请检查 app_key: ${normalizedAppKey}`); - } - - const warehouseId = appConfig.warehouse_id; - const storeId = appConfig.store_id || null; - - return { - storeId, - warehouseId, - appKey: normalizedAppKey, - customerId: null, - warehouseCode: appConfig.qimen_warehouse_code || String(warehouseId), - ownerCode: storeId ? String(storeId) : '', - }; - } - /** * 同步(新增或更新)单品信息。 + * 上下文(storeId/warehouseId/appKey/warehouseCode)已由 dispatchOpenapiMethod 统一注入。 * 将外部系统的商品数据写入 StockStore,并自动同步到库存表。 * @param {Object} payload 调用参数。 * @param {Object} payload.body 请求体数据,仅需包含 item;warehouseCode 和 ownerCode 由 app_key 自动解析,调用方不得传入。 - * @param {Object} payload.query 请求 query 数据,需包含 app_key。 + * @param {Object} payload.query 请求 query 数据。 * @return {Promise} 同步结果,成功时返回 itemId。 */ async synchronize(payload = {}) { - const { body = {}, query = {} } = payload; + const { body = {} } = payload; const { item } = body; if (!item || !item.itemCode) { @@ -79,7 +26,8 @@ class OpenapiSingleitemService extends MainService { } try { - const { storeId, warehouseId, appKey, warehouseCode, ownerCode } = await this.resolveAppInfo(query.app_key); + const { storeId, warehouseId, appKey, warehouseCode } = this.getInfo(); + const ownerCode = storeId ? String(storeId) : ''; const requestData = { warehouseCode: warehouseCode || '', @@ -103,14 +51,15 @@ class OpenapiSingleitemService extends MainService { /** * 查询单品详情。 + * 上下文(storeId)已由 dispatchOpenapiMethod 统一注入,查询按货主范围过滤。 * 根据 itemId 查询 StockStore 记录并转换为 OpenAPI 统一格式。 * @param {Object} payload 调用参数。 * @param {Object} payload.body 请求体数据,需包含 itemId。 - * @param {Object} payload.query 请求 query 数据,需包含 app_key。 + * @param {Object} payload.query 请求 query 数据。 * @return {Promise} 查询结果,成功时返回商品详情。 */ async query(payload = {}) { - const { body = {}, query = {} } = payload; + const { body = {} } = payload; const { itemId } = body; if (!itemId) { @@ -118,10 +67,14 @@ class OpenapiSingleitemService extends MainService { } try { - // 验证 app_key 有效性 - await this.resolveAppInfo(query.app_key); + const { storeId } = this.getInfo(); - const row = await this.ctx.model.StockStore.findByPk(itemId); + const row = await this.ctx.model.StockStore.findOne({ + where: { + id: itemId, + store_id: storeId, + }, + }); if (!row) { return this.fail(`商品不存在,itemId: ${itemId}`); } diff --git a/app/service/qimenMethods/stockout.js b/app/service/qimenMethods/stockout.js index 53abe3f..d7fa424 100644 --- a/app/service/qimenMethods/stockout.js +++ b/app/service/qimenMethods/stockout.js @@ -46,6 +46,13 @@ class stockoutServer extends MainService { for (let i = 0; i < orderLine.length; i++) { const line = orderLine[i]; const wmsStock = await app.model.StockStore.findByPk(line.itemId); + // 校验 StockStore 记录的 store_id 与当前上下文一致,防止跨货主越权 + if (wmsStock && Number(wmsStock.store_id) !== Number(this.storeId)) { + errors.push( + `SKU${line.itemId}商品《${line.itemName}》编码《${line.itemCode}》\n未同步推送到仓库` + ); + continue; + } if (!wmsStock) { errors.push( `SKU${line.itemId}商品《${line.itemName}》编码《${line.itemCode}》\n未同步推送到仓库` diff --git a/app/service/systems/delivery_order.js b/app/service/systems/delivery_order.js index d653447..ae7c1c1 100644 --- a/app/service/systems/delivery_order.js +++ b/app/service/systems/delivery_order.js @@ -1202,6 +1202,10 @@ class DeliveryOrderService extends Service { wms_stock = await app.model.StockStore.findOne({ where: stockWhere, transaction }); } else { wms_stock = await app.model.StockStore.findByPk(line.itemId, { transaction }); + // 校验 StockStore 记录的 store_id 与当前上下文一致,防止跨货主越权 + if (wms_stock && Number(wms_stock.store_id) !== Number(storeId)) { + wms_stock = null; + } } if (!wms_stock) { diff --git a/app/service/systems/entry_order.js b/app/service/systems/entry_order.js index 8056b22..a7fb0ac 100644 --- a/app/service/systems/entry_order.js +++ b/app/service/systems/entry_order.js @@ -42,6 +42,10 @@ class entryOrderService extends Service { }, transaction }); } else { wms_stock = await app.model.StockStore.findByPk(orderLine[i].itemId, { transaction }); + // 校验 StockStore 记录的 store_id 与当前上下文一致,防止跨货主越权 + if (wms_stock && Number(wms_stock.store_id) !== Number(storeId)) { + wms_stock = null; + } } if (!wms_stock) { errors.push(`SKU${orderLine[i].itemId}商品《${orderLine[i].itemName}》编码《${orderLine[i].itemCode}》\n未同步推送到仓库`);