diff --git a/src/config/config.local.ts b/src/config/config.local.ts index 579f220..a05235b 100644 --- a/src/config/config.local.ts +++ b/src/config/config.local.ts @@ -17,7 +17,7 @@ export default { default: { host: 'localhost', username: 'root', - password: '123456', + password: '12345678', }, }, }, diff --git a/src/enums/base.enum.ts b/src/enums/base.enum.ts index b07728d..bcdf0f9 100644 --- a/src/enums/base.enum.ts +++ b/src/enums/base.enum.ts @@ -41,6 +41,9 @@ export enum OrderStatus { REFUNDED = 'refunded', FAILED = 'failed', DRAFT = 'draft', + REFUND_REQUESTED = 'refund_requested', // 已申请退款 + REFUND_APPROVED = 'refund_approved', // 退款申请已通过 + REFUND_CANCELLED = 'refund_cancelled', // 已取消退款 } export enum ErpOrderStatus { @@ -50,10 +53,12 @@ export enum ErpOrderStatus { CANCEL = 'cancelled', //已取消 REFUNDED = 'refunded', //已退款 FAILED = 'failed', //失败 - 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', // 已取消退款 } export enum ShipmentType { diff --git a/src/service/order.service.ts b/src/service/order.service.ts index a37045c..7dd42b7 100644 --- a/src/service/order.service.ts +++ b/src/service/order.service.ts @@ -263,6 +263,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; default: return ErpOrderStatus.PENDING; }