@pisell/pisellos 2.2.263 → 2.2.265
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/modules/Order/index.d.ts +27 -8
- package/dist/modules/Order/index.js +736 -473
- package/dist/modules/Order/payment-utils.d.ts +26 -0
- package/dist/modules/Order/payment-utils.js +225 -0
- package/dist/modules/Order/types.d.ts +33 -1
- package/dist/modules/Order/utils/orderCollectionIdentity.js +7 -2
- package/dist/modules/Order/utils.js +8 -5
- package/dist/modules/Payment/index.d.ts +2 -0
- package/dist/modules/Payment/index.js +78 -49
- package/dist/modules/Payment/types.d.ts +26 -24
- package/dist/modules/Payment/types.js +2 -0
- package/dist/server/index.d.ts +16 -0
- package/dist/server/index.js +1940 -1043
- package/dist/server/modules/order/index.d.ts +49 -4
- package/dist/server/modules/order/index.js +1577 -698
- package/dist/server/modules/order/types.d.ts +11 -3
- package/dist/server/modules/order/types.js +1 -1
- package/dist/solution/BaseSales/index.d.ts +33 -3
- package/dist/solution/BaseSales/index.js +653 -340
- package/dist/solution/BaseSales/utils/parseSalesResponse.d.ts +6 -1
- package/dist/solution/BookingByStep/index.d.ts +1 -1
- package/dist/solution/BookingTicket/index.js +2 -1
- package/dist/solution/Sales/index.d.ts +1 -0
- package/dist/solution/Sales/index.js +10 -2
- package/dist/utils/payment-number.d.ts +9 -0
- package/dist/utils/payment-number.js +69 -0
- package/lib/model/strategy/adapter/promotion/index.js +49 -0
- package/lib/modules/Order/index.d.ts +27 -8
- package/lib/modules/Order/index.js +180 -60
- package/lib/modules/Order/payment-utils.d.ts +26 -0
- package/lib/modules/Order/payment-utils.js +224 -0
- package/lib/modules/Order/types.d.ts +33 -1
- package/lib/modules/Order/utils/orderCollectionIdentity.js +3 -0
- package/lib/modules/Order/utils.js +5 -3
- package/lib/modules/Payment/index.d.ts +2 -0
- package/lib/modules/Payment/index.js +33 -12
- package/lib/modules/Payment/types.d.ts +26 -24
- package/lib/server/index.d.ts +16 -0
- package/lib/server/index.js +670 -18
- package/lib/server/modules/order/index.d.ts +49 -4
- package/lib/server/modules/order/index.js +657 -66
- package/lib/server/modules/order/types.d.ts +11 -3
- package/lib/solution/BaseSales/index.d.ts +33 -3
- package/lib/solution/BaseSales/index.js +193 -9
- package/lib/solution/BaseSales/utils/parseSalesResponse.d.ts +6 -1
- package/lib/solution/BookingByStep/index.d.ts +1 -1
- package/lib/solution/BookingTicket/index.js +2 -1
- package/lib/solution/Sales/index.d.ts +1 -0
- package/lib/solution/Sales/index.js +5 -3
- package/lib/utils/payment-number.d.ts +9 -0
- package/lib/utils/payment-number.js +64 -0
- package/package.json +1 -1
|
@@ -37,6 +37,7 @@ var import_dayjs = __toESM(require("dayjs"));
|
|
|
37
37
|
var import_BaseModule = require("../../../modules/BaseModule");
|
|
38
38
|
var import_orderCollectionIdentity = require("../../../modules/Order/utils/orderCollectionIdentity");
|
|
39
39
|
var import_types = require("./types");
|
|
40
|
+
var import_payment_utils = require("../../../modules/Order/payment-utils");
|
|
40
41
|
var INDEXDB_STORE_NAME = "orders";
|
|
41
42
|
var ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY = "server_order_last_full_fetch_at";
|
|
42
43
|
var ORDER_SYNC_THROTTLE_MS_STORAGE_KEY = "order_sync_throttle_ms";
|
|
@@ -46,10 +47,13 @@ var ORDER_SILENT_REFRESH_MIN_INTERVAL_MS = 3e4;
|
|
|
46
47
|
var ORDER_BUSINESS_WRITE_SOURCES = /* @__PURE__ */ new Set([
|
|
47
48
|
"upsertOrdersFromRemote",
|
|
48
49
|
"upsertPendingSyncOrders",
|
|
50
|
+
"upsertLocalDraftOrders",
|
|
49
51
|
"overwriteExistingOrder",
|
|
50
|
-
"markOrderSyncedByExternalSaleNumber"
|
|
52
|
+
"markOrderSyncedByExternalSaleNumber",
|
|
53
|
+
"updateLocalPayment"
|
|
51
54
|
]);
|
|
52
55
|
var ORDER_MERGE_SELF_CHECK = false;
|
|
56
|
+
var PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER = "__pisell_os_pending_payment_without_unique_number__";
|
|
53
57
|
var ORDER_AUTHORITATIVE_COLLECTION_FIELDS = ["products", "bookings", "payments"];
|
|
54
58
|
var ORDER_COLLECTION_KIND_BY_FIELD = {
|
|
55
59
|
products: "product",
|
|
@@ -100,7 +104,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
100
104
|
this.updateCreateStore();
|
|
101
105
|
}
|
|
102
106
|
if (Array.isArray((_a = options == null ? void 0 : options.initialState) == null ? void 0 : _a.list)) {
|
|
103
|
-
this.store.list =
|
|
107
|
+
this.store.list = this.normalizeOrdersForMemoryList(
|
|
108
|
+
options.initialState.list,
|
|
109
|
+
"initialState"
|
|
110
|
+
);
|
|
104
111
|
this.syncOrdersMap();
|
|
105
112
|
this.emitOrdersChanged([], "initialState");
|
|
106
113
|
} else {
|
|
@@ -166,7 +173,35 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
166
173
|
* 仅记录计数与订单标识,不输出商品、预约、支付或客户明细。
|
|
167
174
|
*/
|
|
168
175
|
normalizeOrderCollectionsForIngress(order, source) {
|
|
169
|
-
const
|
|
176
|
+
const sourceOrder = (0, import_lodash_es.cloneDeep)(order);
|
|
177
|
+
const sourceOrderRecord = sourceOrder;
|
|
178
|
+
if (Array.isArray(sourceOrderRecord.payments)) {
|
|
179
|
+
sourceOrderRecord.payments = sourceOrderRecord.payments.map((payment) => {
|
|
180
|
+
if (!(0, import_payment_utils.isPendingOrderPayment)(payment) || (0, import_payment_utils.getOrderPaymentIdentityKeys)(payment).some((key) => key.startsWith("unique_payment_number:"))) {
|
|
181
|
+
return payment;
|
|
182
|
+
}
|
|
183
|
+
return {
|
|
184
|
+
...payment,
|
|
185
|
+
[PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER]: true
|
|
186
|
+
};
|
|
187
|
+
});
|
|
188
|
+
}
|
|
189
|
+
const result = (0, import_orderCollectionIdentity.normalizeOrderCollections)(sourceOrder);
|
|
190
|
+
const normalizedOrderRecord = result.order;
|
|
191
|
+
if (Array.isArray(normalizedOrderRecord.payments)) {
|
|
192
|
+
normalizedOrderRecord.payments = normalizedOrderRecord.payments.map(
|
|
193
|
+
(payment) => {
|
|
194
|
+
if (!(payment == null ? void 0 : payment[PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER]))
|
|
195
|
+
return payment;
|
|
196
|
+
const nextPayment = { ...payment };
|
|
197
|
+
const metadata = { ...nextPayment.metadata || {} };
|
|
198
|
+
delete metadata.unique_payment_number;
|
|
199
|
+
delete nextPayment[PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER];
|
|
200
|
+
nextPayment.metadata = metadata;
|
|
201
|
+
return nextPayment;
|
|
202
|
+
}
|
|
203
|
+
);
|
|
204
|
+
}
|
|
170
205
|
const kinds = ["product", "booking", "payment"];
|
|
171
206
|
const hasChanges = kinds.some((kind) => {
|
|
172
207
|
const stats = result.stats[kind];
|
|
@@ -202,9 +237,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
202
237
|
/**
|
|
203
238
|
* incoming 决定权威成员集合;同一持久化行仍从 existing 补齐 incoming 省略的本地展示字段。
|
|
204
239
|
*/
|
|
205
|
-
mergeAuthoritativeOrderCollection(field, existing, incoming, uidRemaps = []) {
|
|
240
|
+
mergeAuthoritativeOrderCollection(field, existing, incoming, uidRemaps = [], options = {}) {
|
|
206
241
|
const kind = ORDER_COLLECTION_KIND_BY_FIELD[field];
|
|
207
242
|
const existingItems = Array.isArray(existing) ? existing : [];
|
|
243
|
+
if (field === "payments" && options.preserveIdentifiedPendingPayments) {
|
|
244
|
+
return (0, import_payment_utils.mergeOrderPaymentListsByIdentity)(
|
|
245
|
+
existingItems,
|
|
246
|
+
incoming,
|
|
247
|
+
{ preserveUnmatchedExistingWhen: import_payment_utils.isIdentifiedPendingOrderPayment }
|
|
248
|
+
);
|
|
249
|
+
}
|
|
208
250
|
return incoming.map((incomingItem) => {
|
|
209
251
|
const existingItem = existingItems.find(
|
|
210
252
|
(item) => (0, import_orderCollectionIdentity.isSameOrderCollectionItem)(kind, item, incomingItem)
|
|
@@ -460,17 +502,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
460
502
|
return DEFAULT_ORDER_SYNC_THROTTLE_MS;
|
|
461
503
|
}
|
|
462
504
|
async preload() {
|
|
463
|
-
const
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
this.store.list = (0, import_lodash_es.cloneDeep)(orders);
|
|
469
|
-
this.syncOrdersMap();
|
|
470
|
-
this.emitOrdersChanged([], "preload");
|
|
471
|
-
this.core.effects.emit(import_types.OrderHooks.onOrdersSyncCompleted, null);
|
|
472
|
-
};
|
|
473
|
-
getData();
|
|
505
|
+
const orders = await this.loadOrdersByServer();
|
|
506
|
+
this.store.list = (0, import_lodash_es.cloneDeep)(orders);
|
|
507
|
+
this.syncOrdersMap();
|
|
508
|
+
await this.emitOrdersChanged([], "preload");
|
|
509
|
+
await this.core.effects.emit(import_types.OrderHooks.onOrdersSyncCompleted, null);
|
|
474
510
|
}
|
|
475
511
|
getOrders() {
|
|
476
512
|
return this.store.list;
|
|
@@ -482,6 +518,27 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
482
518
|
getOrderByOrderId(orderId) {
|
|
483
519
|
return this.store.map.get(this.getIdKey(orderId));
|
|
484
520
|
}
|
|
521
|
+
buildLocalPaymentOrderLogContext(order) {
|
|
522
|
+
if (!order)
|
|
523
|
+
return {};
|
|
524
|
+
return {
|
|
525
|
+
order_id: order.order_id ?? null,
|
|
526
|
+
external_sale_number: order.external_sale_number ?? null,
|
|
527
|
+
order_number: order.order_number ?? null,
|
|
528
|
+
shop_order_number: order.shop_order_number ?? null,
|
|
529
|
+
shop_full_order_number: order.shop_full_order_number ?? null,
|
|
530
|
+
order_status: order.status ?? null,
|
|
531
|
+
payment_status: order.payment_status ?? null,
|
|
532
|
+
is_draft_order: Number(order.is_draft_order || 0),
|
|
533
|
+
need_sync: Number(order.need_sync || 0),
|
|
534
|
+
platform: order.platform ?? null,
|
|
535
|
+
business_code: order.business_code ?? null,
|
|
536
|
+
order_sales_channel: order.order_sales_channel ?? null,
|
|
537
|
+
sales_channel: order.sales_channel ?? null,
|
|
538
|
+
order_type: order.type ?? null,
|
|
539
|
+
payments_count: Array.isArray(order.payments) ? order.payments.length : 0
|
|
540
|
+
};
|
|
541
|
+
}
|
|
485
542
|
getLocalOrderFromMemoryByLookup(lookup) {
|
|
486
543
|
const key = this.getIdKey(lookup);
|
|
487
544
|
const memoryOrderById = this.store.map.get(key);
|
|
@@ -490,28 +547,200 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
490
547
|
const memoryOrder = this.store.list.find((order) => this.isOrderLookupMatch(order, key));
|
|
491
548
|
return memoryOrder || null;
|
|
492
549
|
}
|
|
493
|
-
async getLocalOrderByLookup(lookup) {
|
|
550
|
+
async getLocalOrderByLookup(lookup, options = {}) {
|
|
494
551
|
const key = this.getIdKey(lookup);
|
|
552
|
+
const logContext = {
|
|
553
|
+
operation_id: options.operationId,
|
|
554
|
+
lookup: key,
|
|
555
|
+
memory_order_count: this.store.list.length
|
|
556
|
+
};
|
|
557
|
+
if (options.operationId) {
|
|
558
|
+
this.logInfo("getLocalOrderByLookup-localPayment-开始", logContext);
|
|
559
|
+
}
|
|
495
560
|
const memoryOrderById = this.store.map.get(key);
|
|
496
|
-
if (memoryOrderById)
|
|
561
|
+
if (memoryOrderById) {
|
|
562
|
+
if (options.operationId) {
|
|
563
|
+
this.logInfo("getLocalOrderByLookup-localPayment-命中内存映射", {
|
|
564
|
+
...logContext,
|
|
565
|
+
...this.buildLocalPaymentOrderLogContext(memoryOrderById)
|
|
566
|
+
});
|
|
567
|
+
}
|
|
497
568
|
return memoryOrderById;
|
|
569
|
+
}
|
|
498
570
|
const memoryOrder = this.store.list.find((order) => this.isOrderLookupMatch(order, key));
|
|
499
|
-
if (memoryOrder)
|
|
571
|
+
if (memoryOrder) {
|
|
572
|
+
if (options.operationId) {
|
|
573
|
+
this.logInfo("getLocalOrderByLookup-localPayment-命中内存列表", {
|
|
574
|
+
...logContext,
|
|
575
|
+
...this.buildLocalPaymentOrderLogContext(memoryOrder)
|
|
576
|
+
});
|
|
577
|
+
}
|
|
500
578
|
return memoryOrder;
|
|
579
|
+
}
|
|
580
|
+
if (options.operationId) {
|
|
581
|
+
this.logInfo("getLocalOrderByLookup-localPayment-开始读取SQLite", logContext);
|
|
582
|
+
}
|
|
501
583
|
const orders = await this.loadOrdersFromSQLite();
|
|
502
584
|
const localOrder = orders.find((order) => this.isOrderLookupMatch(order, key));
|
|
503
|
-
if (!localOrder)
|
|
585
|
+
if (!localOrder) {
|
|
586
|
+
if (options.operationId) {
|
|
587
|
+
this.logWarning("getLocalOrderByLookup-localPayment-SQLite未命中", {
|
|
588
|
+
...logContext,
|
|
589
|
+
sqlite_order_count: orders.length
|
|
590
|
+
});
|
|
591
|
+
}
|
|
504
592
|
return null;
|
|
505
|
-
|
|
593
|
+
}
|
|
594
|
+
this.store.list = this.normalizeOrdersForMemoryList(
|
|
595
|
+
orders,
|
|
596
|
+
"getLocalOrderByLookup.sqliteMemory"
|
|
597
|
+
);
|
|
506
598
|
this.syncOrdersMap();
|
|
507
|
-
|
|
599
|
+
const normalizedOrder = this.normalizeOrderForMemoryList(localOrder);
|
|
600
|
+
if (options.operationId) {
|
|
601
|
+
this.logInfo("getLocalOrderByLookup-localPayment-SQLite命中", {
|
|
602
|
+
...logContext,
|
|
603
|
+
sqlite_order_count: orders.length,
|
|
604
|
+
...this.buildLocalPaymentOrderLogContext(normalizedOrder)
|
|
605
|
+
});
|
|
606
|
+
}
|
|
607
|
+
return normalizedOrder;
|
|
608
|
+
}
|
|
609
|
+
async getLocalPayment(params) {
|
|
610
|
+
const logContext = {
|
|
611
|
+
operation_id: params.operationId,
|
|
612
|
+
sale_id: params.saleId,
|
|
613
|
+
payment_number: params.paymentNumber
|
|
614
|
+
};
|
|
615
|
+
this.logInfo("getLocalPayment-开始", logContext);
|
|
616
|
+
try {
|
|
617
|
+
const order = await this.getLocalOrderByLookup(params.saleId, {
|
|
618
|
+
operationId: params.operationId
|
|
619
|
+
});
|
|
620
|
+
if (!order) {
|
|
621
|
+
this.logWarning("getLocalPayment-订单未命中", logContext);
|
|
622
|
+
return null;
|
|
623
|
+
}
|
|
624
|
+
const payments = order.payments || [];
|
|
625
|
+
const match = (0, import_payment_utils.resolveOrderPaymentIdentity)(
|
|
626
|
+
payments,
|
|
627
|
+
params.paymentNumber,
|
|
628
|
+
"compat"
|
|
629
|
+
);
|
|
630
|
+
if (!match) {
|
|
631
|
+
this.logWarning("getLocalPayment-支付项未命中", {
|
|
632
|
+
...logContext,
|
|
633
|
+
...this.buildLocalPaymentOrderLogContext(order),
|
|
634
|
+
payments
|
|
635
|
+
});
|
|
636
|
+
return null;
|
|
637
|
+
}
|
|
638
|
+
this.logInfo("getLocalPayment-支付项命中", {
|
|
639
|
+
...logContext,
|
|
640
|
+
...this.buildLocalPaymentOrderLogContext(order),
|
|
641
|
+
matched_by: match.matchedBy,
|
|
642
|
+
payment_index: match.index,
|
|
643
|
+
payment: match.payment
|
|
644
|
+
});
|
|
645
|
+
return {
|
|
646
|
+
order,
|
|
647
|
+
payment: match.payment,
|
|
648
|
+
paymentIndex: match.index,
|
|
649
|
+
matchedBy: match.matchedBy
|
|
650
|
+
};
|
|
651
|
+
} catch (error) {
|
|
652
|
+
this.logError("getLocalPayment-查询失败", {
|
|
653
|
+
...logContext,
|
|
654
|
+
error: error instanceof Error ? error.message : String(error)
|
|
655
|
+
});
|
|
656
|
+
throw error;
|
|
657
|
+
}
|
|
658
|
+
}
|
|
659
|
+
async updateLocalPayment(params) {
|
|
660
|
+
const logContext = {
|
|
661
|
+
operation_id: params.operationId,
|
|
662
|
+
sale_id: params.saleId,
|
|
663
|
+
payment_number: params.paymentNumber,
|
|
664
|
+
incoming_payment_update: params.updates
|
|
665
|
+
};
|
|
666
|
+
this.logInfo("updateLocalPayment-开始", logContext);
|
|
667
|
+
const found = await this.getLocalPayment(params);
|
|
668
|
+
if (!found) {
|
|
669
|
+
this.logWarning("updateLocalPayment-支付项未命中", logContext);
|
|
670
|
+
return null;
|
|
671
|
+
}
|
|
672
|
+
const previousPayment = (0, import_lodash_es.cloneDeep)(found.payment);
|
|
673
|
+
const nextPayment = (0, import_payment_utils.mergeOrderPaymentRecord)(found.payment, {
|
|
674
|
+
...params.updates,
|
|
675
|
+
updated_at: params.updates.updated_at || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
|
|
676
|
+
});
|
|
677
|
+
const nextOrder = {
|
|
678
|
+
...found.order,
|
|
679
|
+
payments: (found.order.payments || []).map((payment, index) => index === found.paymentIndex ? nextPayment : payment),
|
|
680
|
+
updated_at: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
|
|
681
|
+
};
|
|
682
|
+
const paymentContext = {
|
|
683
|
+
...logContext,
|
|
684
|
+
matched_by: found.matchedBy,
|
|
685
|
+
payment_index: found.paymentIndex,
|
|
686
|
+
...this.buildLocalPaymentOrderLogContext(nextOrder),
|
|
687
|
+
previous_payment: previousPayment,
|
|
688
|
+
payment: nextPayment
|
|
689
|
+
};
|
|
690
|
+
this.logInfo("updateLocalPayment-支付项合并完成", paymentContext);
|
|
691
|
+
const targetIndex = this.findOrderIndexByIdentity(this.store.list, found.order);
|
|
692
|
+
const shouldKeepInMemory = this.shouldKeepOrderInMemory(nextOrder);
|
|
693
|
+
if (targetIndex < 0 && shouldKeepInMemory) {
|
|
694
|
+
this.logError("updateLocalPayment-订单Store索引未命中", paymentContext);
|
|
695
|
+
return null;
|
|
696
|
+
}
|
|
697
|
+
const previousList = this.store.list;
|
|
698
|
+
this.store.list = shouldKeepInMemory ? this.store.list.map((order, index) => index === targetIndex ? nextOrder : order) : this.store.list.filter((_, index) => index !== targetIndex);
|
|
699
|
+
this.syncOrdersMap();
|
|
700
|
+
const storageOrder = this.withoutSyntheticDraftOrderId(nextOrder);
|
|
701
|
+
try {
|
|
702
|
+
this.logInfo("updateLocalPayment-SQLite写入开始", {
|
|
703
|
+
...paymentContext,
|
|
704
|
+
storage_order_id: storageOrder.order_id ?? null
|
|
705
|
+
});
|
|
706
|
+
await this.updateOrderInSQLite(storageOrder, "updateLocalPayment", { throwOnError: true });
|
|
707
|
+
this.logInfo("updateLocalPayment-SQLite写入完成", {
|
|
708
|
+
...paymentContext,
|
|
709
|
+
storage_order_id: storageOrder.order_id ?? null
|
|
710
|
+
});
|
|
711
|
+
} catch (error) {
|
|
712
|
+
this.store.list = previousList;
|
|
713
|
+
this.syncOrdersMap();
|
|
714
|
+
this.logError("updateLocalPayment-SQLite写入失败并回滚内存", {
|
|
715
|
+
...paymentContext,
|
|
716
|
+
storage_order_id: storageOrder.order_id ?? null,
|
|
717
|
+
error: error instanceof Error ? error.message : String(error)
|
|
718
|
+
});
|
|
719
|
+
throw error;
|
|
720
|
+
}
|
|
721
|
+
if (shouldKeepInMemory || targetIndex >= 0) {
|
|
722
|
+
await this.emitOrdersChanged(
|
|
723
|
+
shouldKeepInMemory ? [nextOrder] : [],
|
|
724
|
+
shouldKeepInMemory ? "updateLocalPayment" : "updateLocalPayment.sqliteOnlyDraft"
|
|
725
|
+
);
|
|
726
|
+
}
|
|
727
|
+
this.logInfo("updateLocalPayment-变更事件完成", paymentContext);
|
|
728
|
+
return { order: nextOrder, payment: nextPayment, previousPayment };
|
|
508
729
|
}
|
|
509
730
|
async loadOrdersByServer() {
|
|
510
731
|
var _a;
|
|
511
732
|
let orderList = [];
|
|
733
|
+
const protectedOrdersBeforeRemoteFetch = (await this.loadOrdersFromSQLite()).filter(
|
|
734
|
+
(order) => this.shouldProtectLocalOrderFromRemoteSnapshot(order)
|
|
735
|
+
);
|
|
512
736
|
this.logInfo("loadOrdersByServer-开始", {
|
|
513
737
|
hasOrderDataSource: !!this.orderDataSource,
|
|
514
|
-
query: ((_a = this.store) == null ? void 0 : _a.createdAtQuery) || null
|
|
738
|
+
query: ((_a = this.store) == null ? void 0 : _a.createdAtQuery) || null,
|
|
739
|
+
protectedLocalOrderCount: protectedOrdersBeforeRemoteFetch.length,
|
|
740
|
+
protectedPendingPaymentCount: protectedOrdersBeforeRemoteFetch.reduce(
|
|
741
|
+
(count, order) => count + this.getIdentifiedPendingPayments(order).length,
|
|
742
|
+
0
|
|
743
|
+
)
|
|
515
744
|
});
|
|
516
745
|
if (this.orderDataSource) {
|
|
517
746
|
try {
|
|
@@ -531,10 +760,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
531
760
|
return this.store.list;
|
|
532
761
|
}
|
|
533
762
|
}
|
|
534
|
-
const mergedOrders = await this.replaceOrdersSnapshotInSQLite(
|
|
535
|
-
|
|
763
|
+
const mergedOrders = await this.replaceOrdersSnapshotInSQLite(
|
|
764
|
+
orderList,
|
|
765
|
+
"loadOrdersByServer",
|
|
766
|
+
protectedOrdersBeforeRemoteFetch
|
|
767
|
+
);
|
|
768
|
+
const memoryOrders = this.normalizeOrdersForMemoryList(
|
|
769
|
+
mergedOrders,
|
|
770
|
+
"loadOrdersByServer.memory"
|
|
771
|
+
);
|
|
536
772
|
this.logInfo("loadOrdersByServer-结束", {
|
|
537
|
-
count: memoryOrders.length
|
|
773
|
+
count: memoryOrders.length,
|
|
774
|
+
persistedCount: mergedOrders.length,
|
|
775
|
+
sqliteOnlyDraftCount: mergedOrders.length - memoryOrders.length
|
|
538
776
|
});
|
|
539
777
|
await this.core.effects.emit(import_types.OrderHooks.onOrdersLoaded, memoryOrders);
|
|
540
778
|
return memoryOrders;
|
|
@@ -554,18 +792,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
554
792
|
try {
|
|
555
793
|
this.updateCreateStore();
|
|
556
794
|
const orders = await this.loadOrdersByServer();
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
});
|
|
566
|
-
} else {
|
|
567
|
-
this.logInfo("silentRefresh: 服务器未返回数据");
|
|
568
|
-
}
|
|
795
|
+
this.store.list = (0, import_lodash_es.cloneDeep)(orders);
|
|
796
|
+
this.syncOrdersMap();
|
|
797
|
+
await this.emitOrdersChanged([], "silentRefresh");
|
|
798
|
+
await this.core.effects.emit(import_types.OrderHooks.onOrdersSyncCompleted, null);
|
|
799
|
+
this.logInfo("silentRefresh 完成", {
|
|
800
|
+
orderCount: orders.length,
|
|
801
|
+
duration: `${Date.now() - startTime}ms`
|
|
802
|
+
});
|
|
569
803
|
return this.store.list;
|
|
570
804
|
} catch (error) {
|
|
571
805
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
@@ -579,6 +813,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
579
813
|
normalizeOrderForMemoryList(order, source = "normalizeOrderForMemoryList") {
|
|
580
814
|
const normalizedOrder = this.normalizeOrderCollectionsForIngress(order, source);
|
|
581
815
|
const externalSaleNumber = normalizedOrder == null ? void 0 : normalizedOrder.external_sale_number;
|
|
816
|
+
if (this.isDraftOrder(normalizedOrder) && !this.hasRealOrderId(normalizedOrder)) {
|
|
817
|
+
return normalizedOrder;
|
|
818
|
+
}
|
|
582
819
|
if ((normalizedOrder == null ? void 0 : normalizedOrder.order_id) !== void 0 && (normalizedOrder == null ? void 0 : normalizedOrder.order_id) !== null && (normalizedOrder == null ? void 0 : normalizedOrder.order_id) !== "") {
|
|
583
820
|
return normalizedOrder;
|
|
584
821
|
}
|
|
@@ -590,6 +827,27 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
590
827
|
order_id: externalSaleNumber
|
|
591
828
|
};
|
|
592
829
|
}
|
|
830
|
+
normalizeOrdersForMemoryList(orders, source) {
|
|
831
|
+
return orders.map((order) => this.normalizeOrderForMemoryList(order, source)).filter((order) => this.shouldKeepOrderInMemory(order));
|
|
832
|
+
}
|
|
833
|
+
hasRealOrderId(order) {
|
|
834
|
+
if (!order || this.isBlankIdentityValue(order.order_id))
|
|
835
|
+
return false;
|
|
836
|
+
const externalSaleNumber = order.external_sale_number;
|
|
837
|
+
return !(this.isDraftOrder(order) && !this.isBlankIdentityValue(externalSaleNumber) && String(order.order_id) === String(externalSaleNumber));
|
|
838
|
+
}
|
|
839
|
+
shouldKeepOrderInMemory(order) {
|
|
840
|
+
return !this.isDraftOrder(order) || this.hasRealOrderId(order);
|
|
841
|
+
}
|
|
842
|
+
withoutSyntheticDraftOrderId(order) {
|
|
843
|
+
const externalSaleNumber = order.external_sale_number;
|
|
844
|
+
if (Number(order.is_draft_order || 0) !== 1 || order.order_id === void 0 || externalSaleNumber === void 0 || String(order.order_id) !== String(externalSaleNumber)) {
|
|
845
|
+
return order;
|
|
846
|
+
}
|
|
847
|
+
const next = { ...order };
|
|
848
|
+
delete next.order_id;
|
|
849
|
+
return next;
|
|
850
|
+
}
|
|
593
851
|
/**
|
|
594
852
|
* 仅覆盖本地已存在的订单;不存在则直接跳过,不落库、不 emit。
|
|
595
853
|
* 适用于"按 order_id 主动刷新本地订单详情"的代理场景。
|
|
@@ -638,13 +896,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
638
896
|
* 将远端拉取的订单合并进本地 store(已存在则更新,不存在则追加),落库并 emit onOrdersChanged。
|
|
639
897
|
* 供 /update/localOrder 等在「本地尚无该单」时写入新建单。
|
|
640
898
|
*/
|
|
641
|
-
async upsertOrdersFromRemote(freshOrders) {
|
|
899
|
+
async upsertOrdersFromRemote(freshOrders, source = "upsertOrdersFromRemote") {
|
|
642
900
|
if (!(freshOrders == null ? void 0 : freshOrders.length)) {
|
|
643
901
|
this.logInfo("upsertOrdersFromRemote-订单列表为空", {});
|
|
644
902
|
return;
|
|
645
903
|
}
|
|
646
|
-
this.logInfo("upsertOrdersFromRemote-开始", { count: freshOrders.length });
|
|
647
|
-
await this.mergeOrdersToStore(freshOrders,
|
|
904
|
+
this.logInfo("upsertOrdersFromRemote-开始", { count: freshOrders.length, source });
|
|
905
|
+
await this.mergeOrdersToStore(freshOrders, source);
|
|
648
906
|
}
|
|
649
907
|
async markOrderSyncedByExternalSaleNumber(params) {
|
|
650
908
|
const externalSaleNumber = params.externalSaleNumber;
|
|
@@ -670,7 +928,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
670
928
|
...existing,
|
|
671
929
|
...params.patch || {},
|
|
672
930
|
external_sale_number: existing.external_sale_number ?? externalSaleNumber,
|
|
673
|
-
need_sync: 0
|
|
931
|
+
need_sync: 0,
|
|
932
|
+
is_draft_order: 0
|
|
674
933
|
});
|
|
675
934
|
const storageKey = this.getOrderStorageKey(nextOrder) || key;
|
|
676
935
|
this.store.list = this.store.list.map((order, index) => {
|
|
@@ -695,7 +954,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
695
954
|
* 将本地待同步订单按 SQLite storage key 合并进 store 并落库。
|
|
696
955
|
* checkout 离线兜底可能没有 order_id,但通常会有 external_sale_number。
|
|
697
956
|
*/
|
|
698
|
-
async upsertPendingSyncOrders(pendingOrders) {
|
|
957
|
+
async upsertPendingSyncOrders(pendingOrders, options = {}) {
|
|
699
958
|
if (!(pendingOrders == null ? void 0 : pendingOrders.length)) {
|
|
700
959
|
this.logInfo("upsertPendingSyncOrders-订单列表为空", {});
|
|
701
960
|
return;
|
|
@@ -707,14 +966,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
707
966
|
order,
|
|
708
967
|
"upsertPendingSyncOrders.incoming"
|
|
709
968
|
);
|
|
710
|
-
const
|
|
969
|
+
const pendingOrder = {
|
|
970
|
+
...normalizedOrder,
|
|
971
|
+
need_sync: 1,
|
|
972
|
+
is_draft_order: 0
|
|
973
|
+
};
|
|
974
|
+
const storageKey = this.getOrderStorageKey(pendingOrder);
|
|
711
975
|
if (!storageKey)
|
|
712
976
|
continue;
|
|
713
|
-
pendingMap.set(storageKey,
|
|
977
|
+
pendingMap.set(storageKey, pendingOrder);
|
|
714
978
|
memoryPendingMap.set(
|
|
715
979
|
storageKey,
|
|
716
980
|
this.normalizeOrderForMemoryList(
|
|
717
|
-
|
|
981
|
+
pendingOrder,
|
|
718
982
|
"upsertPendingSyncOrders.memory"
|
|
719
983
|
)
|
|
720
984
|
);
|
|
@@ -745,7 +1009,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
745
1009
|
if (matchIndex >= 0) {
|
|
746
1010
|
const existingOrder = updatedList[matchIndex];
|
|
747
1011
|
const mergedOrder = this.mergeOrderRecords(existingOrder, pendingOrder);
|
|
748
|
-
|
|
1012
|
+
const nextOrder = {
|
|
1013
|
+
...mergedOrder,
|
|
1014
|
+
need_sync: 1,
|
|
1015
|
+
is_draft_order: 0
|
|
1016
|
+
};
|
|
1017
|
+
updatedList[matchIndex] = nextOrder;
|
|
749
1018
|
const pendingSnapshot = pendingMap.get(storageKey);
|
|
750
1019
|
if (pendingSnapshot) {
|
|
751
1020
|
pendingMap.set(
|
|
@@ -753,7 +1022,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
753
1022
|
this.reconcileOverwriteOrderCollections(existingOrder, pendingSnapshot)
|
|
754
1023
|
);
|
|
755
1024
|
}
|
|
756
|
-
this.registerOrderIdentityKeys(identityKeyToIndex,
|
|
1025
|
+
this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
|
|
757
1026
|
mergeActions[storageKey] = "update";
|
|
758
1027
|
continue;
|
|
759
1028
|
}
|
|
@@ -763,15 +1032,125 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
763
1032
|
mergeActions[storageKey] = "insert";
|
|
764
1033
|
}
|
|
765
1034
|
const patchedOrders = [...pendingMap.values()];
|
|
1035
|
+
const previousList = this.store.list;
|
|
766
1036
|
this.store.list = this.runOrderStoreSelfCheck(updatedList, "upsertPendingSyncOrders.store");
|
|
767
1037
|
this.syncOrdersMap();
|
|
768
|
-
|
|
1038
|
+
try {
|
|
1039
|
+
await this.patchOrdersInSQLite(
|
|
1040
|
+
patchedOrders,
|
|
1041
|
+
"upsertPendingSyncOrders",
|
|
1042
|
+
mergeActions,
|
|
1043
|
+
options
|
|
1044
|
+
);
|
|
1045
|
+
} catch (error) {
|
|
1046
|
+
this.store.list = previousList;
|
|
1047
|
+
this.syncOrdersMap();
|
|
1048
|
+
throw error;
|
|
1049
|
+
}
|
|
769
1050
|
this.logInfo("upsertPendingSyncOrders-结束", {
|
|
770
1051
|
count: patchedOrders.length,
|
|
771
1052
|
storeOrderCountAfter: this.store.list.length
|
|
772
1053
|
});
|
|
773
1054
|
await this.emitOrdersChanged(patchedOrders, "upsertPendingSyncOrders");
|
|
774
1055
|
}
|
|
1056
|
+
/**
|
|
1057
|
+
* 将 POS 草稿订单按 SQLite storage key 落库。
|
|
1058
|
+
* 只有具备真实 order_id 的草稿进入 store;其余草稿仅供本地恢复查询。
|
|
1059
|
+
*/
|
|
1060
|
+
async upsertLocalDraftOrders(draftOrders) {
|
|
1061
|
+
if (!(draftOrders == null ? void 0 : draftOrders.length)) {
|
|
1062
|
+
this.logInfo("upsertLocalDraftOrders-订单列表为空", {});
|
|
1063
|
+
return;
|
|
1064
|
+
}
|
|
1065
|
+
const draftMap = /* @__PURE__ */ new Map();
|
|
1066
|
+
const memoryDraftMap = /* @__PURE__ */ new Map();
|
|
1067
|
+
for (const order of draftOrders) {
|
|
1068
|
+
const draftOrder = {
|
|
1069
|
+
...order,
|
|
1070
|
+
need_sync: 0,
|
|
1071
|
+
is_draft_order: 1
|
|
1072
|
+
};
|
|
1073
|
+
const storageKey = this.getOrderStorageKey(draftOrder);
|
|
1074
|
+
if (!storageKey)
|
|
1075
|
+
continue;
|
|
1076
|
+
draftMap.set(storageKey, draftOrder);
|
|
1077
|
+
const memoryDraftOrder = this.normalizeOrderForMemoryList(draftOrder);
|
|
1078
|
+
if (this.shouldKeepOrderInMemory(memoryDraftOrder)) {
|
|
1079
|
+
memoryDraftMap.set(storageKey, memoryDraftOrder);
|
|
1080
|
+
}
|
|
1081
|
+
}
|
|
1082
|
+
if (draftMap.size === 0) {
|
|
1083
|
+
this.logError("upsertLocalDraftOrders-订单缺少可落库标识", {
|
|
1084
|
+
count: draftOrders.length
|
|
1085
|
+
});
|
|
1086
|
+
return;
|
|
1087
|
+
}
|
|
1088
|
+
this.logInfo("upsertLocalDraftOrders-开始", {
|
|
1089
|
+
count: draftMap.size,
|
|
1090
|
+
memoryDraftCount: memoryDraftMap.size,
|
|
1091
|
+
sqliteOnlyDraftCount: draftMap.size - memoryDraftMap.size
|
|
1092
|
+
});
|
|
1093
|
+
const patchedOrders = [...draftMap.values()];
|
|
1094
|
+
const mergeActions = {};
|
|
1095
|
+
const updatedList = this.store.list.filter((order) => this.shouldKeepOrderInMemory(order));
|
|
1096
|
+
const identityKeyToIndex = /* @__PURE__ */ new Map();
|
|
1097
|
+
for (let index = 0; index < updatedList.length; index += 1) {
|
|
1098
|
+
for (const key of this.getOrderIdentityMatchKeys(updatedList[index])) {
|
|
1099
|
+
if (!identityKeyToIndex.has(key))
|
|
1100
|
+
identityKeyToIndex.set(key, index);
|
|
1101
|
+
}
|
|
1102
|
+
}
|
|
1103
|
+
for (const [storageKey, draftOrder] of memoryDraftMap.entries()) {
|
|
1104
|
+
const matchIndex = this.lookupOrderIndexByIdentityKeys(
|
|
1105
|
+
identityKeyToIndex,
|
|
1106
|
+
this.getOrderIdentityMatchKeys(draftOrder)
|
|
1107
|
+
);
|
|
1108
|
+
if (matchIndex >= 0) {
|
|
1109
|
+
const mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], draftOrder);
|
|
1110
|
+
const nextOrder = {
|
|
1111
|
+
...mergedOrder,
|
|
1112
|
+
need_sync: 0,
|
|
1113
|
+
is_draft_order: 1
|
|
1114
|
+
};
|
|
1115
|
+
updatedList[matchIndex] = nextOrder;
|
|
1116
|
+
this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
|
|
1117
|
+
mergeActions[storageKey] = "update";
|
|
1118
|
+
continue;
|
|
1119
|
+
}
|
|
1120
|
+
const insertIndex = updatedList.length;
|
|
1121
|
+
updatedList.push(draftOrder);
|
|
1122
|
+
this.registerOrderIdentityKeys(identityKeyToIndex, draftOrder, insertIndex);
|
|
1123
|
+
mergeActions[storageKey] = "insert";
|
|
1124
|
+
}
|
|
1125
|
+
const previousList = this.store.list;
|
|
1126
|
+
this.store.list = this.runOrderStoreSelfCheck(updatedList, "upsertLocalDraftOrders.store");
|
|
1127
|
+
this.syncOrdersMap();
|
|
1128
|
+
try {
|
|
1129
|
+
await this.patchOrdersInSQLite(
|
|
1130
|
+
patchedOrders,
|
|
1131
|
+
"upsertLocalDraftOrders",
|
|
1132
|
+
mergeActions,
|
|
1133
|
+
{ throwOnError: true }
|
|
1134
|
+
);
|
|
1135
|
+
} catch (error) {
|
|
1136
|
+
this.store.list = previousList;
|
|
1137
|
+
this.syncOrdersMap();
|
|
1138
|
+
throw error;
|
|
1139
|
+
}
|
|
1140
|
+
this.logInfo("upsertLocalDraftOrders-结束", {
|
|
1141
|
+
count: patchedOrders.length,
|
|
1142
|
+
storeOrderCountAfter: this.store.list.length
|
|
1143
|
+
});
|
|
1144
|
+
const removedLegacyMemoryDraft = previousList.some(
|
|
1145
|
+
(order) => !this.shouldKeepOrderInMemory(order)
|
|
1146
|
+
);
|
|
1147
|
+
if (memoryDraftMap.size > 0 || removedLegacyMemoryDraft) {
|
|
1148
|
+
await this.emitOrdersChanged(
|
|
1149
|
+
patchedOrders.filter((order) => this.shouldKeepOrderInMemory(order)),
|
|
1150
|
+
"upsertLocalDraftOrders"
|
|
1151
|
+
);
|
|
1152
|
+
}
|
|
1153
|
+
}
|
|
775
1154
|
/**
|
|
776
1155
|
* 通过 SSE 按自定义 query 拉取订单(支持 select/with 精简字段)
|
|
777
1156
|
*/
|
|
@@ -804,6 +1183,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
804
1183
|
super.destroy();
|
|
805
1184
|
}
|
|
806
1185
|
syncOrdersMap() {
|
|
1186
|
+
this.store.list = this.store.list.filter((order) => this.shouldKeepOrderInMemory(order));
|
|
807
1187
|
this.store.map.clear();
|
|
808
1188
|
for (const order of this.store.list) {
|
|
809
1189
|
const primaryIdentity = this.getOrderMapKey(order);
|
|
@@ -1126,9 +1506,43 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
1126
1506
|
});
|
|
1127
1507
|
continue;
|
|
1128
1508
|
}
|
|
1129
|
-
|
|
1130
|
-
|
|
1131
|
-
|
|
1509
|
+
if (this.isDraftOrder(existingOrder) && this.shouldProtectDraftOrderFromIncoming(source)) {
|
|
1510
|
+
this.logInfo("mergeOrdersToStore-跳过 draft 订单远端覆盖", {
|
|
1511
|
+
source,
|
|
1512
|
+
order_id: existingOrder.order_id ?? fresh.order_id ?? null,
|
|
1513
|
+
external_sale_number: existingOrder.external_sale_number ?? fresh.external_sale_number ?? null,
|
|
1514
|
+
local_is_draft_order: existingOrder.is_draft_order ?? null,
|
|
1515
|
+
remote_is_draft_order: fresh.is_draft_order ?? null,
|
|
1516
|
+
reason: "protect_draft_order_from_remote_echo"
|
|
1517
|
+
});
|
|
1518
|
+
continue;
|
|
1519
|
+
}
|
|
1520
|
+
let mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
|
|
1521
|
+
let adjustedMatchIndex = matchIndex;
|
|
1522
|
+
const duplicateIndexes = /* @__PURE__ */ new Set();
|
|
1523
|
+
for (const key of freshIdentityKeys) {
|
|
1524
|
+
const duplicateIndex = identityKeyToIndex.get(key);
|
|
1525
|
+
if (duplicateIndex === void 0 || duplicateIndex === matchIndex)
|
|
1526
|
+
continue;
|
|
1527
|
+
duplicateIndexes.add(duplicateIndex);
|
|
1528
|
+
}
|
|
1529
|
+
if (duplicateIndexes.size > 0) {
|
|
1530
|
+
for (const duplicateIndex of [...duplicateIndexes].sort((left, right) => right - left)) {
|
|
1531
|
+
mergedOrder = this.mergeOrderRecords(mergedOrder, updatedList[duplicateIndex]);
|
|
1532
|
+
updatedList.splice(duplicateIndex, 1);
|
|
1533
|
+
if (duplicateIndex < adjustedMatchIndex)
|
|
1534
|
+
adjustedMatchIndex -= 1;
|
|
1535
|
+
}
|
|
1536
|
+
identityKeyToIndex.clear();
|
|
1537
|
+
for (let index = 0; index < updatedList.length; index += 1) {
|
|
1538
|
+
for (const key of this.getOrderIdentityMatchKeys(updatedList[index])) {
|
|
1539
|
+
if (!identityKeyToIndex.has(key))
|
|
1540
|
+
identityKeyToIndex.set(key, index);
|
|
1541
|
+
}
|
|
1542
|
+
}
|
|
1543
|
+
}
|
|
1544
|
+
updatedList[adjustedMatchIndex] = mergedOrder;
|
|
1545
|
+
this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, adjustedMatchIndex);
|
|
1132
1546
|
patchedOrders.push(mergedOrder);
|
|
1133
1547
|
if (mergeKey)
|
|
1134
1548
|
mergeActions[mergeKey] = "update";
|
|
@@ -1320,6 +1734,72 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
1320
1734
|
return right;
|
|
1321
1735
|
return left;
|
|
1322
1736
|
}
|
|
1737
|
+
getProductIdentityKeys(product) {
|
|
1738
|
+
var _a;
|
|
1739
|
+
const record = product;
|
|
1740
|
+
if (!record)
|
|
1741
|
+
return [];
|
|
1742
|
+
const keys = [];
|
|
1743
|
+
const metadataUid = (_a = record.metadata) == null ? void 0 : _a.unique_identification_number;
|
|
1744
|
+
if (!this.isBlankIdentityValue(metadataUid))
|
|
1745
|
+
keys.push(`uid:${String(metadataUid)}`);
|
|
1746
|
+
const topLevelUid = record.unique_identification_number;
|
|
1747
|
+
if (!this.isBlankIdentityValue(topLevelUid))
|
|
1748
|
+
keys.push(`uid:${String(topLevelUid)}`);
|
|
1749
|
+
const orderDetailId = record.order_detail_id;
|
|
1750
|
+
if (!this.isBlankIdentityValue(orderDetailId))
|
|
1751
|
+
keys.push(`detail:${String(orderDetailId)}`);
|
|
1752
|
+
const bookingUid = record.booking_uid;
|
|
1753
|
+
if (!this.isBlankIdentityValue(bookingUid))
|
|
1754
|
+
keys.push(`booking:${String(bookingUid)}`);
|
|
1755
|
+
return keys;
|
|
1756
|
+
}
|
|
1757
|
+
mergeOrderProductLists(preferred, secondary) {
|
|
1758
|
+
const preferredList = Array.isArray(preferred) ? preferred : [];
|
|
1759
|
+
const secondaryList = Array.isArray(secondary) ? secondary : [];
|
|
1760
|
+
if (secondaryList.length === 0)
|
|
1761
|
+
return preferredList;
|
|
1762
|
+
if (preferredList.length === 0)
|
|
1763
|
+
return secondaryList;
|
|
1764
|
+
const seenKeys = /* @__PURE__ */ new Set();
|
|
1765
|
+
for (const item of preferredList) {
|
|
1766
|
+
const keys = this.getProductIdentityKeys(item);
|
|
1767
|
+
for (const key of keys)
|
|
1768
|
+
seenKeys.add(key);
|
|
1769
|
+
}
|
|
1770
|
+
const result = [...preferredList];
|
|
1771
|
+
for (const item of secondaryList) {
|
|
1772
|
+
const keys = this.getProductIdentityKeys(item);
|
|
1773
|
+
if (keys.length === 0 || keys.some((key) => seenKeys.has(key)))
|
|
1774
|
+
continue;
|
|
1775
|
+
for (const key of keys)
|
|
1776
|
+
seenKeys.add(key);
|
|
1777
|
+
result.push((0, import_lodash_es.cloneDeep)(item));
|
|
1778
|
+
}
|
|
1779
|
+
return result;
|
|
1780
|
+
}
|
|
1781
|
+
mergeOrderPaymentLists(existing, incoming) {
|
|
1782
|
+
const existingList = Array.isArray(existing) ? existing : [];
|
|
1783
|
+
const incomingList = Array.isArray(incoming) ? incoming : [];
|
|
1784
|
+
if (incomingList.length === 0)
|
|
1785
|
+
return (0, import_lodash_es.cloneDeep)(existingList);
|
|
1786
|
+
return (0, import_payment_utils.mergeOrderPaymentListsByIdentity)(existingList, incomingList);
|
|
1787
|
+
}
|
|
1788
|
+
getIdentifiedPendingPayments(order) {
|
|
1789
|
+
const payments = Array.isArray(order == null ? void 0 : order.payments) ? order.payments : [];
|
|
1790
|
+
return payments.filter((payment) => (0, import_payment_utils.isIdentifiedPendingOrderPayment)(payment));
|
|
1791
|
+
}
|
|
1792
|
+
shouldProtectLocalOrderFromRemoteSnapshot(order) {
|
|
1793
|
+
return this.isPendingSyncOrder(order) || this.isDraftOrder(order) || this.getIdentifiedPendingPayments(order).length > 0;
|
|
1794
|
+
}
|
|
1795
|
+
getUnmatchedIdentifiedPendingPayments(existing, incoming) {
|
|
1796
|
+
const existingPayments = Array.isArray(existing) ? existing : [];
|
|
1797
|
+
const incomingPayments = Array.isArray(incoming) ? incoming : [];
|
|
1798
|
+
const incomingIdentityKeys = new Set(
|
|
1799
|
+
incomingPayments.flatMap((payment) => (0, import_payment_utils.getOrderPaymentIdentityKeys)(payment))
|
|
1800
|
+
);
|
|
1801
|
+
return existingPayments.filter((payment) => (0, import_payment_utils.isIdentifiedPendingOrderPayment)(payment) && !(0, import_payment_utils.getOrderPaymentIdentityKeys)(payment).some((key) => incomingIdentityKeys.has(key)));
|
|
1802
|
+
}
|
|
1323
1803
|
mergeOrderRecords(existing, incoming) {
|
|
1324
1804
|
const preferred = this.pickPreferredOrder(existing, incoming);
|
|
1325
1805
|
const secondary = preferred === existing ? incoming : existing;
|
|
@@ -1349,7 +1829,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
1349
1829
|
"contacts_info",
|
|
1350
1830
|
"phone",
|
|
1351
1831
|
"email",
|
|
1352
|
-
"relation_forms"
|
|
1832
|
+
"relation_forms",
|
|
1833
|
+
"is_draft_order"
|
|
1353
1834
|
];
|
|
1354
1835
|
const mergedRecord = merged;
|
|
1355
1836
|
const preferredRecord = preferred;
|
|
@@ -1377,11 +1858,26 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
1377
1858
|
}
|
|
1378
1859
|
for (const field of ORDER_AUTHORITATIVE_COLLECTION_FIELDS) {
|
|
1379
1860
|
if (Array.isArray(incomingRecord[field])) {
|
|
1861
|
+
if (field === "payments") {
|
|
1862
|
+
const preservedPending = this.getUnmatchedIdentifiedPendingPayments(
|
|
1863
|
+
existingRecord[field],
|
|
1864
|
+
incomingRecord[field]
|
|
1865
|
+
);
|
|
1866
|
+
if (preservedPending.length > 0) {
|
|
1867
|
+
this.logInfo("mergeOrderRecords-保留本地 pending 支付项", {
|
|
1868
|
+
order_id: existing.order_id ?? incoming.order_id ?? null,
|
|
1869
|
+
external_sale_number: existingRecord.external_sale_number ?? incomingRecord.external_sale_number ?? null,
|
|
1870
|
+
preserved_pending_count: preservedPending.length,
|
|
1871
|
+
preserved_payment_identities: preservedPending.map((payment) => (0, import_payment_utils.getOrderPaymentIdentityKeys)(payment))
|
|
1872
|
+
});
|
|
1873
|
+
}
|
|
1874
|
+
}
|
|
1380
1875
|
mergedRecord[field] = this.mergeAuthoritativeOrderCollection(
|
|
1381
1876
|
field,
|
|
1382
1877
|
existingRecord[field],
|
|
1383
1878
|
incomingRecord[field],
|
|
1384
|
-
childUidRemaps
|
|
1879
|
+
childUidRemaps,
|
|
1880
|
+
{ preserveIdentifiedPendingPayments: field === "payments" }
|
|
1385
1881
|
);
|
|
1386
1882
|
continue;
|
|
1387
1883
|
}
|
|
@@ -1416,7 +1912,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
1416
1912
|
external_sale_number: order.external_sale_number ?? null,
|
|
1417
1913
|
shop_order_number: order.shop_order_number ?? null,
|
|
1418
1914
|
shop_full_order_number: order.shop_full_order_number ?? null,
|
|
1419
|
-
need_sync: order.need_sync ?? null
|
|
1915
|
+
need_sync: order.need_sync ?? null,
|
|
1916
|
+
is_draft_order: order.is_draft_order ?? null
|
|
1420
1917
|
}))
|
|
1421
1918
|
}));
|
|
1422
1919
|
}
|
|
@@ -1533,18 +2030,48 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
1533
2030
|
isPendingSyncOrder(order) {
|
|
1534
2031
|
return Number(order == null ? void 0 : order.need_sync) === 1;
|
|
1535
2032
|
}
|
|
2033
|
+
isDraftOrder(order) {
|
|
2034
|
+
return Number(order == null ? void 0 : order.is_draft_order) === 1;
|
|
2035
|
+
}
|
|
2036
|
+
shouldProtectDraftOrderFromIncoming(source) {
|
|
2037
|
+
return source !== "checkoutSync";
|
|
2038
|
+
}
|
|
1536
2039
|
normalizeRemoteSyncedOrder(order) {
|
|
1537
2040
|
const normalizedOrder = this.normalizeOrderCollectionsForIngress(
|
|
1538
2041
|
order,
|
|
1539
2042
|
"normalizeRemoteSyncedOrder"
|
|
1540
2043
|
);
|
|
1541
2044
|
if (this.isPendingSyncOrder(normalizedOrder))
|
|
1542
|
-
return
|
|
2045
|
+
return {
|
|
2046
|
+
...normalizedOrder,
|
|
2047
|
+
is_draft_order: 0
|
|
2048
|
+
};
|
|
1543
2049
|
return {
|
|
1544
2050
|
...normalizedOrder,
|
|
1545
|
-
need_sync: 0
|
|
2051
|
+
need_sync: 0,
|
|
2052
|
+
is_draft_order: 0
|
|
1546
2053
|
};
|
|
1547
2054
|
}
|
|
2055
|
+
mergeRemoteIdentityIntoDraftOrder(draftOrder, remoteOrder) {
|
|
2056
|
+
const merged = {
|
|
2057
|
+
...this.withoutSyntheticDraftOrderId(draftOrder)
|
|
2058
|
+
};
|
|
2059
|
+
const remote = remoteOrder;
|
|
2060
|
+
for (const field of [
|
|
2061
|
+
"order_id",
|
|
2062
|
+
"order_number",
|
|
2063
|
+
"shop_order_number",
|
|
2064
|
+
"shop_full_order_number"
|
|
2065
|
+
]) {
|
|
2066
|
+
if (this.isBlankIdentityValue(merged[field]) && !this.isBlankIdentityValue(remote[field])) {
|
|
2067
|
+
merged[field] = remote[field];
|
|
2068
|
+
}
|
|
2069
|
+
}
|
|
2070
|
+
return this.normalizeOrderCollectionsForIngress(
|
|
2071
|
+
merged,
|
|
2072
|
+
"mergeRemoteIdentityIntoDraftOrder"
|
|
2073
|
+
);
|
|
2074
|
+
}
|
|
1548
2075
|
mergeRemoteSnapshotWithPendingOrders(remoteOrders, existingOrders) {
|
|
1549
2076
|
const merged = remoteOrders.map((order) => this.normalizeRemoteSyncedOrder(order));
|
|
1550
2077
|
for (const rawOrder of existingOrders) {
|
|
@@ -1552,11 +2079,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
1552
2079
|
rawOrder,
|
|
1553
2080
|
"mergeRemoteSnapshotWithPendingOrders.existingSQLite"
|
|
1554
2081
|
);
|
|
1555
|
-
if (!this.
|
|
2082
|
+
if (!this.shouldProtectLocalOrderFromRemoteSnapshot(order))
|
|
1556
2083
|
continue;
|
|
1557
2084
|
const matchIndex = this.findOrderIndexByIdentity(merged, order);
|
|
1558
2085
|
if (matchIndex >= 0) {
|
|
1559
|
-
|
|
2086
|
+
if (this.isDraftOrder(order)) {
|
|
2087
|
+
merged[matchIndex] = this.mergeRemoteIdentityIntoDraftOrder(
|
|
2088
|
+
order,
|
|
2089
|
+
merged[matchIndex]
|
|
2090
|
+
);
|
|
2091
|
+
} else {
|
|
2092
|
+
merged[matchIndex] = this.mergeOrderRecords(order, merged[matchIndex]);
|
|
2093
|
+
}
|
|
1560
2094
|
continue;
|
|
1561
2095
|
}
|
|
1562
2096
|
if (!this.getOrderStorageKey(order))
|
|
@@ -1584,8 +2118,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
1584
2118
|
* @example
|
|
1585
2119
|
* await this.patchOrdersInSQLite(freshOrders)
|
|
1586
2120
|
*/
|
|
1587
|
-
async patchOrdersInSQLite(orders, source, mergeActions = {}) {
|
|
1588
|
-
if (
|
|
2121
|
+
async patchOrdersInSQLite(orders, source, mergeActions = {}, options = {}) {
|
|
2122
|
+
if (orders.length === 0) {
|
|
2123
|
+
return;
|
|
2124
|
+
}
|
|
2125
|
+
if (!this.dbManager) {
|
|
2126
|
+
if (options.throwOnError)
|
|
2127
|
+
throw new Error("订单 SQLite 数据库未初始化");
|
|
1589
2128
|
return;
|
|
1590
2129
|
}
|
|
1591
2130
|
const ordersSnapshot = (0, import_lodash_es.cloneDeep)(orders).map((order) => this.normalizeOrderCollectionsForIngress(order, `${source}.sqliteIngress`)).filter((order) => this.getOrderStorageKey(order));
|
|
@@ -1623,6 +2162,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
1623
2162
|
for (const order of compactedToWrite) {
|
|
1624
2163
|
await this.dbManager.update(INDEXDB_STORE_NAME, order);
|
|
1625
2164
|
}
|
|
2165
|
+
} else if (options.throwOnError) {
|
|
2166
|
+
throw new Error("订单 SQLite 数据库不支持写入");
|
|
1626
2167
|
}
|
|
1627
2168
|
this.recordRecentSqliteWrite(source, compactedToWrite);
|
|
1628
2169
|
this.logInfo("patchOrdersInSQLite-完成", {
|
|
@@ -1637,6 +2178,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
1637
2178
|
error: error instanceof Error ? error.message : String(error),
|
|
1638
2179
|
orderCount: ordersSnapshot.length
|
|
1639
2180
|
});
|
|
2181
|
+
if (options.throwOnError)
|
|
2182
|
+
throw error;
|
|
1640
2183
|
}
|
|
1641
2184
|
}
|
|
1642
2185
|
/**
|
|
@@ -1645,8 +2188,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
1645
2188
|
* @example
|
|
1646
2189
|
* await this.updateOrderInSQLite(freshOrder)
|
|
1647
2190
|
*/
|
|
1648
|
-
async updateOrderInSQLite(order, source) {
|
|
1649
|
-
if (!this.
|
|
2191
|
+
async updateOrderInSQLite(order, source, options = {}) {
|
|
2192
|
+
if (!this.getOrderStorageKey(order)) {
|
|
2193
|
+
if (options.throwOnError)
|
|
2194
|
+
throw new Error("订单缺少可用的 SQLite 存储主键");
|
|
2195
|
+
return;
|
|
2196
|
+
}
|
|
2197
|
+
if (!this.dbManager) {
|
|
2198
|
+
if (options.throwOnError)
|
|
2199
|
+
throw new Error("订单 SQLite 数据库未初始化");
|
|
1650
2200
|
return;
|
|
1651
2201
|
}
|
|
1652
2202
|
const orderSnapshot = this.normalizeOrderCollectionsForIngress(
|
|
@@ -1670,6 +2220,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
1670
2220
|
} else if (typeof this.dbManager.bulkAdd === "function") {
|
|
1671
2221
|
writeMethod = "bulkAdd";
|
|
1672
2222
|
await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
|
|
2223
|
+
} else if (options.throwOnError) {
|
|
2224
|
+
throw new Error("订单 SQLite 数据库不支持写入");
|
|
1673
2225
|
}
|
|
1674
2226
|
this.recordRecentSqliteWrite(source, [orderSnapshot]);
|
|
1675
2227
|
this.logInfo("updateOrderInSQLite-完成", {
|
|
@@ -1683,15 +2235,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
1683
2235
|
error: error instanceof Error ? error.message : String(error),
|
|
1684
2236
|
orderId: orderSnapshot.order_id ?? null
|
|
1685
2237
|
});
|
|
2238
|
+
if (options.throwOnError)
|
|
2239
|
+
throw error;
|
|
1686
2240
|
}
|
|
1687
2241
|
}
|
|
1688
2242
|
/**
|
|
1689
|
-
* 全量快照替换 orders 表(clear + bulkAdd
|
|
2243
|
+
* 全量快照替换 orders 表(clear + bulkAdd),并保留本地 draft / need_sync / pending 支付订单。
|
|
2244
|
+
* 用于 SSE 全量拉取与营业日窗口裁剪。
|
|
1690
2245
|
*
|
|
1691
2246
|
* @example
|
|
1692
2247
|
* await this.replaceOrdersSnapshotInSQLite(orderList)
|
|
1693
2248
|
*/
|
|
1694
|
-
async replaceOrdersSnapshotInSQLite(orderList, source) {
|
|
2249
|
+
async replaceOrdersSnapshotInSQLite(orderList, source, protectedOrdersBeforeRemoteFetch = []) {
|
|
1695
2250
|
if (!this.dbManager) {
|
|
1696
2251
|
return this.compactOrderListByIdentity(
|
|
1697
2252
|
orderList.map((order) => this.normalizeRemoteSyncedOrder(order)),
|
|
@@ -1708,16 +2263,52 @@ var OrderModule = class extends import_BaseModule.BaseModule {
|
|
|
1708
2263
|
try {
|
|
1709
2264
|
await this.runInOrderSQLiteSaveQueue(async () => {
|
|
1710
2265
|
const existingOrders = typeof this.dbManager.getAll === "function" ? await this.dbManager.getAll(INDEXDB_STORE_NAME) : [];
|
|
2266
|
+
const protectedLocalOrders = protectedOrdersBeforeRemoteFetch.map((order) => this.normalizeOrderCollectionsForIngress(
|
|
2267
|
+
order,
|
|
2268
|
+
`${source}.protectedBeforeRemoteFetch`
|
|
2269
|
+
)).filter((order) => this.shouldProtectLocalOrderFromRemoteSnapshot(order));
|
|
2270
|
+
for (const rawCurrentOrder of existingOrders || []) {
|
|
2271
|
+
const currentOrder = this.normalizeOrderCollectionsForIngress(
|
|
2272
|
+
rawCurrentOrder,
|
|
2273
|
+
`${source}.currentSQLite`
|
|
2274
|
+
);
|
|
2275
|
+
const protectedIndex = this.findOrderIndexByIdentity(
|
|
2276
|
+
protectedLocalOrders,
|
|
2277
|
+
currentOrder
|
|
2278
|
+
);
|
|
2279
|
+
const currentNeedsProtection = this.shouldProtectLocalOrderFromRemoteSnapshot(currentOrder);
|
|
2280
|
+
if (protectedIndex >= 0) {
|
|
2281
|
+
if (currentNeedsProtection) {
|
|
2282
|
+
protectedLocalOrders[protectedIndex] = currentOrder;
|
|
2283
|
+
} else {
|
|
2284
|
+
protectedLocalOrders.splice(protectedIndex, 1);
|
|
2285
|
+
}
|
|
2286
|
+
continue;
|
|
2287
|
+
}
|
|
2288
|
+
if (currentNeedsProtection)
|
|
2289
|
+
protectedLocalOrders.push(currentOrder);
|
|
2290
|
+
}
|
|
1711
2291
|
const orderListSnapshot = this.mergeRemoteSnapshotWithPendingOrders(
|
|
1712
2292
|
remoteSnapshot,
|
|
1713
|
-
|
|
2293
|
+
protectedLocalOrders
|
|
1714
2294
|
);
|
|
1715
2295
|
mergedSnapshot = this.compactOrderListByIdentity(orderListSnapshot, `${source}.sqliteSnapshot`).list;
|
|
1716
2296
|
this.logInfo("replaceOrdersSnapshotInSQLite-开始", {
|
|
1717
2297
|
source,
|
|
1718
2298
|
count: mergedSnapshot.length,
|
|
1719
2299
|
remoteCount: remoteSnapshot.length,
|
|
1720
|
-
|
|
2300
|
+
protectedBeforeRemoteFetchCount: protectedOrdersBeforeRemoteFetch.length,
|
|
2301
|
+
protectedLocalOrderCount: protectedLocalOrders.length,
|
|
2302
|
+
preservedLocalUnsyncedCount: mergedSnapshot.length - remoteSnapshot.length,
|
|
2303
|
+
protectedPendingPaymentCount: protectedLocalOrders.reduce(
|
|
2304
|
+
(count, order) => count + this.getIdentifiedPendingPayments(order).length,
|
|
2305
|
+
0
|
|
2306
|
+
),
|
|
2307
|
+
protectedPendingPaymentIdentities: protectedLocalOrders.flatMap((order) => this.getIdentifiedPendingPayments(order).map((payment) => ({
|
|
2308
|
+
order_id: order.order_id ?? null,
|
|
2309
|
+
external_sale_number: order.external_sale_number ?? null,
|
|
2310
|
+
payment_identities: (0, import_payment_utils.getOrderPaymentIdentityKeys)(payment)
|
|
2311
|
+
})))
|
|
1721
2312
|
});
|
|
1722
2313
|
await this.dbManager.clear(INDEXDB_STORE_NAME);
|
|
1723
2314
|
this.logInfo("replaceOrdersSnapshotInSQLite-clear完成", {
|