ming #1

Merged
liufumingren merged 558 commits from ming into main 2026-11-18 16:13:25 +08:00
2 changed files with 5 additions and 4 deletions
Showing only changes of commit 61467756e2 - Show all commits

View File

@ -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}`);

View File

@ -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(