Compare commits
10 Commits
823967a268
...
b8dc335932
| Author | SHA1 | Date |
|---|---|---|
|
|
b8dc335932 | |
|
|
0d25078380 | |
|
|
aa4d3ef830 | |
|
|
677b11c48f | |
|
|
16cd48e503 | |
|
|
1628c8de41 | |
|
|
bc2ed4615e | |
|
|
0f5610e02e | |
|
|
450105972b | |
|
|
b985fb8509 |
|
|
@ -42,7 +42,6 @@ export enum OrderStatus {
|
||||||
REFUNDED = 'refunded', // 已退款
|
REFUNDED = 'refunded', // 已退款
|
||||||
FAILED = 'failed', // 失败订单
|
FAILED = 'failed', // 失败订单
|
||||||
DRAFT = 'draft', // 草稿
|
DRAFT = 'draft', // 草稿
|
||||||
AUTO_DRAFT = 'auto-draft', // 自动草稿(TODO:不知道为什么出现)
|
|
||||||
|
|
||||||
// TRASH = 'trash',
|
// TRASH = 'trash',
|
||||||
// refund 也就是退款相关的状态
|
// refund 也就是退款相关的状态
|
||||||
|
|
|
||||||
|
|
@ -163,14 +163,11 @@ export class OrderService {
|
||||||
});
|
});
|
||||||
// 矫正状态
|
// 矫正状态
|
||||||
await this.autoUpdateOrderStatus(siteId, order);
|
await this.autoUpdateOrderStatus(siteId, order);
|
||||||
if (order.status === OrderStatus.AUTO_DRAFT) {
|
// 矫正数据库状态
|
||||||
return;
|
await this.orderModel.update({ externalOrderId: order.id, siteId: siteId }, {
|
||||||
}
|
orderStatus: order.status,
|
||||||
// 更新订单
|
})
|
||||||
if (existingOrder) {
|
const externalOrderId = order.id;
|
||||||
await this.orderModel.update({ id: existingOrder.id }, { orderStatus: this.mapOrderStatus(order.status) });
|
|
||||||
}
|
|
||||||
const externalOrderId = order.id;
|
|
||||||
if (
|
if (
|
||||||
existingOrder &&
|
existingOrder &&
|
||||||
existingOrder.orderStatus !== ErpOrderStatus.COMPLETED &&
|
existingOrder.orderStatus !== ErpOrderStatus.COMPLETED &&
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue