From 61467756e231a8a3a57727fc4e72f0ab4ad6e067 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Wed, 12 Aug 2026 22:39:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20after=5Fsale=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=20order=5Fid=20=E2=80=94=20=E5=BC=83?= =?UTF-8?q?=E7=94=A8=20order=5Fdelivery=5Fid=20=E5=86=99=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - systemMethods/afterSale create: order_delivery_id → order_id - systemMethods/afterSale _resolveRedundantFields: order_delivery_no → order_no - systems/afterSale _enrichAfterSaleDetail: 仅使用 order_id --- app/service/systemMethods/afterSale.js | 6 +++--- app/service/systems/afterSale.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/service/systemMethods/afterSale.js b/app/service/systemMethods/afterSale.js index a9ddb13..1340900 100644 --- a/app/service/systemMethods/afterSale.js +++ b/app/service/systemMethods/afterSale.js @@ -314,8 +314,8 @@ class AfterSaleMethodService extends MainService { status: 'pending', waybill_id: waybillId || null, waybill_no: redundantFields.waybill_no || null, - order_delivery_id: orderDeliveryId || null, - order_delivery_no: redundantFields.order_delivery_no || null, + order_id: orderDeliveryId || null, + order_no: redundantFields.order_no || null, entry_order_id: entryOrderId || null, entry_order_no: redundantFields.entry_order_no || null, order_stockout_id: orderStockoutId || null, @@ -373,7 +373,7 @@ class AfterSaleMethodService extends MainService { attributes: [ 'delivery_order_code' ], raw: true, }); - redundant.order_delivery_no = order ? order.delivery_order_code || null : null; + redundant.order_no = order ? order.delivery_order_code || null : null; } } catch (err) { ctx.logger.warn(`[afterSale._resolveRedundantFields] 查询发货订单号失败: ${err.message}`); diff --git a/app/service/systems/afterSale.js b/app/service/systems/afterSale.js index 24d4692..b6de78e 100644 --- a/app/service/systems/afterSale.js +++ b/app/service/systems/afterSale.js @@ -341,7 +341,8 @@ class AfterSaleService extends Service { const related = {}; // ======= 1. 关联订单详情 ======= - const resolvedOrderId = afterSale.order_delivery_id || afterSale.order_id; + // 统一使用 order_id + const resolvedOrderId = afterSale.order_id; if (resolvedOrderId) { try { related.order = await this._resolveOrderDetail(