@pisell/pisellos 2.2.278 → 2.2.280
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/BaseModule.d.ts +1 -0
- package/dist/modules/BaseModule.js +24 -28
- package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js +7 -3
- package/dist/modules/BookingContext/utils/productExtend.js +5 -9
- package/dist/modules/BookingContext/utils/timeSlices.js +24 -3
- package/dist/modules/Customer/index.d.ts +4 -0
- package/dist/modules/Customer/index.js +91 -59
- package/dist/modules/Customer/types.d.ts +2 -0
- package/dist/modules/Discount/index.d.ts +1 -0
- package/dist/modules/Discount/index.js +40 -11
- package/dist/modules/Discount/types.d.ts +1 -0
- package/dist/modules/Holder/index.d.ts +48 -0
- package/dist/modules/Holder/index.js +640 -0
- package/dist/modules/Holder/types.d.ts +123 -0
- package/dist/modules/Holder/types.js +1 -0
- package/dist/modules/Holder/utils.d.ts +13 -0
- package/dist/modules/Holder/utils.js +34 -0
- package/dist/modules/OpenData/index.js +2 -2
- package/dist/modules/Order/index.d.ts +32 -4
- package/dist/modules/Order/index.js +868 -675
- package/dist/modules/Order/types.d.ts +22 -1
- package/dist/modules/Order/utils/discountProductLineIdentity.d.ts +45 -0
- package/dist/modules/Order/utils/discountProductLineIdentity.js +227 -0
- package/dist/modules/Order/utils/orderCollectionIdentity.d.ts +15 -0
- package/dist/modules/Order/utils/orderCollectionIdentity.js +75 -0
- package/dist/modules/Order/utils.d.ts +10 -0
- package/dist/modules/Order/utils.js +71 -34
- package/dist/modules/Payment/index.d.ts +4 -0
- package/dist/modules/Payment/index.js +14 -4
- package/dist/modules/Payment/walletpass.js +21 -7
- package/dist/modules/Product/types.d.ts +1 -0
- package/dist/modules/ProductList/index.js +33 -13
- package/dist/modules/Quotation/index.d.ts +1 -1
- package/dist/modules/Quotation/index.js +2 -2
- package/dist/modules/ResourcePlanner/index.d.ts +24 -0
- package/dist/modules/ResourcePlanner/index.js +181 -0
- package/dist/modules/ResourcePlanner/planner.d.ts +14 -0
- package/dist/modules/ResourcePlanner/planner.js +1069 -0
- package/dist/modules/ResourcePlanner/types.d.ts +227 -0
- package/dist/modules/ResourcePlanner/types.js +1 -0
- package/dist/modules/Rules/index.js +153 -56
- package/dist/modules/SalesSummary/index.js +12 -13
- package/dist/modules/ScanOrderLogger/index.d.ts +2 -0
- package/dist/modules/ScanOrderLogger/index.js +15 -2
- package/dist/modules/ScanOrderLogger/providers/feishu.js +45 -27
- package/dist/modules/ScanOrderLogger/types.d.ts +1 -0
- package/dist/modules/Schedule/index.d.ts +3 -1
- package/dist/modules/Schedule/index.js +21 -16
- package/dist/modules/Summary/utils.js +38 -13
- package/dist/modules/index.d.ts +2 -0
- package/dist/modules/index.js +3 -1
- package/dist/plugins/window.d.ts +1 -0
- package/dist/server/index.d.ts +20 -0
- package/dist/server/index.js +1101 -909
- package/dist/server/modules/order/index.d.ts +2 -0
- package/dist/server/modules/order/index.js +261 -96
- package/dist/server/modules/order/types.d.ts +1 -1
- package/dist/solution/BaseSales/index.d.ts +20 -1
- package/dist/solution/BaseSales/index.js +989 -881
- package/dist/solution/BaseSales/utils/cartPromotion.js +19 -1
- package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +6 -3
- package/dist/solution/BaseSales/utils.js +31 -20
- package/dist/solution/BookingByStep/index.d.ts +17 -2
- package/dist/solution/BookingByStep/index.js +294 -215
- package/dist/solution/BookingByStep/types.d.ts +2 -1
- package/dist/solution/BookingByStep/types.js +3 -1
- package/dist/solution/BookingByStep/utils/capacity.js +17 -1
- package/dist/solution/BookingByStep/utils/timeslots.d.ts +3 -1
- package/dist/solution/BookingByStep/utils/timeslots.js +19 -12
- package/dist/solution/BookingTicket/index.d.ts +21 -3
- package/dist/solution/BookingTicket/index.js +312 -226
- package/dist/solution/BookingTicket/utils/scan/handleScan.d.ts +3 -1
- package/dist/solution/BookingTicket/utils/scan/handleScan.js +10 -2
- package/dist/solution/ScanOrder/index.d.ts +26 -14
- package/dist/solution/ScanOrder/index.js +1142 -739
- package/dist/solution/ScanOrder/types.d.ts +21 -1
- package/dist/solution/ScanOrder/utils.d.ts +8 -0
- package/dist/solution/ScanOrder/utils.js +97 -45
- package/dist/solution/ShopDiscount/index.d.ts +1 -0
- package/dist/solution/ShopDiscount/index.js +125 -87
- package/dist/solution/UnifiedBookingSales/index.d.ts +204 -0
- package/dist/solution/UnifiedBookingSales/index.js +2211 -0
- package/dist/solution/UnifiedBookingSales/types.d.ts +150 -0
- package/dist/solution/UnifiedBookingSales/types.js +11 -0
- package/dist/solution/VenueBooking/index.d.ts +39 -11
- package/dist/solution/VenueBooking/index.js +1167 -841
- package/dist/solution/VenueBooking/types.d.ts +3 -0
- package/dist/solution/VenueBooking/utils/resource.js +1 -0
- package/dist/solution/VenueBooking/utils/slotMerge.d.ts +4 -4
- package/dist/solution/VenueBooking/utils/slotMerge.js +10 -5
- package/dist/solution/index.d.ts +1 -0
- package/dist/solution/index.js +2 -1
- package/dist/types/index.d.ts +1 -0
- package/lib/model/strategy/adapter/promotion/index.js +0 -51
- package/lib/modules/BaseModule.d.ts +1 -0
- package/lib/modules/BaseModule.js +24 -37
- package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js +3 -0
- package/lib/modules/BookingContext/utils/productExtend.js +4 -3
- package/lib/modules/BookingContext/utils/timeSlices.js +18 -3
- package/lib/modules/Customer/index.d.ts +4 -0
- package/lib/modules/Customer/index.js +11 -0
- package/lib/modules/Customer/types.d.ts +2 -0
- package/lib/modules/Discount/index.d.ts +1 -0
- package/lib/modules/Discount/index.js +9 -0
- package/lib/modules/Discount/types.d.ts +1 -0
- package/lib/modules/Holder/index.d.ts +48 -0
- package/lib/modules/Holder/index.js +402 -0
- package/lib/modules/Holder/types.d.ts +123 -0
- package/lib/modules/Holder/types.js +17 -0
- package/lib/modules/Holder/utils.d.ts +13 -0
- package/lib/modules/Holder/utils.js +71 -0
- package/lib/modules/OpenData/index.js +1 -1
- package/lib/modules/Order/index.d.ts +32 -4
- package/lib/modules/Order/index.js +372 -156
- package/lib/modules/Order/types.d.ts +22 -1
- package/lib/modules/Order/utils/discountProductLineIdentity.d.ts +45 -0
- package/lib/modules/Order/utils/discountProductLineIdentity.js +170 -0
- package/lib/modules/Order/utils/orderCollectionIdentity.d.ts +15 -0
- package/lib/modules/Order/utils/orderCollectionIdentity.js +70 -0
- package/lib/modules/Order/utils.d.ts +10 -0
- package/lib/modules/Order/utils.js +39 -6
- package/lib/modules/Payment/index.d.ts +4 -0
- package/lib/modules/Payment/index.js +7 -0
- package/lib/modules/Payment/walletpass.js +12 -0
- package/lib/modules/Product/types.d.ts +1 -0
- package/lib/modules/ProductList/index.js +49 -31
- package/lib/modules/Quotation/index.d.ts +1 -1
- package/lib/modules/Quotation/index.js +2 -2
- package/lib/modules/ResourcePlanner/index.d.ts +24 -0
- package/lib/modules/ResourcePlanner/index.js +148 -0
- package/lib/modules/ResourcePlanner/planner.d.ts +14 -0
- package/lib/modules/ResourcePlanner/planner.js +933 -0
- package/lib/modules/ResourcePlanner/types.d.ts +227 -0
- package/lib/modules/ResourcePlanner/types.js +17 -0
- package/lib/modules/Rules/index.js +117 -25
- package/lib/modules/SalesSummary/index.js +6 -7
- package/lib/modules/ScanOrderLogger/index.d.ts +2 -0
- package/lib/modules/ScanOrderLogger/index.js +13 -1
- package/lib/modules/ScanOrderLogger/providers/feishu.js +15 -6
- package/lib/modules/ScanOrderLogger/types.d.ts +1 -0
- package/lib/modules/Schedule/index.d.ts +3 -1
- package/lib/modules/Schedule/index.js +10 -8
- package/lib/modules/Summary/utils.js +21 -1
- package/lib/modules/index.d.ts +2 -0
- package/lib/modules/index.js +5 -1
- package/lib/plugins/window.d.ts +1 -0
- package/lib/server/index.d.ts +20 -0
- package/lib/server/index.js +124 -19
- package/lib/server/modules/order/index.d.ts +2 -0
- package/lib/server/modules/order/index.js +75 -5
- package/lib/server/modules/order/types.d.ts +1 -1
- package/lib/solution/BaseSales/index.d.ts +20 -1
- package/lib/solution/BaseSales/index.js +105 -31
- package/lib/solution/BaseSales/utils/cartPromotion.js +18 -0
- package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +1 -0
- package/lib/solution/BaseSales/utils.js +29 -18
- package/lib/solution/BookingByStep/index.d.ts +17 -2
- package/lib/solution/BookingByStep/index.js +60 -18
- package/lib/solution/BookingByStep/types.d.ts +2 -1
- package/lib/solution/BookingByStep/types.js +5 -0
- package/lib/solution/BookingByStep/utils/capacity.js +20 -1
- package/lib/solution/BookingByStep/utils/timeslots.d.ts +3 -1
- package/lib/solution/BookingByStep/utils/timeslots.js +19 -11
- package/lib/solution/BookingTicket/index.d.ts +21 -3
- package/lib/solution/BookingTicket/index.js +75 -16
- package/lib/solution/BookingTicket/utils/scan/handleScan.d.ts +3 -1
- package/lib/solution/BookingTicket/utils/scan/handleScan.js +2 -2
- package/lib/solution/ScanOrder/index.d.ts +26 -14
- package/lib/solution/ScanOrder/index.js +449 -182
- package/lib/solution/ScanOrder/types.d.ts +21 -1
- package/lib/solution/ScanOrder/utils.d.ts +8 -0
- package/lib/solution/ScanOrder/utils.js +60 -18
- package/lib/solution/ShopDiscount/index.d.ts +1 -0
- package/lib/solution/ShopDiscount/index.js +14 -0
- package/lib/solution/UnifiedBookingSales/index.d.ts +204 -0
- package/lib/solution/UnifiedBookingSales/index.js +1273 -0
- package/lib/solution/UnifiedBookingSales/types.d.ts +150 -0
- package/lib/solution/UnifiedBookingSales/types.js +33 -0
- package/lib/solution/VenueBooking/index.d.ts +39 -11
- package/lib/solution/VenueBooking/index.js +322 -110
- package/lib/solution/VenueBooking/types.d.ts +3 -0
- package/lib/solution/VenueBooking/utils/resource.js +1 -0
- package/lib/solution/VenueBooking/utils/slotMerge.d.ts +4 -4
- package/lib/solution/VenueBooking/utils/slotMerge.js +6 -4
- package/lib/solution/index.d.ts +1 -0
- package/lib/solution/index.js +3 -1
- package/lib/types/index.d.ts +1 -0
- package/package.json +1 -1
|
@@ -235,6 +235,7 @@ export declare class OrderModule extends BaseModule implements Module {
|
|
|
235
235
|
*/
|
|
236
236
|
private lookupOrderIndexByIdentityKeys;
|
|
237
237
|
private isRemoteEchoMergeSource;
|
|
238
|
+
private isRemoteProductMembershipChangeSource;
|
|
238
239
|
private getProductMembershipKey;
|
|
239
240
|
private doProductsHaveStableMembershipIdentity;
|
|
240
241
|
/**
|
|
@@ -273,6 +274,7 @@ export declare class OrderModule extends BaseModule implements Module {
|
|
|
273
274
|
* // => 'S-1001'
|
|
274
275
|
*/
|
|
275
276
|
private getOrderStorageKey;
|
|
277
|
+
private getPersistedOrderStorageKey;
|
|
276
278
|
private getOrderIdentityMatchKeys;
|
|
277
279
|
private doOrdersShareIdentity;
|
|
278
280
|
private findOrderIndexByIdentity;
|
|
@@ -41,6 +41,7 @@ import { getOrderPaymentIdentityKeys, isIdentifiedPendingOrderPayment, isPending
|
|
|
41
41
|
* SQLite 存储名称
|
|
42
42
|
*/
|
|
43
43
|
var INDEXDB_STORE_NAME = 'orders';
|
|
44
|
+
var ORDER_STORAGE_KEY_FIELD = '__order_storage_key';
|
|
44
45
|
var ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY = 'server_order_last_full_fetch_at';
|
|
45
46
|
var ORDER_SYNC_THROTTLE_MS_STORAGE_KEY = 'order_sync_throttle_ms';
|
|
46
47
|
var DEFAULT_ORDER_SYNC_THROTTLE_MS = 2000;
|
|
@@ -64,7 +65,6 @@ var ORDER_COLLECTION_KIND_BY_FIELD = {
|
|
|
64
65
|
bookings: 'booking',
|
|
65
66
|
payments: 'payment'
|
|
66
67
|
};
|
|
67
|
-
|
|
68
68
|
/**
|
|
69
69
|
* Order 模块 - 基础框架
|
|
70
70
|
*/
|
|
@@ -1331,7 +1331,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
1331
1331
|
_context11.next = 4;
|
|
1332
1332
|
break;
|
|
1333
1333
|
}
|
|
1334
|
-
this.logInfo('upsertOrdersFromRemote-订单列表为空', {
|
|
1334
|
+
this.logInfo('upsertOrdersFromRemote-订单列表为空', {
|
|
1335
|
+
source: source
|
|
1336
|
+
});
|
|
1335
1337
|
return _context11.abrupt("return");
|
|
1336
1338
|
case 4:
|
|
1337
1339
|
this.logInfo('upsertOrdersFromRemote-开始', {
|
|
@@ -2325,7 +2327,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2325
2327
|
value: (function () {
|
|
2326
2328
|
var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(freshOrders, source) {
|
|
2327
2329
|
var _this16 = this;
|
|
2328
|
-
var storeOrderCountBefore, normalizedFreshOrders, incomingProductsHaveStableIdentity, _iterator14, _step14, order, id, rawProducts, _incomingProductsHave, allProductsHaveStableIdentity, orderIdKey, uniqueFreshOrders, uniqueFreshCount, patchedOrders, remoteProductMembershipChanges, forceWriteStorageKeys, mergeActions, existingProductsHaveStableIdentity, updatedList, identityKeyToIndex, index, identityKeys, _iterator15, _step15, key, _iterator16, _step16, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, existingOrder, _ref, _existingOrder$order_, _ref2, _external_sale_number2, _existingOrder$paymen, _fresh$payment_status, _existingOrder$need_s, _fresh$need_sync, _ref3, _existingOrder$order_2, _ref4, _external_sale_number3, _existingOrder$is_dra, _fresh$is_draft_order, mergedOrder, freshOrderId, incomingProductsAreStable, membershipChange, mergedProductsHaveStableIdentity, adjustedMatchIndex, duplicateIndexes, _iterator17, _step17, _key2, _duplicateIndex, _iterator18, _step18, duplicateIndex, _index, _iterator19, _step19, _key, mergedStorageKey, insertIndex, insertCount, updateCount;
|
|
2330
|
+
var storeOrderCountBefore, normalizedFreshOrders, incomingProductsHaveStableIdentity, _iterator14, _step14, order, id, rawProducts, _incomingProductsHave, allProductsHaveStableIdentity, orderIdKey, uniqueFreshOrders, uniqueFreshCount, patchedOrders, remoteProductMembershipChanges, forceWriteStorageKeys, storageKeyMigrations, mergeActions, existingProductsHaveStableIdentity, updatedList, identityKeyToIndex, index, identityKeys, _iterator15, _step15, key, _iterator16, _step16, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, existingOrder, previousStorageKey, _ref, _existingOrder$order_, _ref2, _external_sale_number2, _existingOrder$paymen, _fresh$payment_status, _existingOrder$need_s, _fresh$need_sync, _ref3, _existingOrder$order_2, _ref4, _external_sale_number3, _existingOrder$is_dra, _fresh$is_draft_order, mergedOrder, freshOrderId, incomingProductsAreStable, membershipChange, mergedProductsHaveStableIdentity, adjustedMatchIndex, duplicateIndexes, _iterator17, _step17, _key2, _duplicateIndex, _iterator18, _step18, duplicateIndex, _index, _iterator19, _step19, _key, nextStorageKey, _ref5, _ref6, _mergedOrder$order_id, mergedStorageKey, insertIndex, insertCount, updateCount;
|
|
2329
2331
|
return _regeneratorRuntime().wrap(function _callee19$(_context19) {
|
|
2330
2332
|
while (1) switch (_context19.prev = _context19.next) {
|
|
2331
2333
|
case 0:
|
|
@@ -2382,6 +2384,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2382
2384
|
patchedOrders = [];
|
|
2383
2385
|
remoteProductMembershipChanges = [];
|
|
2384
2386
|
forceWriteStorageKeys = new Set();
|
|
2387
|
+
storageKeyMigrations = [];
|
|
2385
2388
|
mergeActions = {};
|
|
2386
2389
|
existingProductsHaveStableIdentity = this.store.list.map(function (order) {
|
|
2387
2390
|
return _this16.doProductsHaveStableMembershipIdentity(order.products);
|
|
@@ -2408,11 +2411,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2408
2411
|
}
|
|
2409
2412
|
}
|
|
2410
2413
|
_iterator16 = _createForOfIteratorHelper(uniqueFreshOrders);
|
|
2411
|
-
_context19.prev =
|
|
2414
|
+
_context19.prev = 38;
|
|
2412
2415
|
_iterator16.s();
|
|
2413
|
-
case
|
|
2416
|
+
case 40:
|
|
2414
2417
|
if ((_step16 = _iterator16.n()).done) {
|
|
2415
|
-
_context19.next =
|
|
2418
|
+
_context19.next = 100;
|
|
2416
2419
|
break;
|
|
2417
2420
|
}
|
|
2418
2421
|
fresh = _step16.value;
|
|
@@ -2421,12 +2424,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2421
2424
|
storageKey = this.getOrderStorageKey(fresh);
|
|
2422
2425
|
mergeKey = storageKey || (fresh.order_id !== undefined && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : '');
|
|
2423
2426
|
if (!(matchIndex >= 0)) {
|
|
2424
|
-
_context19.next =
|
|
2427
|
+
_context19.next = 92;
|
|
2425
2428
|
break;
|
|
2426
2429
|
}
|
|
2427
2430
|
existingOrder = updatedList[matchIndex];
|
|
2431
|
+
previousStorageKey = this.getPersistedOrderStorageKey(existingOrder);
|
|
2428
2432
|
if (!(this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source))) {
|
|
2429
|
-
_context19.next =
|
|
2433
|
+
_context19.next = 52;
|
|
2430
2434
|
break;
|
|
2431
2435
|
}
|
|
2432
2436
|
this.logInfo('mergeOrdersToStore-跳过 pending 订单远端覆盖', {
|
|
@@ -2439,10 +2443,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2439
2443
|
remote_need_sync: (_fresh$need_sync = fresh.need_sync) !== null && _fresh$need_sync !== void 0 ? _fresh$need_sync : null,
|
|
2440
2444
|
reason: 'protect_pending_sync_order_from_remote_echo'
|
|
2441
2445
|
});
|
|
2442
|
-
return _context19.abrupt("continue",
|
|
2443
|
-
case
|
|
2446
|
+
return _context19.abrupt("continue", 98);
|
|
2447
|
+
case 52:
|
|
2444
2448
|
if (!(this.isDraftOrder(existingOrder) && this.shouldProtectDraftOrderFromIncoming(source))) {
|
|
2445
|
-
_context19.next =
|
|
2449
|
+
_context19.next = 55;
|
|
2446
2450
|
break;
|
|
2447
2451
|
}
|
|
2448
2452
|
this.logInfo('mergeOrdersToStore-跳过 draft 订单远端覆盖', {
|
|
@@ -2453,8 +2457,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2453
2457
|
remote_is_draft_order: (_fresh$is_draft_order = fresh.is_draft_order) !== null && _fresh$is_draft_order !== void 0 ? _fresh$is_draft_order : null,
|
|
2454
2458
|
reason: 'protect_draft_order_from_remote_echo'
|
|
2455
2459
|
});
|
|
2456
|
-
return _context19.abrupt("continue",
|
|
2457
|
-
case
|
|
2460
|
+
return _context19.abrupt("continue", 98);
|
|
2461
|
+
case 55:
|
|
2458
2462
|
mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
|
|
2459
2463
|
freshOrderId = fresh.order_id;
|
|
2460
2464
|
incomingProductsAreStable = freshOrderId !== undefined && freshOrderId !== null && incomingProductsHaveStableIdentity.get(this.getIdKey(freshOrderId)) !== false;
|
|
@@ -2466,37 +2470,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2466
2470
|
adjustedMatchIndex = matchIndex;
|
|
2467
2471
|
duplicateIndexes = new Set();
|
|
2468
2472
|
_iterator17 = _createForOfIteratorHelper(freshIdentityKeys);
|
|
2469
|
-
_context19.prev =
|
|
2473
|
+
_context19.prev = 64;
|
|
2470
2474
|
_iterator17.s();
|
|
2471
|
-
case
|
|
2475
|
+
case 66:
|
|
2472
2476
|
if ((_step17 = _iterator17.n()).done) {
|
|
2473
|
-
_context19.next =
|
|
2477
|
+
_context19.next = 74;
|
|
2474
2478
|
break;
|
|
2475
2479
|
}
|
|
2476
2480
|
_key2 = _step17.value;
|
|
2477
2481
|
_duplicateIndex = identityKeyToIndex.get(_key2);
|
|
2478
2482
|
if (!(_duplicateIndex === undefined || _duplicateIndex === matchIndex)) {
|
|
2479
|
-
_context19.next =
|
|
2483
|
+
_context19.next = 71;
|
|
2480
2484
|
break;
|
|
2481
2485
|
}
|
|
2482
|
-
return _context19.abrupt("continue",
|
|
2483
|
-
case
|
|
2486
|
+
return _context19.abrupt("continue", 72);
|
|
2487
|
+
case 71:
|
|
2484
2488
|
duplicateIndexes.add(_duplicateIndex);
|
|
2485
|
-
case 70:
|
|
2486
|
-
_context19.next = 64;
|
|
2487
|
-
break;
|
|
2488
2489
|
case 72:
|
|
2489
|
-
_context19.next =
|
|
2490
|
+
_context19.next = 66;
|
|
2490
2491
|
break;
|
|
2491
2492
|
case 74:
|
|
2492
|
-
_context19.
|
|
2493
|
-
|
|
2493
|
+
_context19.next = 79;
|
|
2494
|
+
break;
|
|
2495
|
+
case 76:
|
|
2496
|
+
_context19.prev = 76;
|
|
2497
|
+
_context19.t1 = _context19["catch"](64);
|
|
2494
2498
|
_iterator17.e(_context19.t1);
|
|
2495
|
-
case
|
|
2496
|
-
_context19.prev =
|
|
2499
|
+
case 79:
|
|
2500
|
+
_context19.prev = 79;
|
|
2497
2501
|
_iterator17.f();
|
|
2498
|
-
return _context19.finish(
|
|
2499
|
-
case
|
|
2502
|
+
return _context19.finish(79);
|
|
2503
|
+
case 82:
|
|
2500
2504
|
if (duplicateIndexes.size > 0) {
|
|
2501
2505
|
_iterator18 = _createForOfIteratorHelper(_toConsumableArray(duplicateIndexes).sort(function (left, right) {
|
|
2502
2506
|
return right - left;
|
|
@@ -2530,6 +2534,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2530
2534
|
}
|
|
2531
2535
|
}
|
|
2532
2536
|
}
|
|
2537
|
+
nextStorageKey = this.getOrderStorageKey(mergedOrder);
|
|
2538
|
+
if (previousStorageKey && nextStorageKey && previousStorageKey !== nextStorageKey) {
|
|
2539
|
+
storageKeyMigrations.push({
|
|
2540
|
+
orderId: (_ref5 = (_ref6 = (_mergedOrder$order_id = mergedOrder.order_id) !== null && _mergedOrder$order_id !== void 0 ? _mergedOrder$order_id : existingOrder.order_id) !== null && _ref6 !== void 0 ? _ref6 : fresh.order_id) !== null && _ref5 !== void 0 ? _ref5 : null,
|
|
2541
|
+
from: previousStorageKey,
|
|
2542
|
+
to: nextStorageKey
|
|
2543
|
+
});
|
|
2544
|
+
}
|
|
2533
2545
|
updatedList[adjustedMatchIndex] = mergedOrder;
|
|
2534
2546
|
existingProductsHaveStableIdentity[adjustedMatchIndex] = mergedProductsHaveStableIdentity;
|
|
2535
2547
|
if (membershipChange) {
|
|
@@ -2542,29 +2554,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2542
2554
|
this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, adjustedMatchIndex);
|
|
2543
2555
|
patchedOrders.push(mergedOrder);
|
|
2544
2556
|
if (mergeKey) mergeActions[mergeKey] = 'update';
|
|
2545
|
-
return _context19.abrupt("continue",
|
|
2546
|
-
case
|
|
2557
|
+
return _context19.abrupt("continue", 98);
|
|
2558
|
+
case 92:
|
|
2547
2559
|
insertIndex = updatedList.length;
|
|
2548
2560
|
updatedList.push(fresh);
|
|
2549
2561
|
existingProductsHaveStableIdentity.push(fresh.order_id !== undefined && fresh.order_id !== null && incomingProductsHaveStableIdentity.get(this.getIdKey(fresh.order_id)) !== false);
|
|
2550
2562
|
this.registerOrderIdentityKeys(identityKeyToIndex, fresh, insertIndex);
|
|
2551
2563
|
patchedOrders.push(fresh);
|
|
2552
2564
|
if (mergeKey) mergeActions[mergeKey] = 'insert';
|
|
2553
|
-
case
|
|
2554
|
-
_context19.next =
|
|
2565
|
+
case 98:
|
|
2566
|
+
_context19.next = 40;
|
|
2555
2567
|
break;
|
|
2556
|
-
case
|
|
2557
|
-
_context19.next =
|
|
2568
|
+
case 100:
|
|
2569
|
+
_context19.next = 105;
|
|
2558
2570
|
break;
|
|
2559
|
-
case
|
|
2560
|
-
_context19.prev =
|
|
2561
|
-
_context19.t2 = _context19["catch"](
|
|
2571
|
+
case 102:
|
|
2572
|
+
_context19.prev = 102;
|
|
2573
|
+
_context19.t2 = _context19["catch"](38);
|
|
2562
2574
|
_iterator16.e(_context19.t2);
|
|
2563
|
-
case
|
|
2564
|
-
_context19.prev =
|
|
2575
|
+
case 105:
|
|
2576
|
+
_context19.prev = 105;
|
|
2565
2577
|
_iterator16.f();
|
|
2566
|
-
return _context19.finish(
|
|
2567
|
-
case
|
|
2578
|
+
return _context19.finish(105);
|
|
2579
|
+
case 108:
|
|
2568
2580
|
insertCount = Object.values(mergeActions).filter(function (v) {
|
|
2569
2581
|
return v === 'insert';
|
|
2570
2582
|
}).length;
|
|
@@ -2580,25 +2592,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2580
2592
|
// 仅在自检开关开启时做一次兜底校验。
|
|
2581
2593
|
this.store.list = this.runOrderStoreSelfCheck(updatedList, "".concat(source, ".store"));
|
|
2582
2594
|
this.syncOrdersMap();
|
|
2583
|
-
_context19.next =
|
|
2584
|
-
return this.patchOrdersInSQLite(patchedOrders, source, mergeActions, {
|
|
2585
|
-
|
|
2595
|
+
_context19.next = 115;
|
|
2596
|
+
return this.patchOrdersInSQLite(patchedOrders, source, mergeActions, {
|
|
2597
|
+
storageKeyMigrations: storageKeyMigrations
|
|
2598
|
+
}, forceWriteStorageKeys);
|
|
2599
|
+
case 115:
|
|
2586
2600
|
this.logInfo('mergeOrdersToStore-结束', {
|
|
2587
2601
|
uniqueFreshCount: uniqueFreshCount,
|
|
2588
2602
|
storeOrderCountAfter: this.store.list.length,
|
|
2589
2603
|
insertCount: insertCount,
|
|
2590
2604
|
updateCount: updateCount
|
|
2591
2605
|
});
|
|
2592
|
-
_context19.next =
|
|
2606
|
+
_context19.next = 118;
|
|
2593
2607
|
return this.emitRemoteProductMembershipChanges(remoteProductMembershipChanges);
|
|
2594
|
-
case
|
|
2595
|
-
_context19.next =
|
|
2608
|
+
case 118:
|
|
2609
|
+
_context19.next = 120;
|
|
2596
2610
|
return this.emitOrdersChanged(patchedOrders, source);
|
|
2597
|
-
case
|
|
2611
|
+
case 120:
|
|
2598
2612
|
case "end":
|
|
2599
2613
|
return _context19.stop();
|
|
2600
2614
|
}
|
|
2601
|
-
}, _callee19, this, [[6, 20, 23, 26], [
|
|
2615
|
+
}, _callee19, this, [[6, 20, 23, 26], [38, 102, 105, 108], [64, 76, 79, 82]]);
|
|
2602
2616
|
}));
|
|
2603
2617
|
function mergeOrdersToStore(_x13, _x14) {
|
|
2604
2618
|
return _mergeOrdersToStore.apply(this, arguments);
|
|
@@ -2638,6 +2652,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2638
2652
|
value: function isRemoteEchoMergeSource(source) {
|
|
2639
2653
|
return source === 'pubsub.bodyUpsert' || source === 'pubsub.httpRefresh';
|
|
2640
2654
|
}
|
|
2655
|
+
}, {
|
|
2656
|
+
key: "isRemoteProductMembershipChangeSource",
|
|
2657
|
+
value: function isRemoteProductMembershipChangeSource(source) {
|
|
2658
|
+
return this.isRemoteEchoMergeSource(source) || source === 'manual.editOpenRemoteCheck';
|
|
2659
|
+
}
|
|
2641
2660
|
}, {
|
|
2642
2661
|
key: "getProductMembershipKey",
|
|
2643
2662
|
value: function getProductMembershipKey(product) {
|
|
@@ -2676,8 +2695,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2676
2695
|
key: "getRemoteProductMembershipChange",
|
|
2677
2696
|
value: function getRemoteProductMembershipChange(existingOrder, mergedOrder, source) {
|
|
2678
2697
|
var _this17 = this,
|
|
2679
|
-
_mergedOrder$
|
|
2680
|
-
if (!this.
|
|
2698
|
+
_mergedOrder$order_id2;
|
|
2699
|
+
if (!this.isRemoteProductMembershipChangeSource(source)) return null;
|
|
2681
2700
|
var previousProducts = Array.isArray(existingOrder.products) ? existingOrder.products : [];
|
|
2682
2701
|
var currentProducts = Array.isArray(mergedOrder.products) ? mergedOrder.products : [];
|
|
2683
2702
|
var unmatchedCurrentIndexes = new Set(currentProducts.map(function (_, index) {
|
|
@@ -2713,7 +2732,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2713
2732
|
if (addedProductKeys.length === 0 && removedProductKeys.length === 0) {
|
|
2714
2733
|
return null;
|
|
2715
2734
|
}
|
|
2716
|
-
var orderId = (_mergedOrder$
|
|
2735
|
+
var orderId = (_mergedOrder$order_id2 = mergedOrder.order_id) !== null && _mergedOrder$order_id2 !== void 0 ? _mergedOrder$order_id2 : existingOrder.order_id;
|
|
2717
2736
|
if (orderId === undefined || orderId === null) return null;
|
|
2718
2737
|
return {
|
|
2719
2738
|
order_id: orderId,
|
|
@@ -2852,6 +2871,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2852
2871
|
}
|
|
2853
2872
|
return '';
|
|
2854
2873
|
}
|
|
2874
|
+
}, {
|
|
2875
|
+
key: "getPersistedOrderStorageKey",
|
|
2876
|
+
value: function getPersistedOrderStorageKey(order) {
|
|
2877
|
+
var persistedStorageKey = order === null || order === void 0 ? void 0 : order[ORDER_STORAGE_KEY_FIELD];
|
|
2878
|
+
if (persistedStorageKey !== undefined && persistedStorageKey !== null && persistedStorageKey !== '') {
|
|
2879
|
+
return String(persistedStorageKey);
|
|
2880
|
+
}
|
|
2881
|
+
return this.getOrderStorageKey(order);
|
|
2882
|
+
}
|
|
2855
2883
|
}, {
|
|
2856
2884
|
key: "getOrderIdentityMatchKeys",
|
|
2857
2885
|
value: function getOrderIdentityMatchKeys(order) {
|
|
@@ -3053,10 +3081,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
3053
3081
|
if (_field2 === 'payments') {
|
|
3054
3082
|
var preservedPending = this.getUnmatchedIdentifiedPendingPayments(existingRecord[_field2], incomingRecord[_field2]);
|
|
3055
3083
|
if (preservedPending.length > 0) {
|
|
3056
|
-
var
|
|
3084
|
+
var _ref7, _existing$order_id, _ref8, _existingRecord$exter;
|
|
3057
3085
|
this.logInfo('mergeOrderRecords-保留本地 pending 支付项', {
|
|
3058
|
-
order_id: (
|
|
3059
|
-
external_sale_number: (
|
|
3086
|
+
order_id: (_ref7 = (_existing$order_id = existing.order_id) !== null && _existing$order_id !== void 0 ? _existing$order_id : incoming.order_id) !== null && _ref7 !== void 0 ? _ref7 : null,
|
|
3087
|
+
external_sale_number: (_ref8 = (_existingRecord$exter = existingRecord.external_sale_number) !== null && _existingRecord$exter !== void 0 ? _existingRecord$exter : incomingRecord.external_sale_number) !== null && _ref8 !== void 0 ? _ref8 : null,
|
|
3060
3088
|
preserved_pending_count: preservedPending.length,
|
|
3061
3089
|
preserved_payment_identities: preservedPending.map(function (payment) {
|
|
3062
3090
|
return getOrderPaymentIdentityKeys(payment);
|
|
@@ -3109,14 +3137,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
3109
3137
|
} finally {
|
|
3110
3138
|
_iterator28.f();
|
|
3111
3139
|
}
|
|
3112
|
-
return _toConsumableArray(groups.entries()).filter(function (
|
|
3113
|
-
var _ref8 = _slicedToArray(_ref7, 2),
|
|
3114
|
-
group = _ref8[1];
|
|
3115
|
-
return group.length > 1;
|
|
3116
|
-
}).slice(0, 20).map(function (_ref9) {
|
|
3140
|
+
return _toConsumableArray(groups.entries()).filter(function (_ref9) {
|
|
3117
3141
|
var _ref10 = _slicedToArray(_ref9, 2),
|
|
3118
|
-
key = _ref10[0],
|
|
3119
3142
|
group = _ref10[1];
|
|
3143
|
+
return group.length > 1;
|
|
3144
|
+
}).slice(0, 20).map(function (_ref11) {
|
|
3145
|
+
var _ref12 = _slicedToArray(_ref11, 2),
|
|
3146
|
+
key = _ref12[0],
|
|
3147
|
+
group = _ref12[1];
|
|
3120
3148
|
return {
|
|
3121
3149
|
key: key,
|
|
3122
3150
|
count: group.length,
|
|
@@ -3423,11 +3451,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
3423
3451
|
var mergeActions,
|
|
3424
3452
|
options,
|
|
3425
3453
|
forceWriteStorageKeys,
|
|
3454
|
+
migrationTargetStorageKeys,
|
|
3426
3455
|
ordersSnapshot,
|
|
3427
3456
|
_this$filterRedundant2,
|
|
3428
3457
|
toWrite,
|
|
3429
3458
|
skipped,
|
|
3430
3459
|
compactedToWrite,
|
|
3460
|
+
writtenStorageKeys,
|
|
3461
|
+
storageKeyMigrations,
|
|
3462
|
+
_iterator32,
|
|
3463
|
+
_step32,
|
|
3464
|
+
migration,
|
|
3431
3465
|
_args23 = arguments;
|
|
3432
3466
|
return _regeneratorRuntime().wrap(function _callee23$(_context23) {
|
|
3433
3467
|
while (1) switch (_context23.prev = _context23.next) {
|
|
@@ -3453,35 +3487,83 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
3453
3487
|
case 8:
|
|
3454
3488
|
return _context23.abrupt("return");
|
|
3455
3489
|
case 9:
|
|
3490
|
+
migrationTargetStorageKeys = new Set((options.storageKeyMigrations || []).map(function (migration) {
|
|
3491
|
+
return migration.to;
|
|
3492
|
+
}));
|
|
3456
3493
|
ordersSnapshot = cloneDeep(orders).map(function (order) {
|
|
3457
3494
|
return _this22.normalizeOrderCollectionsForIngress(order, "".concat(source, ".sqliteIngress"));
|
|
3495
|
+
}).map(function (order) {
|
|
3496
|
+
var storageKey = _this22.getOrderStorageKey(order);
|
|
3497
|
+
if (!storageKey || !migrationTargetStorageKeys.has(storageKey)) return order;
|
|
3498
|
+
return _objectSpread(_objectSpread({}, order), {}, _defineProperty({}, ORDER_STORAGE_KEY_FIELD, storageKey));
|
|
3458
3499
|
}).filter(function (order) {
|
|
3459
3500
|
return _this22.getOrderStorageKey(order);
|
|
3460
3501
|
});
|
|
3461
3502
|
if (!(ordersSnapshot.length === 0)) {
|
|
3462
|
-
_context23.next =
|
|
3503
|
+
_context23.next = 13;
|
|
3463
3504
|
break;
|
|
3464
3505
|
}
|
|
3465
3506
|
return _context23.abrupt("return");
|
|
3466
|
-
case
|
|
3507
|
+
case 13:
|
|
3467
3508
|
_this$filterRedundant2 = this.filterRedundantPatchOrders(source, ordersSnapshot, mergeActions, forceWriteStorageKeys), toWrite = _this$filterRedundant2.toWrite, skipped = _this$filterRedundant2.skipped;
|
|
3468
3509
|
if (!(toWrite.length === 0)) {
|
|
3469
|
-
_context23.next =
|
|
3510
|
+
_context23.next = 16;
|
|
3470
3511
|
break;
|
|
3471
3512
|
}
|
|
3472
3513
|
return _context23.abrupt("return");
|
|
3473
|
-
case
|
|
3514
|
+
case 16:
|
|
3474
3515
|
compactedToWrite = this.compactOrderListByIdentity(toWrite, "".concat(source, ".sqlitePatch")).list;
|
|
3475
3516
|
if (!(compactedToWrite.length === 0)) {
|
|
3476
|
-
_context23.next =
|
|
3517
|
+
_context23.next = 19;
|
|
3477
3518
|
break;
|
|
3478
3519
|
}
|
|
3479
3520
|
return _context23.abrupt("return");
|
|
3480
|
-
case
|
|
3481
|
-
|
|
3482
|
-
|
|
3521
|
+
case 19:
|
|
3522
|
+
writtenStorageKeys = new Set(compactedToWrite.map(function (order) {
|
|
3523
|
+
return _this22.getOrderStorageKey(order);
|
|
3524
|
+
}).filter(Boolean));
|
|
3525
|
+
storageKeyMigrations = new Map();
|
|
3526
|
+
_iterator32 = _createForOfIteratorHelper(options.storageKeyMigrations || []);
|
|
3527
|
+
_context23.prev = 22;
|
|
3528
|
+
_iterator32.s();
|
|
3529
|
+
case 24:
|
|
3530
|
+
if ((_step32 = _iterator32.n()).done) {
|
|
3531
|
+
_context23.next = 33;
|
|
3532
|
+
break;
|
|
3533
|
+
}
|
|
3534
|
+
migration = _step32.value;
|
|
3535
|
+
if (writtenStorageKeys.has(migration.to)) {
|
|
3536
|
+
_context23.next = 28;
|
|
3537
|
+
break;
|
|
3538
|
+
}
|
|
3539
|
+
return _context23.abrupt("continue", 31);
|
|
3540
|
+
case 28:
|
|
3541
|
+
if (!writtenStorageKeys.has(migration.from)) {
|
|
3542
|
+
_context23.next = 30;
|
|
3543
|
+
break;
|
|
3544
|
+
}
|
|
3545
|
+
return _context23.abrupt("continue", 31);
|
|
3546
|
+
case 30:
|
|
3547
|
+
storageKeyMigrations.set(migration.from, migration);
|
|
3548
|
+
case 31:
|
|
3549
|
+
_context23.next = 24;
|
|
3550
|
+
break;
|
|
3551
|
+
case 33:
|
|
3552
|
+
_context23.next = 38;
|
|
3553
|
+
break;
|
|
3554
|
+
case 35:
|
|
3555
|
+
_context23.prev = 35;
|
|
3556
|
+
_context23.t0 = _context23["catch"](22);
|
|
3557
|
+
_iterator32.e(_context23.t0);
|
|
3558
|
+
case 38:
|
|
3559
|
+
_context23.prev = 38;
|
|
3560
|
+
_iterator32.f();
|
|
3561
|
+
return _context23.finish(38);
|
|
3562
|
+
case 41:
|
|
3563
|
+
_context23.prev = 41;
|
|
3564
|
+
_context23.next = 44;
|
|
3483
3565
|
return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
|
|
3484
|
-
var writeMethod,
|
|
3566
|
+
var writeMethod, _iterator33, _step33, order, _iterator34, _step34, migration, _iterator35, _step35, _orderRecord$ORDER_ST, _order, orderRecord;
|
|
3485
3567
|
return _regeneratorRuntime().wrap(function _callee22$(_context22) {
|
|
3486
3568
|
while (1) switch (_context22.prev = _context22.next) {
|
|
3487
3569
|
case 0:
|
|
@@ -3518,15 +3600,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
3518
3600
|
break;
|
|
3519
3601
|
}
|
|
3520
3602
|
writeMethod = 'update';
|
|
3521
|
-
|
|
3603
|
+
_iterator33 = _createForOfIteratorHelper(compactedToWrite);
|
|
3522
3604
|
_context22.prev = 17;
|
|
3523
|
-
|
|
3605
|
+
_iterator33.s();
|
|
3524
3606
|
case 19:
|
|
3525
|
-
if ((
|
|
3607
|
+
if ((_step33 = _iterator33.n()).done) {
|
|
3526
3608
|
_context22.next = 25;
|
|
3527
3609
|
break;
|
|
3528
3610
|
}
|
|
3529
|
-
order =
|
|
3611
|
+
order = _step33.value;
|
|
3530
3612
|
_context22.next = 23;
|
|
3531
3613
|
return _this22.dbManager.update(INDEXDB_STORE_NAME, order);
|
|
3532
3614
|
case 23:
|
|
@@ -3538,10 +3620,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
3538
3620
|
case 27:
|
|
3539
3621
|
_context22.prev = 27;
|
|
3540
3622
|
_context22.t0 = _context22["catch"](17);
|
|
3541
|
-
|
|
3623
|
+
_iterator33.e(_context22.t0);
|
|
3542
3624
|
case 30:
|
|
3543
3625
|
_context22.prev = 30;
|
|
3544
|
-
|
|
3626
|
+
_iterator33.f();
|
|
3545
3627
|
return _context22.finish(30);
|
|
3546
3628
|
case 33:
|
|
3547
3629
|
_context22.next = 37;
|
|
@@ -3554,38 +3636,121 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
3554
3636
|
throw new Error('订单 SQLite 数据库不支持写入');
|
|
3555
3637
|
case 37:
|
|
3556
3638
|
_this22.recordRecentSqliteWrite(source, compactedToWrite);
|
|
3639
|
+
if (!(writeMethod !== 'none')) {
|
|
3640
|
+
_context22.next = 84;
|
|
3641
|
+
break;
|
|
3642
|
+
}
|
|
3643
|
+
_iterator34 = _createForOfIteratorHelper(storageKeyMigrations.values());
|
|
3644
|
+
_context22.prev = 40;
|
|
3645
|
+
_iterator34.s();
|
|
3646
|
+
case 42:
|
|
3647
|
+
if ((_step34 = _iterator34.n()).done) {
|
|
3648
|
+
_context22.next = 76;
|
|
3649
|
+
break;
|
|
3650
|
+
}
|
|
3651
|
+
migration = _step34.value;
|
|
3652
|
+
_context22.prev = 44;
|
|
3653
|
+
_context22.next = 47;
|
|
3654
|
+
return _this22.dbManager.delete(INDEXDB_STORE_NAME, migration.from);
|
|
3655
|
+
case 47:
|
|
3656
|
+
_this22.recentSqliteWriteByStorageKey.delete(migration.from);
|
|
3657
|
+
_iterator35 = _createForOfIteratorHelper(orders);
|
|
3658
|
+
_context22.prev = 49;
|
|
3659
|
+
_iterator35.s();
|
|
3660
|
+
case 51:
|
|
3661
|
+
if ((_step35 = _iterator35.n()).done) {
|
|
3662
|
+
_context22.next = 61;
|
|
3663
|
+
break;
|
|
3664
|
+
}
|
|
3665
|
+
_order = _step35.value;
|
|
3666
|
+
if (!(_this22.getOrderStorageKey(_order) !== migration.to)) {
|
|
3667
|
+
_context22.next = 55;
|
|
3668
|
+
break;
|
|
3669
|
+
}
|
|
3670
|
+
return _context22.abrupt("continue", 59);
|
|
3671
|
+
case 55:
|
|
3672
|
+
orderRecord = _order;
|
|
3673
|
+
if (!(String((_orderRecord$ORDER_ST = orderRecord[ORDER_STORAGE_KEY_FIELD]) !== null && _orderRecord$ORDER_ST !== void 0 ? _orderRecord$ORDER_ST : '') !== migration.from)) {
|
|
3674
|
+
_context22.next = 58;
|
|
3675
|
+
break;
|
|
3676
|
+
}
|
|
3677
|
+
return _context22.abrupt("continue", 59);
|
|
3678
|
+
case 58:
|
|
3679
|
+
orderRecord[ORDER_STORAGE_KEY_FIELD] = migration.to;
|
|
3680
|
+
case 59:
|
|
3681
|
+
_context22.next = 51;
|
|
3682
|
+
break;
|
|
3683
|
+
case 61:
|
|
3684
|
+
_context22.next = 66;
|
|
3685
|
+
break;
|
|
3686
|
+
case 63:
|
|
3687
|
+
_context22.prev = 63;
|
|
3688
|
+
_context22.t1 = _context22["catch"](49);
|
|
3689
|
+
_iterator35.e(_context22.t1);
|
|
3690
|
+
case 66:
|
|
3691
|
+
_context22.prev = 66;
|
|
3692
|
+
_iterator35.f();
|
|
3693
|
+
return _context22.finish(66);
|
|
3694
|
+
case 69:
|
|
3695
|
+
_context22.next = 74;
|
|
3696
|
+
break;
|
|
3697
|
+
case 71:
|
|
3698
|
+
_context22.prev = 71;
|
|
3699
|
+
_context22.t2 = _context22["catch"](44);
|
|
3700
|
+
_this22.logError('删除订单旧 SQLite storage key 失败', {
|
|
3701
|
+
source: source,
|
|
3702
|
+
order_id: migration.orderId,
|
|
3703
|
+
oldStorageKey: migration.from,
|
|
3704
|
+
newStorageKey: migration.to,
|
|
3705
|
+
error: _context22.t2 instanceof Error ? _context22.t2.message : String(_context22.t2)
|
|
3706
|
+
});
|
|
3707
|
+
case 74:
|
|
3708
|
+
_context22.next = 42;
|
|
3709
|
+
break;
|
|
3710
|
+
case 76:
|
|
3711
|
+
_context22.next = 81;
|
|
3712
|
+
break;
|
|
3713
|
+
case 78:
|
|
3714
|
+
_context22.prev = 78;
|
|
3715
|
+
_context22.t3 = _context22["catch"](40);
|
|
3716
|
+
_iterator34.e(_context22.t3);
|
|
3717
|
+
case 81:
|
|
3718
|
+
_context22.prev = 81;
|
|
3719
|
+
_iterator34.f();
|
|
3720
|
+
return _context22.finish(81);
|
|
3721
|
+
case 84:
|
|
3557
3722
|
_this22.logInfo('patchOrdersInSQLite-完成', {
|
|
3558
3723
|
source: source,
|
|
3559
3724
|
count: compactedToWrite.length,
|
|
3560
3725
|
writeMethod: writeMethod,
|
|
3561
3726
|
dedupedCount: skipped.length
|
|
3562
3727
|
});
|
|
3563
|
-
case
|
|
3728
|
+
case 85:
|
|
3564
3729
|
case "end":
|
|
3565
3730
|
return _context22.stop();
|
|
3566
3731
|
}
|
|
3567
|
-
}, _callee22, null, [[17, 27, 30, 33]]);
|
|
3732
|
+
}, _callee22, null, [[17, 27, 30, 33], [40, 78, 81, 84], [44, 71], [49, 63, 66, 69]]);
|
|
3568
3733
|
})));
|
|
3569
|
-
case
|
|
3570
|
-
_context23.next =
|
|
3734
|
+
case 44:
|
|
3735
|
+
_context23.next = 51;
|
|
3571
3736
|
break;
|
|
3572
|
-
case
|
|
3573
|
-
_context23.prev =
|
|
3574
|
-
_context23.
|
|
3737
|
+
case 46:
|
|
3738
|
+
_context23.prev = 46;
|
|
3739
|
+
_context23.t1 = _context23["catch"](41);
|
|
3575
3740
|
this.logError('增量保存订单到 SQLite 失败', {
|
|
3576
|
-
error: _context23.
|
|
3741
|
+
error: _context23.t1 instanceof Error ? _context23.t1.message : String(_context23.t1),
|
|
3577
3742
|
orderCount: ordersSnapshot.length
|
|
3578
3743
|
});
|
|
3579
3744
|
if (!options.throwOnError) {
|
|
3580
|
-
_context23.next =
|
|
3745
|
+
_context23.next = 51;
|
|
3581
3746
|
break;
|
|
3582
3747
|
}
|
|
3583
|
-
throw _context23.
|
|
3584
|
-
case
|
|
3748
|
+
throw _context23.t1;
|
|
3749
|
+
case 51:
|
|
3585
3750
|
case "end":
|
|
3586
3751
|
return _context23.stop();
|
|
3587
3752
|
}
|
|
3588
|
-
}, _callee23, this, [[
|
|
3753
|
+
}, _callee23, this, [[22, 35, 38, 41], [41, 46]]);
|
|
3589
3754
|
}));
|
|
3590
3755
|
function patchOrdersInSQLite(_x16, _x17) {
|
|
3591
3756
|
return _patchOrdersInSQLite.apply(this, arguments);
|
|
@@ -3766,7 +3931,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
3766
3931
|
_context27.prev = 5;
|
|
3767
3932
|
_context27.next = 8;
|
|
3768
3933
|
return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
|
|
3769
|
-
var existingOrders, protectedLocalOrders,
|
|
3934
|
+
var existingOrders, protectedLocalOrders, _iterator36, _step36, rawCurrentOrder, currentOrder, protectedIndex, currentNeedsProtection, orderListSnapshot;
|
|
3770
3935
|
return _regeneratorRuntime().wrap(function _callee26$(_context26) {
|
|
3771
3936
|
while (1) switch (_context26.prev = _context26.next) {
|
|
3772
3937
|
case 0:
|
|
@@ -3789,15 +3954,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
3789
3954
|
}).filter(function (order) {
|
|
3790
3955
|
return _this24.shouldProtectLocalOrderFromRemoteSnapshot(order);
|
|
3791
3956
|
});
|
|
3792
|
-
|
|
3957
|
+
_iterator36 = _createForOfIteratorHelper(existingOrders || []);
|
|
3793
3958
|
_context26.prev = 10;
|
|
3794
|
-
|
|
3959
|
+
_iterator36.s();
|
|
3795
3960
|
case 12:
|
|
3796
|
-
if ((
|
|
3961
|
+
if ((_step36 = _iterator36.n()).done) {
|
|
3797
3962
|
_context26.next = 23;
|
|
3798
3963
|
break;
|
|
3799
3964
|
}
|
|
3800
|
-
rawCurrentOrder =
|
|
3965
|
+
rawCurrentOrder = _step36.value;
|
|
3801
3966
|
currentOrder = _this24.normalizeOrderCollectionsForIngress(rawCurrentOrder, "".concat(source, ".currentSQLite"));
|
|
3802
3967
|
protectedIndex = _this24.findOrderIndexByIdentity(protectedLocalOrders, currentOrder);
|
|
3803
3968
|
currentNeedsProtection = _this24.shouldProtectLocalOrderFromRemoteSnapshot(currentOrder);
|
|
@@ -3822,10 +3987,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
3822
3987
|
case 25:
|
|
3823
3988
|
_context26.prev = 25;
|
|
3824
3989
|
_context26.t1 = _context26["catch"](10);
|
|
3825
|
-
|
|
3990
|
+
_iterator36.e(_context26.t1);
|
|
3826
3991
|
case 28:
|
|
3827
3992
|
_context26.prev = 28;
|
|
3828
|
-
|
|
3993
|
+
_iterator36.f();
|
|
3829
3994
|
return _context26.finish(28);
|
|
3830
3995
|
case 31:
|
|
3831
3996
|
orderListSnapshot = _this24.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, protectedLocalOrders);
|