@pisell/pisellos 0.10.90 → 0.10.91
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/model/strategy/adapter/itemRule/adapter.d.ts +3 -1
- package/dist/model/strategy/adapter/itemRule/adapter.js +74 -7
- package/dist/model/strategy/adapter/itemRule/evaluator.d.ts +3 -1
- package/dist/model/strategy/adapter/itemRule/evaluator.js +13 -0
- package/dist/model/strategy/adapter/itemRule/type.d.ts +40 -1
- package/dist/model/strategy/adapter/itemRule/type.js +10 -0
- package/dist/model/strategy/adapter/promotion/evaluator.d.ts +2 -1
- package/dist/model/strategy/adapter/promotion/evaluator.js +103 -112
- package/dist/modules/BookingContext/utils/calendarBooking.d.ts +15 -0
- package/dist/modules/BookingContext/utils/calendarBooking.js +207 -0
- package/dist/modules/BookingContext/utils/index.d.ts +1 -0
- package/dist/modules/BookingContext/utils/index.js +1 -0
- package/dist/modules/BookingContext/utils/productExtend.d.ts +21 -0
- package/dist/modules/BookingContext/utils/productExtend.js +132 -33
- package/dist/modules/BookingContext/utils/resources.js +1 -1
- package/dist/modules/Cart/index.js +4 -3
- package/dist/modules/Cart/types.d.ts +2 -0
- package/dist/modules/Cart/utils/cartProduct.d.ts +3 -1
- package/dist/modules/Cart/utils/cartProduct.js +59 -32
- package/dist/modules/Date/index.d.ts +1 -1
- package/dist/modules/Date/index.js +60 -14
- package/dist/modules/Date/types.d.ts +5 -0
- package/dist/modules/OpenData/salesSettings.js +1 -1
- package/dist/modules/OpenData/types.d.ts +9 -0
- package/dist/modules/OpenData/utils.d.ts +1 -1
- package/dist/modules/OpenData/utils.js +3 -2
- package/dist/modules/Order/index.d.ts +22 -7
- package/dist/modules/Order/index.js +1565 -1161
- package/dist/modules/Order/localEftposState.d.ts +13 -0
- package/dist/modules/Order/localEftposState.js +39 -0
- package/dist/modules/Order/types.d.ts +33 -11
- package/dist/modules/Order/types.js +2 -2
- package/dist/modules/Order/unpaidAmountGap.d.ts +6 -0
- package/dist/modules/Order/unpaidAmountGap.js +72 -0
- package/dist/modules/Order/utils.d.ts +4 -1
- package/dist/modules/Order/utils.js +75 -52
- package/dist/modules/Payment/walletpass.js +32 -6
- package/dist/modules/Product/types.d.ts +16 -0
- package/dist/modules/ProductList/index.js +1 -1
- package/dist/modules/ResourcePlanner/planner.d.ts +2 -0
- package/dist/modules/ResourcePlanner/planner.js +383 -24
- package/dist/modules/ResourcePlanner/types.d.ts +42 -0
- package/dist/modules/Rules/index.js +86 -54
- package/dist/modules/Schedule/index.d.ts +7 -1
- package/dist/modules/Schedule/index.js +155 -39
- package/dist/modules/Schedule/types.d.ts +2 -0
- package/dist/modules/bookingReadValidation.d.ts +6 -0
- package/dist/modules/bookingReadValidation.js +72 -0
- package/dist/plugins/request.d.ts +2 -0
- package/dist/server/index.d.ts +9 -0
- package/dist/server/index.js +1928 -1462
- package/dist/server/modules/form/index.d.ts +19 -0
- package/dist/server/modules/form/index.js +205 -0
- package/dist/server/modules/form/types.d.ts +13 -0
- package/dist/server/modules/form/types.js +3 -0
- package/dist/server/modules/index.d.ts +3 -0
- package/dist/server/modules/index.js +4 -0
- package/dist/server/modules/order/index.d.ts +21 -0
- package/dist/server/modules/order/index.js +1399 -831
- package/dist/server/modules/order/types.d.ts +3 -0
- package/dist/server/modules/order/utils/filterOrders.js +20 -0
- package/dist/server/modules/products/index.d.ts +28 -7
- package/dist/server/modules/products/index.js +1295 -769
- package/dist/server/modules/products/replication.d.ts +8 -0
- package/dist/server/modules/products/replication.js +69 -0
- package/dist/server/modules/products/types.d.ts +12 -1
- package/dist/server/modules/products/types.js +4 -0
- package/dist/shared/receipt/customerInvoiceLanguages.d.ts +1 -1
- package/dist/shared/receipt/customerInvoiceLanguages.js +5 -3
- package/dist/shared/receipt/small-ticket.d.ts +1 -0
- package/dist/shared/receipt/small-ticket.js +58 -26
- package/dist/shared/receipt/templateVisibility.d.ts +3 -0
- package/dist/shared/receipt/templateVisibility.js +6 -2
- package/dist/solution/BaseSales/fulfillmentItemRules.d.ts +27 -0
- package/dist/solution/BaseSales/fulfillmentItemRules.js +750 -0
- package/dist/solution/BaseSales/index.d.ts +22 -6
- package/dist/solution/BaseSales/index.js +1881 -1347
- package/dist/solution/BaseSales/pickupTiming.d.ts +4 -0
- package/dist/solution/BaseSales/pickupTiming.js +35 -8
- package/dist/solution/BaseSales/types.d.ts +4 -0
- package/dist/solution/BaseSales/types.js +1 -0
- package/dist/solution/BaseSales/utils/posDurationPricing.d.ts +21 -0
- package/dist/solution/BaseSales/utils/posDurationPricing.js +174 -0
- package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts +2 -0
- package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +8 -8
- package/dist/solution/BookingByStep/index.d.ts +18 -2
- package/dist/solution/BookingByStep/index.js +681 -361
- package/dist/solution/BookingByStep/utils/resources.d.ts +10 -0
- package/dist/solution/BookingByStep/utils/resources.js +117 -76
- package/dist/solution/BookingTicket/index.d.ts +6 -0
- package/dist/solution/BookingTicket/index.js +666 -593
- package/dist/solution/BookingTicket/types.d.ts +1 -1
- package/dist/solution/BookingTicket/utils/addProductDecision.d.ts +2 -1
- package/dist/solution/BookingTicket/utils/addProductDecision.js +35 -8
- package/dist/solution/BookingTicket/utils/redeemArrival.d.ts +3 -3
- package/dist/solution/BookingTicket/utils/resolveUniqueCartDetail.d.ts +8 -0
- package/dist/solution/BookingTicket/utils/resolveUniqueCartDetail.js +188 -0
- package/dist/solution/BookingTicket/utils/scan/applyGlobalScan.js +58 -94
- package/dist/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.d.ts +1 -3
- package/dist/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.js +33 -62
- package/dist/solution/OrderInvoicePreview/index.js +4 -3
- package/dist/solution/Sales/index.js +1 -1
- package/dist/solution/ScanOrder/index.d.ts +2 -0
- package/dist/solution/ScanOrder/index.js +230 -97
- package/dist/solution/ScanOrder/menuAvailability.d.ts +24 -0
- package/dist/solution/ScanOrder/menuAvailability.js +363 -0
- package/dist/solution/ScanOrder/types.d.ts +3 -0
- package/dist/solution/UnifiedBookingSales/index.d.ts +42 -10
- package/dist/solution/UnifiedBookingSales/index.js +2493 -1496
- package/dist/solution/UnifiedBookingSales/salesSettings.js +1 -1
- package/dist/solution/UnifiedBookingSales/types.d.ts +20 -5
- package/dist/utils/pos-receipt-auto-print.d.ts +4 -0
- package/dist/utils/pos-receipt-auto-print.js +14 -0
- package/lib/model/strategy/adapter/itemRule/adapter.d.ts +3 -1
- package/lib/model/strategy/adapter/itemRule/adapter.js +54 -4
- package/lib/model/strategy/adapter/itemRule/evaluator.d.ts +3 -1
- package/lib/model/strategy/adapter/itemRule/evaluator.js +9 -0
- package/lib/model/strategy/adapter/itemRule/type.d.ts +40 -1
- package/lib/model/strategy/adapter/itemRule/type.js +10 -0
- package/lib/model/strategy/adapter/promotion/evaluator.d.ts +2 -1
- package/lib/model/strategy/adapter/promotion/evaluator.js +22 -21
- package/lib/modules/BookingContext/utils/calendarBooking.d.ts +15 -0
- package/lib/modules/BookingContext/utils/calendarBooking.js +156 -0
- package/lib/modules/BookingContext/utils/index.d.ts +1 -0
- package/lib/modules/BookingContext/utils/index.js +11 -0
- package/lib/modules/BookingContext/utils/productExtend.d.ts +21 -0
- package/lib/modules/BookingContext/utils/productExtend.js +104 -5
- package/lib/modules/BookingContext/utils/resources.js +1 -1
- package/lib/modules/Cart/index.js +4 -2
- package/lib/modules/Cart/types.d.ts +2 -0
- package/lib/modules/Cart/utils/cartProduct.d.ts +3 -1
- package/lib/modules/Cart/utils/cartProduct.js +39 -20
- package/lib/modules/Date/index.d.ts +1 -1
- package/lib/modules/Date/index.js +28 -5
- package/lib/modules/Date/types.d.ts +5 -0
- package/lib/modules/OpenData/salesSettings.js +1 -1
- package/lib/modules/OpenData/types.d.ts +9 -0
- package/lib/modules/OpenData/utils.d.ts +1 -1
- package/lib/modules/OpenData/utils.js +3 -2
- package/lib/modules/Order/index.d.ts +22 -7
- package/lib/modules/Order/index.js +457 -174
- package/lib/modules/Order/localEftposState.d.ts +13 -0
- package/lib/modules/Order/localEftposState.js +44 -0
- package/lib/modules/Order/types.d.ts +33 -11
- package/lib/modules/Order/types.js +2 -2
- package/lib/modules/Order/unpaidAmountGap.d.ts +6 -0
- package/lib/modules/Order/unpaidAmountGap.js +60 -0
- package/lib/modules/Order/utils.d.ts +4 -1
- package/lib/modules/Order/utils.js +29 -3
- package/lib/modules/Payment/walletpass.js +23 -1
- package/lib/modules/Product/types.d.ts +16 -0
- package/lib/modules/ProductList/index.js +1 -1
- package/lib/modules/ResourcePlanner/planner.d.ts +2 -0
- package/lib/modules/ResourcePlanner/planner.js +299 -9
- package/lib/modules/ResourcePlanner/types.d.ts +42 -0
- package/lib/modules/Rules/index.js +32 -3
- package/lib/modules/Schedule/index.d.ts +7 -1
- package/lib/modules/Schedule/index.js +68 -4
- package/lib/modules/Schedule/types.d.ts +2 -0
- package/lib/modules/bookingReadValidation.d.ts +6 -0
- package/lib/modules/bookingReadValidation.js +56 -0
- package/lib/plugins/request.d.ts +2 -0
- package/lib/server/index.d.ts +9 -0
- package/lib/server/index.js +279 -30
- package/lib/server/modules/form/index.d.ts +19 -0
- package/lib/server/modules/form/index.js +73 -0
- package/lib/server/modules/form/types.d.ts +13 -0
- package/lib/server/modules/form/types.js +9 -0
- package/lib/server/modules/index.d.ts +3 -0
- package/lib/server/modules/index.js +15 -1
- package/lib/server/modules/order/index.d.ts +21 -0
- package/lib/server/modules/order/index.js +344 -35
- package/lib/server/modules/order/types.d.ts +3 -0
- package/lib/server/modules/order/utils/filterOrders.js +18 -0
- package/lib/server/modules/products/index.d.ts +28 -7
- package/lib/server/modules/products/index.js +224 -62
- package/lib/server/modules/products/replication.d.ts +8 -0
- package/lib/server/modules/products/replication.js +30 -0
- package/lib/server/modules/products/types.d.ts +12 -1
- package/lib/server/modules/products/types.js +3 -0
- package/lib/shared/receipt/customerInvoiceLanguages.d.ts +1 -1
- package/lib/shared/receipt/customerInvoiceLanguages.js +5 -3
- package/lib/shared/receipt/small-ticket.d.ts +1 -0
- package/lib/shared/receipt/small-ticket.js +53 -25
- package/lib/shared/receipt/templateVisibility.d.ts +3 -0
- package/lib/shared/receipt/templateVisibility.js +6 -2
- package/lib/solution/BaseSales/fulfillmentItemRules.d.ts +27 -0
- package/lib/solution/BaseSales/fulfillmentItemRules.js +259 -0
- package/lib/solution/BaseSales/index.d.ts +22 -6
- package/lib/solution/BaseSales/index.js +347 -59
- package/lib/solution/BaseSales/pickupTiming.d.ts +4 -0
- package/lib/solution/BaseSales/pickupTiming.js +24 -3
- package/lib/solution/BaseSales/types.d.ts +4 -0
- package/lib/solution/BaseSales/types.js +1 -0
- package/lib/solution/BaseSales/utils/posDurationPricing.d.ts +21 -0
- package/lib/solution/BaseSales/utils/posDurationPricing.js +133 -0
- package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts +2 -0
- package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +1 -1
- package/lib/solution/BookingByStep/index.d.ts +18 -2
- package/lib/solution/BookingByStep/index.js +229 -17
- package/lib/solution/BookingByStep/utils/resources.d.ts +10 -0
- package/lib/solution/BookingByStep/utils/resources.js +25 -15
- package/lib/solution/BookingTicket/index.d.ts +6 -0
- package/lib/solution/BookingTicket/index.js +40 -5
- package/lib/solution/BookingTicket/types.d.ts +1 -1
- package/lib/solution/BookingTicket/utils/addProductDecision.d.ts +2 -1
- package/lib/solution/BookingTicket/utils/addProductDecision.js +34 -4
- package/lib/solution/BookingTicket/utils/redeemArrival.d.ts +3 -3
- package/lib/solution/BookingTicket/utils/resolveUniqueCartDetail.d.ts +8 -0
- package/lib/solution/BookingTicket/utils/resolveUniqueCartDetail.js +136 -0
- package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js +2 -14
- package/lib/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.d.ts +1 -3
- package/lib/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.js +17 -34
- package/lib/solution/OrderInvoicePreview/index.js +1 -0
- package/lib/solution/Sales/index.js +1 -1
- package/lib/solution/ScanOrder/index.d.ts +2 -0
- package/lib/solution/ScanOrder/index.js +131 -22
- package/lib/solution/ScanOrder/menuAvailability.d.ts +24 -0
- package/lib/solution/ScanOrder/menuAvailability.js +203 -0
- package/lib/solution/ScanOrder/types.d.ts +3 -0
- package/lib/solution/UnifiedBookingSales/index.d.ts +42 -10
- package/lib/solution/UnifiedBookingSales/index.js +717 -144
- package/lib/solution/UnifiedBookingSales/salesSettings.js +1 -1
- package/lib/solution/UnifiedBookingSales/types.d.ts +20 -5
- package/lib/utils/pos-receipt-auto-print.d.ts +4 -0
- package/lib/utils/pos-receipt-auto-print.js +13 -0
- package/package.json +1 -1
|
@@ -5,8 +5,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.OrderModule = void 0;
|
|
7
7
|
var _lodashEs = require("lodash-es");
|
|
8
|
+
var _localEftposState = require("../../../modules/Order/localEftposState");
|
|
8
9
|
var _dayjs = _interopRequireDefault(require("dayjs"));
|
|
9
10
|
var _BaseModule = require("../../../modules/BaseModule");
|
|
11
|
+
var _unpaidAmountGap = require("../../../modules/Order/unpaidAmountGap");
|
|
10
12
|
var _orderCollectionIdentity = require("../../../modules/Order/utils/orderCollectionIdentity");
|
|
11
13
|
var _types = require("./types");
|
|
12
14
|
var _paymentUtils = require("../../../modules/Order/payment-utils");
|
|
@@ -250,7 +252,7 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
250
252
|
this.logInfo('订单子项身份已规范化', context);
|
|
251
253
|
}
|
|
252
254
|
}
|
|
253
|
-
return result.order;
|
|
255
|
+
return (0, _unpaidAmountGap.normalizeUnpaidOrderAmountGap)(result.order);
|
|
254
256
|
}
|
|
255
257
|
|
|
256
258
|
/**
|
|
@@ -259,9 +261,9 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
259
261
|
mergeAuthoritativeOrderCollection(field, existing, incoming, uidRemaps = [], options = {}) {
|
|
260
262
|
const kind = ORDER_COLLECTION_KIND_BY_FIELD[field];
|
|
261
263
|
const existingItems = Array.isArray(existing) ? existing : [];
|
|
262
|
-
if (field === 'payments' && options.preserveIdentifiedPendingPayments) {
|
|
264
|
+
if (field === 'payments' && (options.preserveIdentifiedPendingPayments || existingItems.some(_localEftposState.isLocalFinalizedPayment))) {
|
|
263
265
|
return (0, _paymentUtils.mergeOrderPaymentListsByIdentity)(existingItems, incoming, {
|
|
264
|
-
preserveUnmatchedExistingWhen: _paymentUtils.isIdentifiedPendingOrderPayment
|
|
266
|
+
preserveUnmatchedExistingWhen: payment => options.preserveIdentifiedPendingPayments === true && (0, _paymentUtils.isIdentifiedPendingOrderPayment)(payment) || (0, _localEftposState.isLocalFinalizedPayment)(payment)
|
|
265
267
|
});
|
|
266
268
|
}
|
|
267
269
|
return incoming.map(incomingItem => {
|
|
@@ -365,7 +367,7 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
365
367
|
continue;
|
|
366
368
|
}
|
|
367
369
|
|
|
368
|
-
//
|
|
370
|
+
// 远端商品成员、Holder 关系或预约数据确实变化时必须落库,避免被回声窗口跳过。
|
|
369
371
|
if (forceWriteStorageKeys.has(storageKey)) {
|
|
370
372
|
toWrite.push(order);
|
|
371
373
|
continue;
|
|
@@ -638,6 +640,42 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
638
640
|
const memoryOrder = this.store.list.find(order => this.isOrderLookupMatch(order, key));
|
|
639
641
|
return memoryOrder || null;
|
|
640
642
|
}
|
|
643
|
+
|
|
644
|
+
/** Read-only payment gate lookup; never hydrate the whole order list on a miss. */
|
|
645
|
+
async getLocalOrderForPaymentReadiness(lookup) {
|
|
646
|
+
if (lookup === undefined || lookup === null || lookup === '') return null;
|
|
647
|
+
const memoryOrder = this.getLocalOrderFromMemoryByLookup(lookup);
|
|
648
|
+
if (memoryOrder) return memoryOrder;
|
|
649
|
+
if (typeof this.dbManager?.find !== 'function') {
|
|
650
|
+
return this.getLocalOrderByLookup(lookup);
|
|
651
|
+
}
|
|
652
|
+
const key = this.getIdKey(lookup);
|
|
653
|
+
const fields = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
|
|
654
|
+
const candidates = [];
|
|
655
|
+
for (const column of fields) {
|
|
656
|
+
// Match getAll's storage-key ordering even when aliases collide across rows.
|
|
657
|
+
// Let query errors reach the payment gate rather than treating them as a miss.
|
|
658
|
+
const rows = await this.dbManager.find(INDEXDB_STORE_NAME, {
|
|
659
|
+
filters: [{
|
|
660
|
+
column,
|
|
661
|
+
op: '=',
|
|
662
|
+
value: key
|
|
663
|
+
}],
|
|
664
|
+
orderBy: [{
|
|
665
|
+
column: '__order_storage_key',
|
|
666
|
+
dir: 'asc'
|
|
667
|
+
}],
|
|
668
|
+
limit: 1
|
|
669
|
+
});
|
|
670
|
+
if (rows?.[0] && this.isOrderLookupMatch(rows[0], key)) candidates.push(rows[0]);
|
|
671
|
+
}
|
|
672
|
+
candidates.sort((left, right) => {
|
|
673
|
+
const leftKey = String(left.__order_storage_key ?? this.getOrderStorageKey(left));
|
|
674
|
+
const rightKey = String(right.__order_storage_key ?? this.getOrderStorageKey(right));
|
|
675
|
+
return leftKey < rightKey ? -1 : leftKey > rightKey ? 1 : 0;
|
|
676
|
+
});
|
|
677
|
+
return candidates.length ? this.normalizeOrderForMemoryList(candidates[0], 'paymentReadiness.sqlite') : null;
|
|
678
|
+
}
|
|
641
679
|
async getLocalOrderByLookup(lookup, options = {}) {
|
|
642
680
|
const key = this.getIdKey(lookup);
|
|
643
681
|
const logContext = {
|
|
@@ -754,6 +792,13 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
754
792
|
return null;
|
|
755
793
|
}
|
|
756
794
|
const previousPayment = (0, _lodashEs.cloneDeep)(found.payment);
|
|
795
|
+
if (params.finalizeUnsuccessful && (found.payment.status === 'paid' || found.payment.metadata?.transactions?.some(transaction => transaction.status === 'success') || (0, _localEftposState.isLocalFinalizedPayment)(found.payment))) {
|
|
796
|
+
return {
|
|
797
|
+
order: found.order,
|
|
798
|
+
payment: found.payment,
|
|
799
|
+
previousPayment
|
|
800
|
+
};
|
|
801
|
+
}
|
|
757
802
|
const nextPayment = (0, _paymentUtils.mergeOrderPaymentRecord)(found.payment, {
|
|
758
803
|
...params.updates,
|
|
759
804
|
updated_at: params.updates.updated_at || (0, _dayjs.default)().format('YYYY-MM-DD HH:mm:ss')
|
|
@@ -763,6 +808,13 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
763
808
|
payments: (found.order.payments || []).map((payment, index) => index === found.paymentIndex ? nextPayment : payment),
|
|
764
809
|
updated_at: (0, _dayjs.default)().format('YYYY-MM-DD HH:mm:ss')
|
|
765
810
|
};
|
|
811
|
+
if (params.finalizeUnsuccessful && this.hasRealOrderId(found.order) && Number(found.order.need_sync || 0) === 0 && !(nextOrder.payments || []).some(_paymentUtils.isPendingOrderPayment)) {
|
|
812
|
+
nextOrder.is_draft_order = 0;
|
|
813
|
+
nextOrder.metadata = {
|
|
814
|
+
...nextOrder.metadata,
|
|
815
|
+
[_localEftposState.LOCAL_EFTPOS_REFRESH_REQUIRED]: true
|
|
816
|
+
};
|
|
817
|
+
}
|
|
766
818
|
const paymentContext = {
|
|
767
819
|
...logContext,
|
|
768
820
|
matched_by: found.matchedBy,
|
|
@@ -814,6 +866,60 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
814
866
|
previousPayment
|
|
815
867
|
};
|
|
816
868
|
}
|
|
869
|
+
async finalizeLocalEftposPayment(params) {
|
|
870
|
+
const found = await this.getLocalPayment(params);
|
|
871
|
+
if (!found) throw new Error('未找到本地支付记录');
|
|
872
|
+
const transactions = found.payment.metadata?.transactions || [];
|
|
873
|
+
if (transactions.some(transaction => transaction.status !== 'fail' && transaction.status !== 'success' && !params.failedTransactionNumbers.includes(String(transaction.number)))) {
|
|
874
|
+
throw new Error('仍有结果未知的交易,保留待确认支付');
|
|
875
|
+
}
|
|
876
|
+
if (params.result === 'not_started' && transactions.length > 0 && !(0, _localEftposState.isLocalFinalizedPayment)(found.payment) && found.payment.status !== 'paid') {
|
|
877
|
+
throw new Error('支付已有交易记录,不能按未发起交易结束');
|
|
878
|
+
}
|
|
879
|
+
return this.updateLocalPayment({
|
|
880
|
+
...params,
|
|
881
|
+
finalizeUnsuccessful: true,
|
|
882
|
+
updates: {
|
|
883
|
+
status: 'voided',
|
|
884
|
+
metadata: {
|
|
885
|
+
[_localEftposState.LOCAL_EFTPOS_FINALIZED]: true,
|
|
886
|
+
transactions: params.failedTransactionNumbers.map(number => ({
|
|
887
|
+
number,
|
|
888
|
+
status: 'fail'
|
|
889
|
+
}))
|
|
890
|
+
}
|
|
891
|
+
}
|
|
892
|
+
});
|
|
893
|
+
}
|
|
894
|
+
|
|
895
|
+
/** Only a successful full detail GET may release the persisted payment gate. */
|
|
896
|
+
async completeLocalPaymentRefresh(fresh) {
|
|
897
|
+
const existing = await this.getLocalOrderByLookup(fresh.order_id);
|
|
898
|
+
if (!existing || !(0, _localEftposState.requiresLocalPaymentRefresh)(existing)) {
|
|
899
|
+
await this.upsertOrdersFromRemote([fresh]);
|
|
900
|
+
return (await this.getLocalOrderByLookup(fresh.order_id)) || fresh;
|
|
901
|
+
}
|
|
902
|
+
if (this.isPendingSyncOrder(existing) || this.isDraftOrder(existing) || (existing.payments || []).some(_paymentUtils.isPendingOrderPayment)) {
|
|
903
|
+
throw new Error('订单仍有未结束支付或待同步改动,暂不能刷新');
|
|
904
|
+
}
|
|
905
|
+
if (!Array.isArray(fresh.products) || !fresh.summary) {
|
|
906
|
+
throw new Error('远端订单详情不完整,请重新刷新');
|
|
907
|
+
}
|
|
908
|
+
const nextOrder = this.mergeOrderRecords(existing, this.normalizeRemoteSyncedOrder(fresh));
|
|
909
|
+
nextOrder.metadata = {
|
|
910
|
+
...nextOrder.metadata
|
|
911
|
+
};
|
|
912
|
+
delete nextOrder.metadata[_localEftposState.LOCAL_EFTPOS_REFRESH_REQUIRED];
|
|
913
|
+
// Do not publish/clear the gate in memory until SQLite has accepted the full snapshot.
|
|
914
|
+
await this.updateOrderInSQLite(nextOrder, 'completeLocalPaymentRefresh', {
|
|
915
|
+
throwOnError: true
|
|
916
|
+
});
|
|
917
|
+
const index = this.findOrderIndexByIdentity(this.store.list, existing);
|
|
918
|
+
this.store.list = index < 0 ? [...this.store.list, nextOrder] : this.store.list.map((order, i) => i === index ? nextOrder : order);
|
|
919
|
+
this.syncOrdersMap();
|
|
920
|
+
await this.emitOrdersChanged([nextOrder], 'completeLocalPaymentRefresh');
|
|
921
|
+
return nextOrder;
|
|
922
|
+
}
|
|
817
923
|
async loadOrdersByServer(options = {}) {
|
|
818
924
|
let orderList = [];
|
|
819
925
|
let hasFetchedRemoteSnapshot = false;
|
|
@@ -1130,6 +1236,8 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
1130
1236
|
this.logInfo('upsertPendingSyncOrders-开始', {
|
|
1131
1237
|
count: pendingMap.size
|
|
1132
1238
|
});
|
|
1239
|
+
const storageKeyMigrations = [];
|
|
1240
|
+
const previousStorageKeys = this.store.list.map(order => this.getPersistedOrderStorageKey(order));
|
|
1133
1241
|
const mergeActions = {};
|
|
1134
1242
|
const updatedList = this.store.list.map(order => this.normalizeOrderForMemoryList(order, 'upsertPendingSyncOrders.existingMemory'));
|
|
1135
1243
|
|
|
@@ -1143,7 +1251,7 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
1143
1251
|
}
|
|
1144
1252
|
}
|
|
1145
1253
|
for (const [storageKey, pendingOrder] of memoryPendingMap.entries()) {
|
|
1146
|
-
const matchIndex = this.
|
|
1254
|
+
const matchIndex = this.findLocalOrderIndexByIdentity(identityKeyToIndex, updatedList, pendingOrder);
|
|
1147
1255
|
if (matchIndex >= 0) {
|
|
1148
1256
|
const existingOrder = updatedList[matchIndex];
|
|
1149
1257
|
const mergedOrder = this.mergeOrderRecords(existingOrder, pendingOrder);
|
|
@@ -1152,6 +1260,15 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
1152
1260
|
need_sync: 1,
|
|
1153
1261
|
is_draft_order: 0
|
|
1154
1262
|
};
|
|
1263
|
+
const previousStorageKey = previousStorageKeys[matchIndex];
|
|
1264
|
+
if (previousStorageKey && previousStorageKey !== storageKey) {
|
|
1265
|
+
storageKeyMigrations.push({
|
|
1266
|
+
orderId: nextOrder.order_id ?? null,
|
|
1267
|
+
from: previousStorageKey,
|
|
1268
|
+
to: storageKey
|
|
1269
|
+
});
|
|
1270
|
+
delete nextOrder[ORDER_STORAGE_KEY_FIELD];
|
|
1271
|
+
}
|
|
1155
1272
|
updatedList[matchIndex] = nextOrder;
|
|
1156
1273
|
const pendingSnapshot = pendingMap.get(storageKey);
|
|
1157
1274
|
if (pendingSnapshot) {
|
|
@@ -1173,7 +1290,10 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
1173
1290
|
this.store.list = this.runOrderStoreSelfCheck(updatedList, 'upsertPendingSyncOrders.store');
|
|
1174
1291
|
this.syncOrdersMap();
|
|
1175
1292
|
try {
|
|
1176
|
-
await this.patchOrdersInSQLite(patchedOrders, 'upsertPendingSyncOrders', mergeActions,
|
|
1293
|
+
await this.patchOrdersInSQLite(patchedOrders, 'upsertPendingSyncOrders', mergeActions, {
|
|
1294
|
+
...options,
|
|
1295
|
+
storageKeyMigrations
|
|
1296
|
+
});
|
|
1177
1297
|
} catch (error) {
|
|
1178
1298
|
this.store.list = previousList;
|
|
1179
1299
|
this.syncOrdersMap();
|
|
@@ -1222,8 +1342,10 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
1222
1342
|
memoryDraftCount: memoryDraftMap.size,
|
|
1223
1343
|
sqliteOnlyDraftCount: draftMap.size - memoryDraftMap.size
|
|
1224
1344
|
});
|
|
1345
|
+
const storageKeyMigrations = [];
|
|
1225
1346
|
const mergeActions = {};
|
|
1226
1347
|
const updatedList = this.store.list.filter(order => this.shouldKeepOrderInMemory(order));
|
|
1348
|
+
const previousStorageKeys = updatedList.map(order => this.getPersistedOrderStorageKey(order));
|
|
1227
1349
|
const identityKeyToIndex = new Map();
|
|
1228
1350
|
for (let index = 0; index < updatedList.length; index += 1) {
|
|
1229
1351
|
for (const key of this.getOrderIdentityMatchKeys(updatedList[index])) {
|
|
@@ -1231,9 +1353,10 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
1231
1353
|
}
|
|
1232
1354
|
}
|
|
1233
1355
|
for (const [storageKey, draftOrder] of memoryDraftMap.entries()) {
|
|
1234
|
-
const matchIndex = this.
|
|
1356
|
+
const matchIndex = this.findLocalOrderIndexByIdentity(identityKeyToIndex, updatedList, draftOrder);
|
|
1235
1357
|
if (matchIndex >= 0) {
|
|
1236
1358
|
const existingOrder = updatedList[matchIndex];
|
|
1359
|
+
const previousStorageKey = previousStorageKeys[matchIndex];
|
|
1237
1360
|
const reconciledDraftOrder = this.preserveExistingBusinessCodeForDraft(existingOrder, draftOrder);
|
|
1238
1361
|
this.applyHolderRelationsSnapshot(reconciledDraftOrder, existingOrder, draftOrder);
|
|
1239
1362
|
const mergedOrder = this.mergeOrderRecords(existingOrder, reconciledDraftOrder);
|
|
@@ -1242,6 +1365,14 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
1242
1365
|
need_sync: 0,
|
|
1243
1366
|
is_draft_order: 1
|
|
1244
1367
|
};
|
|
1368
|
+
if (previousStorageKey && previousStorageKey !== storageKey) {
|
|
1369
|
+
storageKeyMigrations.push({
|
|
1370
|
+
orderId: nextOrder.order_id ?? null,
|
|
1371
|
+
from: previousStorageKey,
|
|
1372
|
+
to: storageKey
|
|
1373
|
+
});
|
|
1374
|
+
delete nextOrder[ORDER_STORAGE_KEY_FIELD];
|
|
1375
|
+
}
|
|
1245
1376
|
updatedList[matchIndex] = nextOrder;
|
|
1246
1377
|
// SQLite 必须与内存中的草稿保持同一份 business_code,避免下次 hydrate 再次丢失分类。
|
|
1247
1378
|
draftMap.set(storageKey, reconciledDraftOrder);
|
|
@@ -1260,7 +1391,8 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
1260
1391
|
this.syncOrdersMap();
|
|
1261
1392
|
try {
|
|
1262
1393
|
await this.patchOrdersInSQLite(patchedOrders, 'upsertLocalDraftOrders', mergeActions, {
|
|
1263
|
-
throwOnError: true
|
|
1394
|
+
throwOnError: true,
|
|
1395
|
+
storageKeyMigrations
|
|
1264
1396
|
});
|
|
1265
1397
|
} catch (error) {
|
|
1266
1398
|
this.store.list = previousList;
|
|
@@ -1710,7 +1842,7 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
1710
1842
|
const mergedStorageKey = this.getOrderStorageKey(mergedOrder);
|
|
1711
1843
|
if (mergedStorageKey) forceWriteStorageKeys.add(mergedStorageKey);
|
|
1712
1844
|
}
|
|
1713
|
-
if (nextStorageKey && !(0, _lodashEs.isEqual)(existingOrder.holder_relations, mergedOrder.holder_relations)) {
|
|
1845
|
+
if (nextStorageKey && (!(0, _lodashEs.isEqual)(existingOrder.holder_relations, mergedOrder.holder_relations) || !(0, _lodashEs.isEqual)(existingOrder.bookings, mergedOrder.bookings))) {
|
|
1714
1846
|
forceWriteStorageKeys.add(nextStorageKey);
|
|
1715
1847
|
}
|
|
1716
1848
|
// 合并后身份字段可能新增(如挂单拿到 order_id),同步登记到索引,
|
|
@@ -1932,6 +2064,23 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
1932
2064
|
}
|
|
1933
2065
|
return this.getOrderStorageKey(order);
|
|
1934
2066
|
}
|
|
2067
|
+
getRealOrderId(order) {
|
|
2068
|
+
if (this.isBlankIdentityValue(order.order_id)) return '';
|
|
2069
|
+
if (String(order.order_id) === String(order.external_sale_number)) return '';
|
|
2070
|
+
return String(order.order_id);
|
|
2071
|
+
}
|
|
2072
|
+
findLocalOrderIndexByIdentity(identityKeyToIndex, orders, target) {
|
|
2073
|
+
const id = this.getRealOrderId(target);
|
|
2074
|
+
const keys = id ? [`order_id:${id}`] : [];
|
|
2075
|
+
if (!this.isBlankIdentityValue(target.external_sale_number)) {
|
|
2076
|
+
keys.push(`external_sale_number:${target.external_sale_number}`);
|
|
2077
|
+
}
|
|
2078
|
+
const indexes = keys.map(key => identityKeyToIndex.get(key)).filter(index => index !== undefined).sort((left, right) => left - right);
|
|
2079
|
+
return indexes.find(index => {
|
|
2080
|
+
const existingId = this.getRealOrderId(orders[index]);
|
|
2081
|
+
return !id || !existingId || id === existingId;
|
|
2082
|
+
}) ?? -1;
|
|
2083
|
+
}
|
|
1935
2084
|
getOrderIdentityMatchKeys(order) {
|
|
1936
2085
|
return this.getOrderIdentityEntries(order).map(entry => `${entry.field}:${entry.key}`);
|
|
1937
2086
|
}
|
|
@@ -2005,7 +2154,7 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
2005
2154
|
return payments.filter(payment => (0, _paymentUtils.isIdentifiedPendingOrderPayment)(payment));
|
|
2006
2155
|
}
|
|
2007
2156
|
shouldProtectLocalOrderFromRemoteSnapshot(order) {
|
|
2008
|
-
return this.isPendingSyncOrder(order) || this.isDraftOrder(order) || this.getIdentifiedPendingPayments(order).length > 0;
|
|
2157
|
+
return this.isPendingSyncOrder(order) || this.isDraftOrder(order) || this.getIdentifiedPendingPayments(order).length > 0 || (0, _localEftposState.requiresLocalPaymentRefresh)(order) || (order.payments || []).some(_localEftposState.isLocalFinalizedPayment);
|
|
2009
2158
|
}
|
|
2010
2159
|
getUnmatchedIdentifiedPendingPayments(existing, incoming) {
|
|
2011
2160
|
const existingPayments = Array.isArray(existing) ? existing : [];
|
|
@@ -2059,6 +2208,12 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
2059
2208
|
const secondaryRecord = secondary;
|
|
2060
2209
|
const existingRecord = existing;
|
|
2061
2210
|
const incomingRecord = incoming;
|
|
2211
|
+
if ((0, _localEftposState.requiresLocalPaymentRefresh)(existing)) {
|
|
2212
|
+
mergedRecord.metadata = {
|
|
2213
|
+
...mergedRecord.metadata,
|
|
2214
|
+
[_localEftposState.LOCAL_EFTPOS_REFRESH_REQUIRED]: true
|
|
2215
|
+
};
|
|
2216
|
+
}
|
|
2062
2217
|
const childUidRemaps = [];
|
|
2063
2218
|
for (const field of fieldsToPreserve) {
|
|
2064
2219
|
if (!this.isBlankIdentityValue(preferredRecord[field])) {
|
|
@@ -2272,23 +2427,190 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
2272
2427
|
if (!this.dbManager) return [];
|
|
2273
2428
|
try {
|
|
2274
2429
|
const loadStartedAt = performance.now();
|
|
2275
|
-
const
|
|
2276
|
-
|
|
2277
|
-
|
|
2278
|
-
|
|
2279
|
-
|
|
2280
|
-
|
|
2281
|
-
|
|
2282
|
-
|
|
2283
|
-
|
|
2284
|
-
|
|
2430
|
+
const memoryBeforeLoad = this.store.list;
|
|
2431
|
+
let normalizedOrders = [];
|
|
2432
|
+
// 读修复与普通订单写入共用队列,避免用排队前的旧快照覆盖新的待同步订单。
|
|
2433
|
+
await this.runInOrderSQLiteSaveQueue(async () => {
|
|
2434
|
+
const rawReadStartedAt = performance.now();
|
|
2435
|
+
const orders = await this.dbManager.getAll(INDEXDB_STORE_NAME);
|
|
2436
|
+
const sqliteRawReadMs = +(performance.now() - rawReadStartedAt).toFixed(2);
|
|
2437
|
+
const normalizeStartedAt = performance.now();
|
|
2438
|
+
const {
|
|
2439
|
+
list,
|
|
2440
|
+
repairs,
|
|
2441
|
+
obsoleteKeys
|
|
2442
|
+
} = this.deduplicateStoredOrders(orders || []);
|
|
2443
|
+
normalizedOrders = list;
|
|
2444
|
+
const sqliteNormalizeMs = +(performance.now() - normalizeStartedAt).toFixed(2);
|
|
2445
|
+
if (repairs.length > 0) {
|
|
2446
|
+
try {
|
|
2447
|
+
// 先保存完整的保留记录,成功后才逐个删除旧键;不清空 orders 表。
|
|
2448
|
+
await this.writeOrderRowsToSQLite(repairs);
|
|
2449
|
+
this.recordRecentSqliteWrite('loadOrdersFromSQLite.deduplicate', repairs);
|
|
2450
|
+
for (const key of obsoleteKeys) {
|
|
2451
|
+
await this.dbManager.delete(INDEXDB_STORE_NAME, key);
|
|
2452
|
+
this.recentSqliteWriteByStorageKey.delete(key);
|
|
2453
|
+
}
|
|
2454
|
+
this.logInfo('SQLite重复订单已修复', {
|
|
2455
|
+
beforeCount: orders.length,
|
|
2456
|
+
afterCount: list.length,
|
|
2457
|
+
repairedCount: repairs.length,
|
|
2458
|
+
deletedKeyCount: obsoleteKeys.size
|
|
2459
|
+
});
|
|
2460
|
+
} catch (error) {
|
|
2461
|
+
// 本次仍使用去重后的内存快照;保留磁盘记录,后续读取可重试修复。
|
|
2462
|
+
this.logError('SQLite重复订单修复写入失败', {
|
|
2463
|
+
error: error instanceof Error ? error.message : String(error),
|
|
2464
|
+
repairedCount: repairs.length
|
|
2465
|
+
});
|
|
2466
|
+
}
|
|
2467
|
+
}
|
|
2468
|
+
options.onTiming?.({
|
|
2469
|
+
sqliteRawReadMs,
|
|
2470
|
+
sqliteNormalizeMs,
|
|
2471
|
+
sqliteLoadTotalMs: +(performance.now() - loadStartedAt).toFixed(2)
|
|
2472
|
+
});
|
|
2285
2473
|
});
|
|
2474
|
+
if (this.store.list !== memoryBeforeLoad) {
|
|
2475
|
+
// 读取期间可能已开始新的本地结账;回灌不能抹掉尚在排队落库的修改。
|
|
2476
|
+
const previousOrders = new Map(memoryBeforeLoad.map(order => [this.getOrderStorageKey(order), order]));
|
|
2477
|
+
const protectedMemoryOrders = this.store.list.filter(order => this.shouldProtectLocalOrderFromRemoteSnapshot(order) && !(0, _lodashEs.isEqual)(previousOrders.get(this.getOrderStorageKey(order)), order));
|
|
2478
|
+
normalizedOrders = this.deduplicateStoredOrders([...normalizedOrders, ...protectedMemoryOrders], new Set(protectedMemoryOrders)).list;
|
|
2479
|
+
}
|
|
2286
2480
|
return normalizedOrders;
|
|
2287
2481
|
} catch (error) {
|
|
2288
2482
|
if (options.throwOnError) throw error;
|
|
2289
2483
|
return [];
|
|
2290
2484
|
}
|
|
2291
2485
|
}
|
|
2486
|
+
|
|
2487
|
+
/** 历史记录只按真实订单 ID / 唯一本地编号归组,不使用桌号或小票短号。 */
|
|
2488
|
+
deduplicateStoredOrders(orders, authoritativeOrders = new Set()) {
|
|
2489
|
+
const idsByExternal = new Map();
|
|
2490
|
+
for (const order of orders) {
|
|
2491
|
+
const id = this.getRealOrderId(order);
|
|
2492
|
+
const external = order.external_sale_number;
|
|
2493
|
+
if (!id || this.isBlankIdentityValue(external)) continue;
|
|
2494
|
+
const key = String(external);
|
|
2495
|
+
const previous = idsByExternal.get(key);
|
|
2496
|
+
idsByExternal.set(key, previous === undefined || previous === id ? id : null);
|
|
2497
|
+
}
|
|
2498
|
+
const groups = new Map();
|
|
2499
|
+
for (const [index, rawOrder] of orders.entries()) {
|
|
2500
|
+
const external = this.isBlankIdentityValue(rawOrder.external_sale_number) ? '' : String(rawOrder.external_sale_number);
|
|
2501
|
+
const id = this.getRealOrderId(rawOrder) || external && idsByExternal.get(external);
|
|
2502
|
+
const identity = id ? `id:${id}` : external ? `external:${external}` : `row:${index}`;
|
|
2503
|
+
const storageKey = this.getPersistedOrderStorageKey(rawOrder);
|
|
2504
|
+
const order = this.normalizeOrderCollectionsForIngress(rawOrder, 'loadOrdersFromSQLite');
|
|
2505
|
+
const group = groups.get(identity);
|
|
2506
|
+
if (group) {
|
|
2507
|
+
group.order = this.mergeStoredOrderCopies(group.order, order, authoritativeOrders.has(rawOrder));
|
|
2508
|
+
group.keys.add(storageKey);
|
|
2509
|
+
group.count += 1;
|
|
2510
|
+
} else {
|
|
2511
|
+
groups.set(identity, {
|
|
2512
|
+
order,
|
|
2513
|
+
keys: new Set([storageKey]),
|
|
2514
|
+
count: 1
|
|
2515
|
+
});
|
|
2516
|
+
}
|
|
2517
|
+
}
|
|
2518
|
+
const canonicalKeyCounts = new Map();
|
|
2519
|
+
for (const {
|
|
2520
|
+
order
|
|
2521
|
+
} of groups.values()) {
|
|
2522
|
+
const key = this.getOrderStorageKey(order);
|
|
2523
|
+
canonicalKeyCounts.set(key, (canonicalKeyCounts.get(key) || 0) + 1);
|
|
2524
|
+
}
|
|
2525
|
+
const list = [];
|
|
2526
|
+
const repairs = [];
|
|
2527
|
+
const obsoleteKeys = new Set();
|
|
2528
|
+
for (const group of groups.values()) {
|
|
2529
|
+
const key = this.getOrderStorageKey(group.order);
|
|
2530
|
+
const needsRepair = group.count > 1 || [...group.keys].some(oldKey => oldKey !== key);
|
|
2531
|
+
// 不同真实订单若错误地共用 external 编号,不允许修复写入互相覆盖。
|
|
2532
|
+
if (needsRepair && key && canonicalKeyCounts.get(key) === 1) {
|
|
2533
|
+
group.order = {
|
|
2534
|
+
...group.order,
|
|
2535
|
+
[ORDER_STORAGE_KEY_FIELD]: key
|
|
2536
|
+
};
|
|
2537
|
+
repairs.push(group.order);
|
|
2538
|
+
for (const oldKey of group.keys) {
|
|
2539
|
+
if (oldKey && oldKey !== key && !canonicalKeyCounts.has(oldKey)) obsoleteKeys.add(oldKey);
|
|
2540
|
+
}
|
|
2541
|
+
}
|
|
2542
|
+
list.push(group.order);
|
|
2543
|
+
}
|
|
2544
|
+
return {
|
|
2545
|
+
list,
|
|
2546
|
+
repairs,
|
|
2547
|
+
obsoleteKeys
|
|
2548
|
+
};
|
|
2549
|
+
}
|
|
2550
|
+
mergeStoredOrderCopies(left, right, preferIncoming = false) {
|
|
2551
|
+
const priority = order => this.isPendingSyncOrder(order) ? 2 : this.isDraftOrder(order) ? 1 : 0;
|
|
2552
|
+
const leftHasExternal = !this.isBlankIdentityValue(left.external_sale_number);
|
|
2553
|
+
const rightHasExternal = !this.isBlankIdentityValue(right.external_sale_number);
|
|
2554
|
+
let preferred = leftHasExternal !== rightHasExternal ? leftHasExternal ? left : right : this.pickPreferredOrder(left, right);
|
|
2555
|
+
if (preferIncoming) {
|
|
2556
|
+
preferred = right;
|
|
2557
|
+
} else if (priority(left) !== priority(right)) {
|
|
2558
|
+
preferred = priority(left) > priority(right) ? left : right;
|
|
2559
|
+
} else {
|
|
2560
|
+
for (const field of ['updated_at', 'created_at']) {
|
|
2561
|
+
const timestamp = order => {
|
|
2562
|
+
const value = order[field];
|
|
2563
|
+
if (!value) return 0;
|
|
2564
|
+
const parsed = (0, _dayjs.default)(value);
|
|
2565
|
+
return parsed.isValid() ? parsed.valueOf() : 0;
|
|
2566
|
+
};
|
|
2567
|
+
if (timestamp(left) === timestamp(right)) continue;
|
|
2568
|
+
preferred = timestamp(left) > timestamp(right) ? left : right;
|
|
2569
|
+
break;
|
|
2570
|
+
}
|
|
2571
|
+
}
|
|
2572
|
+
const secondary = preferred === left ? right : left;
|
|
2573
|
+
// 复用集合合并中的 pending/finalized 支付保护,但完整业务快照以胜者为准。
|
|
2574
|
+
const reconciled = this.mergeOrderRecords(secondary, preferred);
|
|
2575
|
+
const merged = {
|
|
2576
|
+
...reconciled,
|
|
2577
|
+
...(0, _lodashEs.cloneDeep)(preferred)
|
|
2578
|
+
};
|
|
2579
|
+
const realOrder = this.getRealOrderId(preferred) ? preferred : secondary;
|
|
2580
|
+
if (this.getRealOrderId(realOrder)) merged.order_id = realOrder.order_id;
|
|
2581
|
+
for (const {
|
|
2582
|
+
field
|
|
2583
|
+
} of this.getOrderIdentityEntries(reconciled)) {
|
|
2584
|
+
if (this.isBlankIdentityValue(merged[field])) merged[field] = reconciled[field];
|
|
2585
|
+
}
|
|
2586
|
+
for (const field of ORDER_AUTHORITATIVE_COLLECTION_FIELDS) {
|
|
2587
|
+
if (Object.prototype.hasOwnProperty.call(reconciled, field)) merged[field] = reconciled[field];
|
|
2588
|
+
}
|
|
2589
|
+
if ((0, _localEftposState.requiresLocalPaymentRefresh)(secondary)) {
|
|
2590
|
+
merged.metadata = {
|
|
2591
|
+
...merged.metadata,
|
|
2592
|
+
[_localEftposState.LOCAL_EFTPOS_REFRESH_REQUIRED]: true
|
|
2593
|
+
};
|
|
2594
|
+
}
|
|
2595
|
+
merged.need_sync = this.isPendingSyncOrder(left) || this.isPendingSyncOrder(right) ? 1 : 0;
|
|
2596
|
+
merged.is_draft_order = this.isDraftOrder(preferred) ? 1 : 0;
|
|
2597
|
+
return merged;
|
|
2598
|
+
}
|
|
2599
|
+
async writeOrderRowsToSQLite(orders) {
|
|
2600
|
+
if (typeof this.dbManager.bulkUpdate === 'function') {
|
|
2601
|
+
await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, orders);
|
|
2602
|
+
return 'bulkUpdate';
|
|
2603
|
+
}
|
|
2604
|
+
if (typeof this.dbManager.bulkAdd === 'function') {
|
|
2605
|
+
await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orders);
|
|
2606
|
+
return 'bulkAdd';
|
|
2607
|
+
}
|
|
2608
|
+
if (typeof this.dbManager.update === 'function') {
|
|
2609
|
+
for (const order of orders) await this.dbManager.update(INDEXDB_STORE_NAME, order);
|
|
2610
|
+
return 'update';
|
|
2611
|
+
}
|
|
2612
|
+
throw new Error('订单 SQLite 数据库不支持写入');
|
|
2613
|
+
}
|
|
2292
2614
|
isPendingSyncOrder(order) {
|
|
2293
2615
|
return Number(order?.need_sync) === 1;
|
|
2294
2616
|
}
|
|
@@ -2385,7 +2707,7 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
2385
2707
|
const {
|
|
2386
2708
|
toWrite,
|
|
2387
2709
|
skipped
|
|
2388
|
-
} = this.filterRedundantPatchOrders(source, ordersSnapshot, mergeActions, forceWriteStorageKeys);
|
|
2710
|
+
} = this.filterRedundantPatchOrders(source, ordersSnapshot, mergeActions, new Set([...forceWriteStorageKeys, ...migrationTargetStorageKeys]));
|
|
2389
2711
|
if (toWrite.length === 0) {
|
|
2390
2712
|
return;
|
|
2391
2713
|
}
|
|
@@ -2408,20 +2730,7 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
2408
2730
|
count: compactedToWrite.length,
|
|
2409
2731
|
dedupedCount: skipped.length
|
|
2410
2732
|
});
|
|
2411
|
-
|
|
2412
|
-
writeMethod = 'bulkUpdate';
|
|
2413
|
-
await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
|
|
2414
|
-
} else if (typeof this.dbManager.bulkAdd === 'function') {
|
|
2415
|
-
writeMethod = 'bulkAdd';
|
|
2416
|
-
await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
|
|
2417
|
-
} else if (typeof this.dbManager.update === 'function') {
|
|
2418
|
-
writeMethod = 'update';
|
|
2419
|
-
for (const order of compactedToWrite) {
|
|
2420
|
-
await this.dbManager.update(INDEXDB_STORE_NAME, order);
|
|
2421
|
-
}
|
|
2422
|
-
} else if (options.throwOnError) {
|
|
2423
|
-
throw new Error('订单 SQLite 数据库不支持写入');
|
|
2424
|
-
}
|
|
2733
|
+
writeMethod = await this.writeOrderRowsToSQLite(compactedToWrite);
|
|
2425
2734
|
this.recordRecentSqliteWrite(source, compactedToWrite);
|
|
2426
2735
|
if (writeMethod !== 'none') {
|
|
2427
2736
|
for (const migration of storageKeyMigrations.values()) {
|
|
@@ -466,6 +466,7 @@ export interface OrderData {
|
|
|
466
466
|
id: number | string;
|
|
467
467
|
tag: 'virtual_currency';
|
|
468
468
|
product_id?: number | string;
|
|
469
|
+
code?: string;
|
|
469
470
|
product_name: string;
|
|
470
471
|
par_value: string;
|
|
471
472
|
used_par_value: string;
|
|
@@ -518,6 +519,8 @@ export interface OrderFilters {
|
|
|
518
519
|
max_total_amount?: number;
|
|
519
520
|
tag_ids?: (string | number)[];
|
|
520
521
|
shipping_type?: string[];
|
|
522
|
+
/** 交付方式,精确匹配 metadata.shop_service_data.service_type;多选之间为 OR */
|
|
523
|
+
service_type?: string[];
|
|
521
524
|
delivery_zone_name?: string;
|
|
522
525
|
location_id?: string | number;
|
|
523
526
|
shipping_order_number?: string;
|
|
@@ -247,6 +247,24 @@ function filterOrders(orders, filters) {
|
|
|
247
247
|
}
|
|
248
248
|
}
|
|
249
249
|
|
|
250
|
+
// service_type - 交付方式(同组多选 OR,与其他条件 AND)
|
|
251
|
+
if (Array.isArray(safeFilters.service_type) && safeFilters.service_type.length > 0) {
|
|
252
|
+
const shopServiceData = order.metadata?.shop_service_data;
|
|
253
|
+
const serviceType = shopServiceData && typeof shopServiceData === 'object' ? shopServiceData.service_type : undefined;
|
|
254
|
+
if (typeof serviceType !== 'string' || !safeFilters.service_type.includes(serviceType)) {
|
|
255
|
+
rejected.push({
|
|
256
|
+
order_id: order.order_id,
|
|
257
|
+
order_number: order.order_number,
|
|
258
|
+
reason: {
|
|
259
|
+
field: 'service_type',
|
|
260
|
+
actual: serviceType,
|
|
261
|
+
expected: safeFilters.service_type
|
|
262
|
+
}
|
|
263
|
+
});
|
|
264
|
+
return false;
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
|
|
250
268
|
// delivery_zone_name - 配送区域(模糊匹配)
|
|
251
269
|
if (safeFilters.delivery_zone_name !== undefined && safeFilters.delivery_zone_name !== null && safeFilters.delivery_zone_name !== '') {
|
|
252
270
|
if (!order.delivery_zone_name || !order.delivery_zone_name.toLowerCase().includes(safeFilters.delivery_zone_name.toLowerCase())) {
|
|
@@ -3,6 +3,7 @@ import { BaseModule } from '../../../modules/BaseModule';
|
|
|
3
3
|
import { ProductData } from '../../../modules/Product/types';
|
|
4
4
|
import type { RouteDefinition } from '../../types';
|
|
5
5
|
import { ProductIdScope, type ProductSnapshot, ProductFormatter, ProductFormatterContext } from './types';
|
|
6
|
+
import type { CommittedProducts, ReplicatedProducts } from './types';
|
|
6
7
|
/**
|
|
7
8
|
* Products 模块 - 用于获取和管理完整的商品详细数据
|
|
8
9
|
* 相比 ProductList 模块,Products 会获取所有详细信息并缓存
|
|
@@ -40,6 +41,26 @@ export declare class ProductsModule extends BaseModule implements Module {
|
|
|
40
41
|
private productIndexDBSaveQueue;
|
|
41
42
|
/** 最近一次智能定价评估提取的 schedule 变价时间点(HH:mm),供 Server 订阅定时刷新使用 */
|
|
42
43
|
private lastScheduleTimePoints;
|
|
44
|
+
private committedProductState?;
|
|
45
|
+
private productReplicationSourceGeneration;
|
|
46
|
+
private productPersistenceFailed;
|
|
47
|
+
private runtimeSyncMode;
|
|
48
|
+
private runtimeSyncGeneration;
|
|
49
|
+
private requestReplicaRefresh?;
|
|
50
|
+
private replicaApplyQueue;
|
|
51
|
+
private productSyncQueue;
|
|
52
|
+
private replicaPriceDirtyIds;
|
|
53
|
+
/** Installed after initial preload; initial cache/network loading stays unchanged. */
|
|
54
|
+
setRuntimeSyncMode(mode: 'normal' | 'memoryReplica', requestRefresh?: (trigger: string) => Promise<void>): Promise<void>;
|
|
55
|
+
isMemoryReplica(): boolean;
|
|
56
|
+
/** Read persisted data once on the main screen to establish a committed baseline. */
|
|
57
|
+
enableProductReplicationSource(): Promise<void>;
|
|
58
|
+
/** Release the extra catalog without changing the normal product store or persistence. */
|
|
59
|
+
disableProductReplicationSource(): void;
|
|
60
|
+
getCommittedProductSnapshot(): CommittedProducts | null;
|
|
61
|
+
private recordProductCommit;
|
|
62
|
+
applyReplicatedProducts(change: ReplicatedProducts): Promise<void>;
|
|
63
|
+
private refreshFromReplica;
|
|
43
64
|
constructor(name?: string, version?: string);
|
|
44
65
|
initialize(core: PisellCore, options: any): Promise<void>;
|
|
45
66
|
/**
|
|
@@ -230,7 +251,10 @@ export declare class ProductsModule extends BaseModule implements Module {
|
|
|
230
251
|
* 根据 ID 列表删除商品(用于 pubsub 同步删除场景)
|
|
231
252
|
* 同时更新 store.list、store.map、IndexDB 和价格缓存
|
|
232
253
|
*/
|
|
233
|
-
removeProductsByIds(ids: number[]
|
|
254
|
+
removeProductsByIds(ids: number[], options?: {
|
|
255
|
+
skipIndexDB?: boolean;
|
|
256
|
+
skipEmit?: boolean;
|
|
257
|
+
}): Promise<void>;
|
|
234
258
|
/**
|
|
235
259
|
* 重新从服务器加载全量商品列表并更新本地 store
|
|
236
260
|
* 用于 pubsub 同步 create / update / batch_update 场景
|
|
@@ -261,13 +285,8 @@ export declare class ProductsModule extends BaseModule implements Module {
|
|
|
261
285
|
* await this.replaceProductsSnapshotInIndexDB(list, 'loadProductsByServer')
|
|
262
286
|
*/
|
|
263
287
|
private replaceProductsSnapshotInIndexDB;
|
|
264
|
-
/**
|
|
265
|
-
* 增量 upsert 商品到 IndexDB,不清空表;用于 pubsub 批次合并后的变更商品。
|
|
266
|
-
*
|
|
267
|
-
* @example
|
|
268
|
-
* await this.patchProductsInIndexDB(changedProducts, 'pubsub.processProductSyncMessages', mergeActions)
|
|
269
|
-
*/
|
|
270
288
|
private patchProductsInIndexDB;
|
|
289
|
+
private persistProductDelta;
|
|
271
290
|
/**
|
|
272
291
|
* 同步更新商品 Map 缓存
|
|
273
292
|
* 将 list 中的商品同步到 map,以 id 为 key
|
|
@@ -309,6 +328,7 @@ export declare class ProductsModule extends BaseModule implements Module {
|
|
|
309
328
|
* Server 层监听该事件后对变更商品增量执行 prepareProductsWithPrice 并更新缓存
|
|
310
329
|
*/
|
|
311
330
|
private processProductSyncMessages;
|
|
331
|
+
private processProductSyncBatch;
|
|
312
332
|
/**
|
|
313
333
|
* 通过 SSE 按 ids 增量拉取商品数据
|
|
314
334
|
* 请求 GET /shop/core/stream?type=product&ids={ids}
|
|
@@ -342,6 +362,7 @@ export declare class ProductsModule extends BaseModule implements Module {
|
|
|
342
362
|
* 销毁同步资源(取消 pubsub 订阅、清除定时器)
|
|
343
363
|
*/
|
|
344
364
|
destroyProductSync(): void;
|
|
365
|
+
destroy(): void;
|
|
345
366
|
/**
|
|
346
367
|
* 获取模块的路由定义
|
|
347
368
|
* Products 模块暂不提供路由,由 Server 层统一处理
|