From c9342396df535f6b0e98f0b1c8d241014dc2b034 Mon Sep 17 00:00:00 2001 From: tikkhun Date: Tue, 14 Oct 2025 11:58:14 +0800 Subject: [PATCH] =?UTF-8?q?refactor(enums):=20=E7=BB=9F=E4=B8=80=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E7=9B=B8=E5=85=B3=E7=8A=B6=E6=80=81=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E4=BB=8EREFUND=E6=94=B9=E4=B8=BARETURN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将订单状态和ERP订单状态中的退款相关枚举值从REFUND_前缀改为RETURN_前缀,保持命名一致性 --- src/enums/base.enum.ts | 13 +++++++------ src/service/order.service.ts | 16 ++++++++-------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/enums/base.enum.ts b/src/enums/base.enum.ts index aab088b..70ce3b6 100644 --- a/src/enums/base.enum.ts +++ b/src/enums/base.enum.ts @@ -43,9 +43,10 @@ export enum OrderStatus { FAILED = 'failed', // 失败订单 DRAFT = 'draft', // 草稿 // TRASH = 'trash', - REFUND_REQUESTED = 'refund_requested', // 已申请退款 - REFUND_APPROVED = 'refund_approved', // 退款申请已通过 - REFUND_CANCELLED = 'refund_cancelled', // 已取消退款 + // refund 也就是退款相关的状态 + RETURN_REQUESTED = 'return-requested', // 已申请退款 + RETURN_APPROVED = 'return-approved', // 退款申请已通过 + RETURN_CANCELLED = 'return-cancelled', // 已取消退款 } export enum ErpOrderStatus { @@ -58,9 +59,9 @@ export enum ErpOrderStatus { AFTER_SALE_PROCESSING = 'after_sale_pending', // 售后处理中 PENDING_RESHIPMENT = 'pending_reshipment', // 待补发 PENDING_REFUND = 'pending_refund', // 待退款 - REFUND_REQUESTED = 'refund_requested', // 已申请退款 - REFUND_APPROVED = 'refund_approved', // 退款申请已通过 - REFUND_CANCELLED = 'refund_cancelled', // 已取消退款 + RETURN_REQUESTED = 'return-requested', // 已申请退款 + RETURN_APPROVED = 'return-approved', // 退款申请已通过 + RETURN_CANCELLED = 'return-cancelled', // 已取消退款 } export enum ShipmentType { diff --git a/src/service/order.service.ts b/src/service/order.service.ts index ebf9ac3..c611280 100644 --- a/src/service/order.service.ts +++ b/src/service/order.service.ts @@ -113,8 +113,8 @@ export class OrderService { } // 订单状态切换表 orderAutoNextStatusMap = { - [OrderStatus.REFUND_APPROVED]: OrderStatus.ON_HOLD, // 退款申请已通过转为 on-hold - [OrderStatus.REFUND_CANCELLED]: OrderStatus.REFUNDED // 已取消退款转为 refunded + [OrderStatus.RETURN_APPROVED]: OrderStatus.ON_HOLD, // 退款申请已通过转为 on-hold + [OrderStatus.RETURN_CANCELLED]: OrderStatus.REFUNDED // 已取消退款转为 refunded } // 由于 wordpress 订单状态和 我们的订单状态 不一致,需要做转换 async autoUpdateOrderStatus(siteId: string, order: any) { @@ -296,12 +296,12 @@ export class OrderService { return ErpOrderStatus.REFUNDED; case OrderStatus.FAILED: return ErpOrderStatus.FAILED; - case OrderStatus.REFUND_REQUESTED: - return ErpOrderStatus.REFUND_REQUESTED; - case OrderStatus.REFUND_APPROVED: - return ErpOrderStatus.REFUND_APPROVED; - case OrderStatus.REFUND_CANCELLED: - return ErpOrderStatus.REFUND_CANCELLED; + case OrderStatus.RETURN_REQUESTED: + return ErpOrderStatus.RETURN_REQUESTED; + case OrderStatus.RETURN_APPROVED: + return ErpOrderStatus.RETURN_APPROVED; + case OrderStatus.RETURN_CANCELLED: + return ErpOrderStatus.RETURN_CANCELLED; default: return ErpOrderStatus.PENDING; }