From 1ea2bc48f7386a8f6bcf3d7fb0e5e8c7663734cc Mon Sep 17 00:00:00 2001 From: liufumingren Date: Wed, 12 Aug 2026 22:54:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Qimen=20sync=20cancel=20+=20pendingOrder?= =?UTF-8?q?=20cancel=20=E8=A1=A5=E8=BF=90=E5=8D=95=20is=5Fintercept=20?= =?UTF-8?q?=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Qimen cancel(syncStatus=fin): 补 is_intercept='Y' - pendingOrder.cancelOrder(synced): 补 is_intercept='Y' --- app/service/qimenMethods/order.js | 12 ++++++++++++ app/service/systemMethods/order/pendingOrder.js | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/app/service/qimenMethods/order.js b/app/service/qimenMethods/order.js index dc40180..ab162cd 100644 --- a/app/service/qimenMethods/order.js +++ b/app/service/qimenMethods/order.js @@ -259,6 +259,18 @@ class orderServer extends MainService { transaction, }); + // 同步更新运单表拦截标记 + try { + await ctx.model.OrderExpress.update( + { is_intercept: 'Y' }, + { where: { order_id: existingOrder.id, warehouse_id: info.warehouseId }, transaction } + ); + } catch (expressErr) { + ctx.logger.warn( + `[qimen order cancel] 更新运单拦截标记失败(sync), orderId=${existingOrder.id}, error=${expressErr.message}` + ); + } + await transaction.commit(); await this.sendCancelInterceptNotice({ orderCode, diff --git a/app/service/systemMethods/order/pendingOrder.js b/app/service/systemMethods/order/pendingOrder.js index 1c155f4..1f6d911 100644 --- a/app/service/systemMethods/order/pendingOrder.js +++ b/app/service/systemMethods/order/pendingOrder.js @@ -2294,6 +2294,18 @@ class PendingOrderService extends OrderBaseService { }, } ); + // 同步更新运单表拦截标记 + try { + const { Op: cancelOp } = this.app.Sequelize; + await this.ctx.model.OrderExpress.update( + { is_intercept: 'Y' }, + { where: { order_id: { [cancelOp.in]: syncedOrderIds }, warehouse_id: warehouseId } } + ); + } catch (expressErr) { + this.ctx.logger.warn( + `[PendingOrderService.cancelOrder] 更新运单拦截标记失败, count=${syncedOrderIds.length}, error=${expressErr.message}` + ); + } this.ctx.logger.info( `[PendingOrderService.cancelOrder] 订单已同步,不可取消,已转为拦截处理,订单ID: ${syncedOrderIds.join(',')}` );