核心改动: - openapi.js: 新增 resolveOpenapiContract 强制合约解析(required:true JOIN), dispatchOpenapiMethod 统一注入上下文(setInfo) - 5个 openapiMethods: 移除重复 resolveAppInfo, 统一使用 this.getInfo() - deliveryorder/entryorder/stockout: findByPk(itemId) 后增加 store_id 一致性校验 安全修复: - 修复 itemId 路径跨货主越权漏洞(FindByPk 无 store_id 过滤) - deliveryorder/inventory/singleitem 查询补全 store_id 过滤 - 合约缺失返回 403 而非穿透业务层 测试覆盖: 9方法×3层防护(合约/注入/过滤)全部通过集成测试
293 lines
9.9 KiB
JavaScript
293 lines
9.9 KiB
JavaScript
'use strict';
|
||
|
||
const MainService = require('../main');
|
||
|
||
class OpenapiOrderService extends MainService {
|
||
/**
|
||
* 取消发货单。
|
||
* 上下文(storeId/warehouseId/appKey)已由 dispatchOpenapiMethod 统一注入。
|
||
* 当前仅支持出库单类型(JYCK/HHCK/BFCK → ORDER),非出库单类型返回不支持。
|
||
* @param {Object} payload 调用参数。
|
||
* @param {Object} payload.body 请求体数据,包含 orderCode、orderType。
|
||
* @param {Object} payload.query 请求 query 数据。
|
||
* @return {Promise<Object>} 取消结果,成功时返回成功消息,失败时返回错误信息。
|
||
*/
|
||
async cancel(payload = {}) {
|
||
const { ctx } = this;
|
||
const { body = {}, query = {} } = payload;
|
||
const { orderCode } = body;
|
||
const orderType = String(body.orderType || 'JYCK').trim().toUpperCase();
|
||
|
||
// 出库单类型映射:JYCK / HHCK / BFCK → ORDER
|
||
const ORDER_TYPES = [ 'JYCK', 'HHCK', 'BFCK' ];
|
||
if (!ORDER_TYPES.includes(orderType)) {
|
||
return this.fail('暂不支持该订单类型的取消操作');
|
||
}
|
||
|
||
const normalizedOrderCode = String(orderCode || '').trim();
|
||
if (!normalizedOrderCode) {
|
||
return this.fail('orderCode 参数缺失');
|
||
}
|
||
|
||
try {
|
||
const { storeId, warehouseId, appKey: ctxAppKey } = this.getInfo();
|
||
|
||
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: warehouseId,
|
||
store_id: storeId,
|
||
},
|
||
transaction,
|
||
lock: transaction.LOCK.UPDATE,
|
||
});
|
||
|
||
if (!existingOrder) {
|
||
await transaction.rollback();
|
||
return this.fail('未找到对应的订单');
|
||
}
|
||
|
||
const pickStatus = String(existingOrder.pick_status || 'none').trim();
|
||
const printStatus = String(existingOrder.print_status || 'none').trim();
|
||
|
||
if (pickStatus !== 'none' || printStatus !== 'none') {
|
||
await existingOrder.update({
|
||
intercept_status: 'intercepting',
|
||
updated_at: new Date(),
|
||
}, {
|
||
transaction,
|
||
});
|
||
|
||
await transaction.commit();
|
||
return this.fail('取消失败,已通知拦截执行');
|
||
}
|
||
|
||
await existingOrder.update({
|
||
status: 'cancel',
|
||
outbound_status: 'fin',
|
||
step: 4,
|
||
updated_at: new Date(),
|
||
}, {
|
||
transaction,
|
||
});
|
||
|
||
// 释放储位分配锁定库存
|
||
await this.releaseStockLockForCancel({
|
||
orderId: existingOrder.id,
|
||
warehouseId,
|
||
transaction,
|
||
});
|
||
|
||
await transaction.commit();
|
||
|
||
// 写入取消操作日志(不影响主流程)
|
||
try {
|
||
if (this.ctx.model && this.ctx.model.OperationLog) {
|
||
const appKey = String(query.app_key || ctxAppKey || '').trim();
|
||
await this.ctx.model.OperationLog.create({
|
||
business_type: 'order',
|
||
business_id: String(existingOrder.id),
|
||
operation_code: 'ORDER_CANCEL',
|
||
operator_id: null,
|
||
operator_name: appKey ? `openapi:${appKey}` : 'openapi',
|
||
external_log_type: 'NONE',
|
||
warehouse_id: warehouseId || null,
|
||
platform_code: appKey || 'SYSTEM',
|
||
message: 'OpenAPI 取消订单',
|
||
});
|
||
}
|
||
} catch (logErr) {
|
||
this.ctx.logger.warn('[OpenapiOrderCancel] 写入取消操作日志失败,不影响主流程', logErr);
|
||
}
|
||
|
||
// 取消成功后触发 OpenAPI 回调通知(fire-and-forget,不阻塞主流程)
|
||
try {
|
||
const callbackService = this.ctx.service.openapi && this.ctx.service.openapi.callback;
|
||
if (callbackService && typeof callbackService.sendByAppKey === 'function') {
|
||
const appKey = String(query.app_key || ctxAppKey || '').trim();
|
||
if (appKey) {
|
||
callbackService.sendByAppKey({
|
||
appKey,
|
||
event: 'order_cancelled',
|
||
data: {
|
||
orderCode,
|
||
status: 'cancelled',
|
||
},
|
||
}).catch(err => {
|
||
this.ctx.logger.warn('[OpenapiOrderCancel] 回调忽略失败: %s', err.message);
|
||
});
|
||
}
|
||
}
|
||
} catch (err) {
|
||
this.ctx.logger.warn('[OpenapiOrderCancel] 触发回调异常,不影响主流程: %s', err.message);
|
||
}
|
||
|
||
return this.success('取消订单成功');
|
||
} catch (error) {
|
||
try {
|
||
await transaction.rollback();
|
||
} catch (rollbackError) {
|
||
ctx.logger.error(`取消订单回滚失败: ${rollbackError.message}`);
|
||
}
|
||
ctx.logger.error(`取消订单失败: ${error.message}`);
|
||
return this.fail(error.message || '取消订单失败');
|
||
}
|
||
} catch (error) {
|
||
return this.fail(`取消订单失败: ${error.message}`);
|
||
}
|
||
}
|
||
|
||
/**
|
||
* 取消订单时释放储位分配锁定库存。
|
||
* - 有 wms_picking 记录时:释放 wms_storage.locked_quantity 与 wms_stock_warehouse.locked_quantity,
|
||
* 并删除对应的 wms_picking 分配记录。
|
||
* - 无 wms_picking 记录时:从 wms_order_items 查询该订单的 stock_id 与 plan_qty,
|
||
* 只释放 wms_stock_warehouse.locked_quantity。
|
||
*
|
||
* @param {Object} options - 释放参数。
|
||
* @param {number} options.orderId - 订单ID。
|
||
* @param {number} options.warehouseId - 仓库ID。
|
||
* @param {Object} options.transaction - 数据库事务对象。
|
||
* @return {Promise<void>}
|
||
*/
|
||
async releaseStockLockForCancel({ orderId, warehouseId, transaction } = {}) {
|
||
const { ctx, app } = this;
|
||
const { Op } = app.Sequelize;
|
||
|
||
if (!orderId || !warehouseId) {
|
||
return;
|
||
}
|
||
|
||
const pickingModel = ctx.model.Picking;
|
||
const storageModel = ctx.model.Storage;
|
||
const stockModel = ctx.model.StockWarehouse;
|
||
|
||
if (!pickingModel || !storageModel || !stockModel) {
|
||
ctx.logger.warn('[openapi order.cancel releaseStockLockForCancel] 模型不可用,跳过库存释放');
|
||
return;
|
||
}
|
||
|
||
// 查找该订单的有效分配记录
|
||
const pickingRows = await pickingModel.findAll({
|
||
where: {
|
||
order_id: orderId,
|
||
status: { [Op.ne]: 'cancel' },
|
||
},
|
||
transaction,
|
||
lock: transaction.LOCK.UPDATE,
|
||
raw: true,
|
||
});
|
||
|
||
if (!Array.isArray(pickingRows) || pickingRows.length === 0) {
|
||
// 无储位分配记录:从订单明细获取锁定信息,只释放 stock_warehouse 锁
|
||
const orderItemsModel = await ctx.model.OrderItemsFactory.getCurrentModel(warehouseId);
|
||
if (!orderItemsModel) {
|
||
ctx.logger.warn('[openapi order.cancel releaseStockLockForCancel] OrderItems 模型不可用,跳过库存释放');
|
||
return;
|
||
}
|
||
|
||
const orderItems = await orderItemsModel.findAll({
|
||
where: { order_id: orderId },
|
||
attributes: [ 'stock_id', 'plan_qty' ],
|
||
raw: true,
|
||
transaction,
|
||
});
|
||
|
||
for (const item of orderItems) {
|
||
const stockId = Number(item.stock_id || 0);
|
||
const qty = Number(item.plan_qty || 0);
|
||
if (stockId <= 0 || qty <= 0) continue;
|
||
|
||
await ctx.service.systems.stockStore.updateLockedQuantity(stockId, -qty, transaction, {
|
||
remark: 'OpenAPI取消订单-释放创建锁',
|
||
orderType: 'ORDER_CANCEL',
|
||
orderNo: String(orderId),
|
||
orderId,
|
||
});
|
||
}
|
||
return;
|
||
}
|
||
|
||
// 按 storage_id 汇总释放数量
|
||
const storageQuantityMap = new Map();
|
||
for (const row of pickingRows) {
|
||
const storageId = Number(row.storage_id || 0);
|
||
const quantity = Number(row.quantity || 0);
|
||
if (storageId > 0 && quantity > 0) {
|
||
storageQuantityMap.set(storageId, (storageQuantityMap.get(storageId) || 0) + quantity);
|
||
}
|
||
}
|
||
|
||
if (storageQuantityMap.size === 0) {
|
||
return;
|
||
}
|
||
|
||
// 查出关联的 wms_storage 记录,获取 stock_id
|
||
const storageIds = Array.from(storageQuantityMap.keys());
|
||
const storageRows = await storageModel.findAll({
|
||
where: {
|
||
id: { [Op.in]: storageIds },
|
||
},
|
||
transaction,
|
||
lock: transaction.LOCK.UPDATE,
|
||
raw: true,
|
||
});
|
||
|
||
const storageMap = new Map();
|
||
for (const row of storageRows) {
|
||
storageMap.set(Number(row.id), row);
|
||
}
|
||
|
||
// 依次释放 wms_storage 与 wms_stock_warehouse 锁定数量
|
||
for (const [ storageId, quantity ] of storageQuantityMap.entries()) {
|
||
const storageRow = storageMap.get(storageId);
|
||
if (!storageRow) {
|
||
ctx.logger.warn(`[openapi order.cancel] 库存记录不存在,跳过: storageId=${storageId}`);
|
||
continue;
|
||
}
|
||
|
||
const stockId = Number(storageRow.stock_id || 0);
|
||
if (stockId <= 0) {
|
||
ctx.logger.warn(`[openapi order.cancel] 库存记录缺少 stock_id,跳过: storageId=${storageId}`);
|
||
continue;
|
||
}
|
||
|
||
// 释放 wms_storage.locked_quantity
|
||
await ctx.service.systems.storage.index.unlockQuantity(storageId, quantity, { transaction });
|
||
|
||
// 释放 wms_stock_warehouse.locked_quantity
|
||
const releaseResult = await ctx.service.systems.stockStore.updateLockedQuantity(
|
||
stockId, -Number(quantity), transaction, {
|
||
remark: 'OpenAPI取消订单-释放储位锁',
|
||
orderType: 'ORDER_CANCEL',
|
||
orderNo: String(orderId),
|
||
orderId,
|
||
}
|
||
);
|
||
|
||
if (!releaseResult.success) {
|
||
throw new Error(`库存主记录释放失败: stockId=${stockId}, ${releaseResult.error}`);
|
||
}
|
||
}
|
||
|
||
// 删除已释放的分配记录
|
||
const pickingIds = pickingRows
|
||
.map(row => Number(row.id || 0))
|
||
.filter(id => id > 0);
|
||
|
||
if (pickingIds.length > 0) {
|
||
await pickingModel.destroy({
|
||
where: {
|
||
id: { [Op.in]: pickingIds },
|
||
},
|
||
transaction,
|
||
});
|
||
}
|
||
}
|
||
}
|
||
|
||
module.exports = OpenapiOrderService;
|