diff --git a/src/enums/base.enum.ts b/src/enums/base.enum.ts index bcdf0f9..aab088b 100644 --- a/src/enums/base.enum.ts +++ b/src/enums/base.enum.ts @@ -31,16 +31,18 @@ export enum StockRecordOperationType { IN = 'in', OUT = 'out', } - +// Order status. Options: pending, processing, on-hold, completed, cancelled, refunded, failed and trash. Default is pending. +// 原始订单状态 export enum OrderStatus { - PENDING = 'pending', - PROCESSING = 'processing', - COMPLETED = 'completed', - ON_HOLD = 'on-hold', - CANCEL = 'cancelled', - REFUNDED = 'refunded', - FAILED = 'failed', - DRAFT = 'draft', + PENDING = 'pending', // default // 待付款 + PROCESSING = 'processing', // 正在处理 + ON_HOLD = 'on-hold', // 保留 + COMPLETED = 'completed', // 已完成 + CANCEL = 'cancelled', // 已取消 + REFUNDED = 'refunded', // 已退款 + FAILED = 'failed', // 失败订单 + DRAFT = 'draft', // 草稿 + // TRASH = 'trash', REFUND_REQUESTED = 'refund_requested', // 已申请退款 REFUND_APPROVED = 'refund_approved', // 退款申请已通过 REFUND_CANCELLED = 'refund_cancelled', // 已取消退款 diff --git a/src/service/order.service.ts b/src/service/order.service.ts index 4b20519..ebf9ac3 100644 --- a/src/service/order.service.ts +++ b/src/service/order.service.ts @@ -111,7 +111,37 @@ export class OrderService { const order = await this.wPService.getOrder(siteId, orderId); await this.syncSingleOrder(siteId, order, true); } + // 订单状态切换表 + orderAutoNextStatusMap = { + [OrderStatus.REFUND_APPROVED]: OrderStatus.ON_HOLD, // 退款申请已通过转为 on-hold + [OrderStatus.REFUND_CANCELLED]: OrderStatus.REFUNDED // 已取消退款转为 refunded + } + // 由于 wordpress 订单状态和 我们的订单状态 不一致,需要做转换 + async autoUpdateOrderStatus(siteId: string, order: any) { + console.log('更新订单状态', order) + // 其他状态保持不变 + const originStatus = order.status; + // 如果有值就赋值 + if (this.orderAutoNextStatusMap[originStatus]) { + order.status = this.orderAutoNextStatusMap[originStatus]; + } + const shouldSync = originStatus !== order.status; + if (!shouldSync) return; + try { + const site = this.sites.find(v => v.id === siteId); + if (!site) { + throw new Error(`更新订单信息,但失败,原因为 ${siteId} 的站点信息不存在`) + } + // 同步更新回 wordpress 的 order 状态 + await this.wPService.updateOrder(site, order.id, { status: order.status }); + } catch (error) { + console.error('更新订单状态失败,原因为:', error) + // 回滚到原始状态 + order.status = originStatus; + } + } + // wordpress 发来, async syncSingleOrder(siteId: string, order: any, forceUpdate = false) { let { line_items, @@ -121,9 +151,12 @@ export class OrderService { refunds, ...orderData } = order; + console.log('同步进单个订单', order) const existingOrder = await this.orderModel.findOne({ where: { externalOrderId: order.id, siteId: siteId }, }); + // 更新状态 + await this.autoUpdateOrderStatus(siteId, order); const orderId = (await this.saveOrder(siteId, orderData)).id; const externalOrderId = order.id; if (