@pisell/pisellos 2.3.67 → 2.3.69

package/dist/server/modules/order/index.js

@@ -41,6 +41,7 @@ import { getOrderPaymentIdentityKeys, isIdentifiedPendingOrderPayment, isPending
  * SQLite 存储名称
  */
 var INDEXDB_STORE_NAME = 'orders';
+var ORDER_STORAGE_KEY_FIELD = '__order_storage_key';
 var ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY = 'server_order_last_full_fetch_at';
 var ORDER_LAST_FULL_FETCH_SHOP_ID_STORAGE_KEY = 'server_order_last_full_fetch_shop_id';
 var ORDER_SYNC_THROTTLE_MS_STORAGE_KEY = 'order_sync_throttle_ms';
@@ -2468,7 +2469,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(freshOrders, source) {
         var _this17 = this;
-        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;
+        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;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
@@ -2525,6 +2526,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               patchedOrders = [];
               remoteProductMembershipChanges = [];
               forceWriteStorageKeys = new Set();
+              storageKeyMigrations = [];
               mergeActions = {};
               existingProductsHaveStableIdentity = this.store.list.map(function (order) {
                 return _this17.doProductsHaveStableMembershipIdentity(order.products);
@@ -2551,11 +2553,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               _iterator16 = _createForOfIteratorHelper(uniqueFreshOrders);
-              _context19.prev = 37;
+              _context19.prev = 38;
               _iterator16.s();
-            case 39:
+            case 40:
               if ((_step16 = _iterator16.n()).done) {
-                _context19.next = 96;
+                _context19.next = 100;
                 break;
               }
               fresh = _step16.value;
@@ -2564,12 +2566,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               storageKey = this.getOrderStorageKey(fresh);
               mergeKey = storageKey || (fresh.order_id !== undefined && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : '');
               if (!(matchIndex >= 0)) {
-                _context19.next = 88;
+                _context19.next = 92;
                 break;
               }
               existingOrder = updatedList[matchIndex];
+              previousStorageKey = this.getPersistedOrderStorageKey(existingOrder);
               if (!(this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source))) {
-                _context19.next = 50;
+                _context19.next = 52;
                 break;
               }
               this.logInfo('mergeOrdersToStore-跳过 pending 订单远端覆盖', {
@@ -2582,10 +2585,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 remote_need_sync: (_fresh$need_sync = fresh.need_sync) !== null && _fresh$need_sync !== void 0 ? _fresh$need_sync : null,
                 reason: 'protect_pending_sync_order_from_remote_echo'
               });
-              return _context19.abrupt("continue", 94);
-            case 50:
+              return _context19.abrupt("continue", 98);
+            case 52:
               if (!(this.isDraftOrder(existingOrder) && this.shouldProtectDraftOrderFromIncoming(source))) {
-                _context19.next = 53;
+                _context19.next = 55;
                 break;
               }
               this.logInfo('mergeOrdersToStore-跳过 draft 订单远端覆盖', {
@@ -2596,8 +2599,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 remote_is_draft_order: (_fresh$is_draft_order = fresh.is_draft_order) !== null && _fresh$is_draft_order !== void 0 ? _fresh$is_draft_order : null,
                 reason: 'protect_draft_order_from_remote_echo'
               });
-              return _context19.abrupt("continue", 94);
-            case 53:
+              return _context19.abrupt("continue", 98);
+            case 55:
               mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
               freshOrderId = fresh.order_id;
               incomingProductsAreStable = freshOrderId !== undefined && freshOrderId !== null && incomingProductsHaveStableIdentity.get(this.getIdKey(freshOrderId)) !== false;
@@ -2609,37 +2612,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               adjustedMatchIndex = matchIndex;
               duplicateIndexes = new Set();
               _iterator17 = _createForOfIteratorHelper(freshIdentityKeys);
-              _context19.prev = 62;
+              _context19.prev = 64;
               _iterator17.s();
-            case 64:
+            case 66:
               if ((_step17 = _iterator17.n()).done) {
-                _context19.next = 72;
+                _context19.next = 74;
                 break;
               }
               _key2 = _step17.value;
               _duplicateIndex = identityKeyToIndex.get(_key2);
               if (!(_duplicateIndex === undefined || _duplicateIndex === matchIndex)) {
-                _context19.next = 69;
+                _context19.next = 71;
                 break;
               }
-              return _context19.abrupt("continue", 70);
-            case 69:
+              return _context19.abrupt("continue", 72);
+            case 71:
               duplicateIndexes.add(_duplicateIndex);
-            case 70:
-              _context19.next = 64;
-              break;
             case 72:
-              _context19.next = 77;
+              _context19.next = 66;
               break;
             case 74:
-              _context19.prev = 74;
-              _context19.t1 = _context19["catch"](62);
+              _context19.next = 79;
+              break;
+            case 76:
+              _context19.prev = 76;
+              _context19.t1 = _context19["catch"](64);
               _iterator17.e(_context19.t1);
-            case 77:
-              _context19.prev = 77;
+            case 79:
+              _context19.prev = 79;
               _iterator17.f();
-              return _context19.finish(77);
-            case 80:
+              return _context19.finish(79);
+            case 82:
               if (duplicateIndexes.size > 0) {
                 _iterator18 = _createForOfIteratorHelper(_toConsumableArray(duplicateIndexes).sort(function (left, right) {
                   return right - left;
@@ -2673,6 +2676,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   }
                 }
               }
+              nextStorageKey = this.getOrderStorageKey(mergedOrder);
+              if (previousStorageKey && nextStorageKey && previousStorageKey !== nextStorageKey) {
+                storageKeyMigrations.push({
+                  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,
+                  from: previousStorageKey,
+                  to: nextStorageKey
+                });
+              }
               updatedList[adjustedMatchIndex] = mergedOrder;
               existingProductsHaveStableIdentity[adjustedMatchIndex] = mergedProductsHaveStableIdentity;
               if (membershipChange) {
@@ -2685,29 +2696,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, adjustedMatchIndex);
               patchedOrders.push(mergedOrder);
               if (mergeKey) mergeActions[mergeKey] = 'update';
-              return _context19.abrupt("continue", 94);
-            case 88:
+              return _context19.abrupt("continue", 98);
+            case 92:
               insertIndex = updatedList.length;
               updatedList.push(fresh);
               existingProductsHaveStableIdentity.push(fresh.order_id !== undefined && fresh.order_id !== null && incomingProductsHaveStableIdentity.get(this.getIdKey(fresh.order_id)) !== false);
               this.registerOrderIdentityKeys(identityKeyToIndex, fresh, insertIndex);
               patchedOrders.push(fresh);
               if (mergeKey) mergeActions[mergeKey] = 'insert';
-            case 94:
-              _context19.next = 39;
+            case 98:
+              _context19.next = 40;
               break;
-            case 96:
-              _context19.next = 101;
+            case 100:
+              _context19.next = 105;
               break;
-            case 98:
-              _context19.prev = 98;
-              _context19.t2 = _context19["catch"](37);
+            case 102:
+              _context19.prev = 102;
+              _context19.t2 = _context19["catch"](38);
               _iterator16.e(_context19.t2);
-            case 101:
-              _context19.prev = 101;
+            case 105:
+              _context19.prev = 105;
               _iterator16.f();
-              return _context19.finish(101);
-            case 104:
+              return _context19.finish(105);
+            case 108:
               insertCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'insert';
               }).length;
@@ -2723,25 +2734,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 仅在自检开关开启时做一次兜底校验。
               this.store.list = this.runOrderStoreSelfCheck(updatedList, "".concat(source, ".store"));
               this.syncOrdersMap();
-              _context19.next = 111;
-              return this.patchOrdersInSQLite(patchedOrders, source, mergeActions, {}, forceWriteStorageKeys);
-            case 111:
+              _context19.next = 115;
+              return this.patchOrdersInSQLite(patchedOrders, source, mergeActions, {
+                storageKeyMigrations: storageKeyMigrations
+              }, forceWriteStorageKeys);
+            case 115:
               this.logInfo('mergeOrdersToStore-结束', {
                 uniqueFreshCount: uniqueFreshCount,
                 storeOrderCountAfter: this.store.list.length,
                 insertCount: insertCount,
                 updateCount: updateCount
               });
-              _context19.next = 114;
+              _context19.next = 118;
               return this.emitRemoteProductMembershipChanges(remoteProductMembershipChanges);
-            case 114:
-              _context19.next = 116;
+            case 118:
+              _context19.next = 120;
               return this.emitOrdersChanged(patchedOrders, source);
-            case 116:
+            case 120:
             case "end":
               return _context19.stop();
           }
-        }, _callee19, this, [[6, 20, 23, 26], [37, 98, 101, 104], [62, 74, 77, 80]]);
+        }, _callee19, this, [[6, 20, 23, 26], [38, 102, 105, 108], [64, 76, 79, 82]]);
       }));
       function mergeOrdersToStore(_x13, _x14) {
         return _mergeOrdersToStore.apply(this, arguments);
@@ -2824,7 +2837,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "getRemoteProductMembershipChange",
     value: function getRemoteProductMembershipChange(existingOrder, mergedOrder, source) {
       var _this18 = this,
-        _mergedOrder$order_id;
+        _mergedOrder$order_id2;
       if (!this.isRemoteProductMembershipChangeSource(source)) return null;
       var previousProducts = Array.isArray(existingOrder.products) ? existingOrder.products : [];
       var currentProducts = Array.isArray(mergedOrder.products) ? mergedOrder.products : [];
@@ -2861,7 +2874,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (addedProductKeys.length === 0 && removedProductKeys.length === 0) {
         return null;
       }
-      var orderId = (_mergedOrder$order_id = mergedOrder.order_id) !== null && _mergedOrder$order_id !== void 0 ? _mergedOrder$order_id : existingOrder.order_id;
+      var orderId = (_mergedOrder$order_id2 = mergedOrder.order_id) !== null && _mergedOrder$order_id2 !== void 0 ? _mergedOrder$order_id2 : existingOrder.order_id;
       if (orderId === undefined || orderId === null) return null;
       return {
         order_id: orderId,
@@ -3000,6 +3013,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return '';
     }
+  }, {
+    key: "getPersistedOrderStorageKey",
+    value: function getPersistedOrderStorageKey(order) {
+      var persistedStorageKey = order === null || order === void 0 ? void 0 : order[ORDER_STORAGE_KEY_FIELD];
+      if (persistedStorageKey !== undefined && persistedStorageKey !== null && persistedStorageKey !== '') {
+        return String(persistedStorageKey);
+      }
+      return this.getOrderStorageKey(order);
+    }
   }, {
     key: "getOrderIdentityMatchKeys",
     value: function getOrderIdentityMatchKeys(order) {
@@ -3201,10 +3223,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           if (_field2 === 'payments') {
             var preservedPending = this.getUnmatchedIdentifiedPendingPayments(existingRecord[_field2], incomingRecord[_field2]);
             if (preservedPending.length > 0) {
-              var _ref5, _existing$order_id, _ref6, _existingRecord$exter;
+              var _ref7, _existing$order_id, _ref8, _existingRecord$exter;
               this.logInfo('mergeOrderRecords-保留本地 pending 支付项', {
-                order_id: (_ref5 = (_existing$order_id = existing.order_id) !== null && _existing$order_id !== void 0 ? _existing$order_id : incoming.order_id) !== null && _ref5 !== void 0 ? _ref5 : null,
-                external_sale_number: (_ref6 = (_existingRecord$exter = existingRecord.external_sale_number) !== null && _existingRecord$exter !== void 0 ? _existingRecord$exter : incomingRecord.external_sale_number) !== null && _ref6 !== void 0 ? _ref6 : null,
+                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,
+                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,
                 preserved_pending_count: preservedPending.length,
                 preserved_payment_identities: preservedPending.map(function (payment) {
                   return getOrderPaymentIdentityKeys(payment);
@@ -3257,14 +3279,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       } finally {
         _iterator28.f();
       }
-      return _toConsumableArray(groups.entries()).filter(function (_ref7) {
-        var _ref8 = _slicedToArray(_ref7, 2),
-          group = _ref8[1];
-        return group.length > 1;
-      }).slice(0, 20).map(function (_ref9) {
+      return _toConsumableArray(groups.entries()).filter(function (_ref9) {
         var _ref10 = _slicedToArray(_ref9, 2),
-          key = _ref10[0],
           group = _ref10[1];
+        return group.length > 1;
+      }).slice(0, 20).map(function (_ref11) {
+        var _ref12 = _slicedToArray(_ref11, 2),
+          key = _ref12[0],
+          group = _ref12[1];
         return {
           key: key,
           count: group.length,
@@ -3632,11 +3654,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var mergeActions,
           options,
           forceWriteStorageKeys,
+          migrationTargetStorageKeys,
           ordersSnapshot,
           _this$filterRedundant2,
           toWrite,
           skipped,
           compactedToWrite,
+          writtenStorageKeys,
+          storageKeyMigrations,
+          _iterator32,
+          _step32,
+          migration,
           _args23 = arguments;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
@@ -3662,35 +3690,83 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 8:
               return _context23.abrupt("return");
             case 9:
+              migrationTargetStorageKeys = new Set((options.storageKeyMigrations || []).map(function (migration) {
+                return migration.to;
+              }));
               ordersSnapshot = cloneDeep(orders).map(function (order) {
                 return _this23.normalizeOrderCollectionsForIngress(order, "".concat(source, ".sqliteIngress"));
+              }).map(function (order) {
+                var storageKey = _this23.getOrderStorageKey(order);
+                if (!storageKey || !migrationTargetStorageKeys.has(storageKey)) return order;
+                return _objectSpread(_objectSpread({}, order), {}, _defineProperty({}, ORDER_STORAGE_KEY_FIELD, storageKey));
               }).filter(function (order) {
                 return _this23.getOrderStorageKey(order);
               });
               if (!(ordersSnapshot.length === 0)) {
-                _context23.next = 12;
+                _context23.next = 13;
                 break;
               }
               return _context23.abrupt("return");
-            case 12:
+            case 13:
               _this$filterRedundant2 = this.filterRedundantPatchOrders(source, ordersSnapshot, mergeActions, forceWriteStorageKeys), toWrite = _this$filterRedundant2.toWrite, skipped = _this$filterRedundant2.skipped;
               if (!(toWrite.length === 0)) {
-                _context23.next = 15;
+                _context23.next = 16;
                 break;
               }
               return _context23.abrupt("return");
-            case 15:
+            case 16:
               compactedToWrite = this.compactOrderListByIdentity(toWrite, "".concat(source, ".sqlitePatch")).list;
               if (!(compactedToWrite.length === 0)) {
-                _context23.next = 18;
+                _context23.next = 19;
                 break;
               }
               return _context23.abrupt("return");
-            case 18:
-              _context23.prev = 18;
-              _context23.next = 21;
+            case 19:
+              writtenStorageKeys = new Set(compactedToWrite.map(function (order) {
+                return _this23.getOrderStorageKey(order);
+              }).filter(Boolean));
+              storageKeyMigrations = new Map();
+              _iterator32 = _createForOfIteratorHelper(options.storageKeyMigrations || []);
+              _context23.prev = 22;
+              _iterator32.s();
+            case 24:
+              if ((_step32 = _iterator32.n()).done) {
+                _context23.next = 33;
+                break;
+              }
+              migration = _step32.value;
+              if (writtenStorageKeys.has(migration.to)) {
+                _context23.next = 28;
+                break;
+              }
+              return _context23.abrupt("continue", 31);
+            case 28:
+              if (!writtenStorageKeys.has(migration.from)) {
+                _context23.next = 30;
+                break;
+              }
+              return _context23.abrupt("continue", 31);
+            case 30:
+              storageKeyMigrations.set(migration.from, migration);
+            case 31:
+              _context23.next = 24;
+              break;
+            case 33:
+              _context23.next = 38;
+              break;
+            case 35:
+              _context23.prev = 35;
+              _context23.t0 = _context23["catch"](22);
+              _iterator32.e(_context23.t0);
+            case 38:
+              _context23.prev = 38;
+              _iterator32.f();
+              return _context23.finish(38);
+            case 41:
+              _context23.prev = 41;
+              _context23.next = 44;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
-                var writeMethod, _iterator32, _step32, order;
+                var writeMethod, _iterator33, _step33, order, _iterator34, _step34, migration, _iterator35, _step35, _orderRecord$ORDER_ST, _order, orderRecord;
                 return _regeneratorRuntime().wrap(function _callee22$(_context22) {
                   while (1) switch (_context22.prev = _context22.next) {
                     case 0:
@@ -3727,15 +3803,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         break;
                       }
                       writeMethod = 'update';
-                      _iterator32 = _createForOfIteratorHelper(compactedToWrite);
+                      _iterator33 = _createForOfIteratorHelper(compactedToWrite);
                       _context22.prev = 17;
-                      _iterator32.s();
+                      _iterator33.s();
                     case 19:
-                      if ((_step32 = _iterator32.n()).done) {
+                      if ((_step33 = _iterator33.n()).done) {
                         _context22.next = 25;
                         break;
                       }
-                      order = _step32.value;
+                      order = _step33.value;
                       _context22.next = 23;
                       return _this23.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
@@ -3747,10 +3823,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 27:
                       _context22.prev = 27;
                       _context22.t0 = _context22["catch"](17);
-                      _iterator32.e(_context22.t0);
+                      _iterator33.e(_context22.t0);
                     case 30:
                       _context22.prev = 30;
-                      _iterator32.f();
+                      _iterator33.f();
                       return _context22.finish(30);
                     case 33:
                       _context22.next = 37;
@@ -3763,38 +3839,121 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       throw new Error('订单 SQLite 数据库不支持写入');
                     case 37:
                       _this23.recordRecentSqliteWrite(source, compactedToWrite);
+                      if (!(writeMethod !== 'none')) {
+                        _context22.next = 84;
+                        break;
+                      }
+                      _iterator34 = _createForOfIteratorHelper(storageKeyMigrations.values());
+                      _context22.prev = 40;
+                      _iterator34.s();
+                    case 42:
+                      if ((_step34 = _iterator34.n()).done) {
+                        _context22.next = 76;
+                        break;
+                      }
+                      migration = _step34.value;
+                      _context22.prev = 44;
+                      _context22.next = 47;
+                      return _this23.dbManager.delete(INDEXDB_STORE_NAME, migration.from);
+                    case 47:
+                      _this23.recentSqliteWriteByStorageKey.delete(migration.from);
+                      _iterator35 = _createForOfIteratorHelper(orders);
+                      _context22.prev = 49;
+                      _iterator35.s();
+                    case 51:
+                      if ((_step35 = _iterator35.n()).done) {
+                        _context22.next = 61;
+                        break;
+                      }
+                      _order = _step35.value;
+                      if (!(_this23.getOrderStorageKey(_order) !== migration.to)) {
+                        _context22.next = 55;
+                        break;
+                      }
+                      return _context22.abrupt("continue", 59);
+                    case 55:
+                      orderRecord = _order;
+                      if (!(String((_orderRecord$ORDER_ST = orderRecord[ORDER_STORAGE_KEY_FIELD]) !== null && _orderRecord$ORDER_ST !== void 0 ? _orderRecord$ORDER_ST : '') !== migration.from)) {
+                        _context22.next = 58;
+                        break;
+                      }
+                      return _context22.abrupt("continue", 59);
+                    case 58:
+                      orderRecord[ORDER_STORAGE_KEY_FIELD] = migration.to;
+                    case 59:
+                      _context22.next = 51;
+                      break;
+                    case 61:
+                      _context22.next = 66;
+                      break;
+                    case 63:
+                      _context22.prev = 63;
+                      _context22.t1 = _context22["catch"](49);
+                      _iterator35.e(_context22.t1);
+                    case 66:
+                      _context22.prev = 66;
+                      _iterator35.f();
+                      return _context22.finish(66);
+                    case 69:
+                      _context22.next = 74;
+                      break;
+                    case 71:
+                      _context22.prev = 71;
+                      _context22.t2 = _context22["catch"](44);
+                      _this23.logError('删除订单旧 SQLite storage key 失败', {
+                        source: source,
+                        order_id: migration.orderId,
+                        oldStorageKey: migration.from,
+                        newStorageKey: migration.to,
+                        error: _context22.t2 instanceof Error ? _context22.t2.message : String(_context22.t2)
+                      });
+                    case 74:
+                      _context22.next = 42;
+                      break;
+                    case 76:
+                      _context22.next = 81;
+                      break;
+                    case 78:
+                      _context22.prev = 78;
+                      _context22.t3 = _context22["catch"](40);
+                      _iterator34.e(_context22.t3);
+                    case 81:
+                      _context22.prev = 81;
+                      _iterator34.f();
+                      return _context22.finish(81);
+                    case 84:
                       _this23.logInfo('patchOrdersInSQLite-完成', {
                         source: source,
                         count: compactedToWrite.length,
                         writeMethod: writeMethod,
                         dedupedCount: skipped.length
                       });
-                    case 39:
+                    case 85:
                     case "end":
                       return _context22.stop();
                   }
-                }, _callee22, null, [[17, 27, 30, 33]]);
+                }, _callee22, null, [[17, 27, 30, 33], [40, 78, 81, 84], [44, 71], [49, 63, 66, 69]]);
               })));
-            case 21:
-              _context23.next = 28;
+            case 44:
+              _context23.next = 51;
               break;
-            case 23:
-              _context23.prev = 23;
-              _context23.t0 = _context23["catch"](18);
+            case 46:
+              _context23.prev = 46;
+              _context23.t1 = _context23["catch"](41);
               this.logError('增量保存订单到 SQLite 失败', {
-                error: _context23.t0 instanceof Error ? _context23.t0.message : String(_context23.t0),
+                error: _context23.t1 instanceof Error ? _context23.t1.message : String(_context23.t1),
                 orderCount: ordersSnapshot.length
               });
               if (!options.throwOnError) {
-                _context23.next = 28;
+                _context23.next = 51;
                 break;
               }
-              throw _context23.t0;
-            case 28:
+              throw _context23.t1;
+            case 51:
             case "end":
               return _context23.stop();
           }
-        }, _callee23, this, [[18, 23]]);
+        }, _callee23, this, [[22, 35, 38, 41], [41, 46]]);
       }));
       function patchOrdersInSQLite(_x16, _x17) {
         return _patchOrdersInSQLite.apply(this, arguments);
@@ -3980,7 +4139,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context27.prev = 6;
               _context27.next = 9;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
-                var existingOrders, protectedLocalOrders, _iterator33, _step33, rawCurrentOrder, currentOrder, protectedIndex, currentNeedsProtection, orderListSnapshot;
+                var existingOrders, protectedLocalOrders, _iterator36, _step36, rawCurrentOrder, currentOrder, protectedIndex, currentNeedsProtection, orderListSnapshot;
                 return _regeneratorRuntime().wrap(function _callee26$(_context26) {
                   while (1) switch (_context26.prev = _context26.next) {
                     case 0:
@@ -4003,15 +4162,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }).filter(function (order) {
                         return _this25.shouldProtectLocalOrderFromRemoteSnapshot(order);
                       });
-                      _iterator33 = _createForOfIteratorHelper(existingOrders || []);
+                      _iterator36 = _createForOfIteratorHelper(existingOrders || []);
                       _context26.prev = 10;
-                      _iterator33.s();
+                      _iterator36.s();
                     case 12:
-                      if ((_step33 = _iterator33.n()).done) {
+                      if ((_step36 = _iterator36.n()).done) {
                         _context26.next = 23;
                         break;
                       }
-                      rawCurrentOrder = _step33.value;
+                      rawCurrentOrder = _step36.value;
                       currentOrder = _this25.normalizeOrderCollectionsForIngress(rawCurrentOrder, "".concat(source, ".currentSQLite"));
                       protectedIndex = _this25.findOrderIndexByIdentity(protectedLocalOrders, currentOrder);
                       currentNeedsProtection = _this25.shouldProtectLocalOrderFromRemoteSnapshot(currentOrder);
@@ -4036,10 +4195,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 25:
                       _context26.prev = 25;
                       _context26.t1 = _context26["catch"](10);
-                      _iterator33.e(_context26.t1);
+                      _iterator36.e(_context26.t1);
                     case 28:
                       _context26.prev = 28;
-                      _iterator33.f();
+                      _iterator36.f();
                       return _context26.finish(28);
                     case 31:
                       orderListSnapshot = _this25.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, protectedLocalOrders);

package/dist/server/utils/small-ticket.js

@@ -619,7 +619,8 @@ function formatBundlePrice(bundle, currencySymbol) {
   var _ref33, _ref34, _bundle$bundle_sellin;
   var value = (_ref33 = (_ref34 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref34 !== void 0 ? _ref34 : bundle.price) !== null && _ref33 !== void 0 ? _ref33 : 0;
   var amount = new Decimal(toMoneyNumber(value));
-  var isNegative = bundle.price_type === 'markdown' || bundle.price_type === 'markup' && bundle.price_type_ext === 'product_price';
+  // 套餐价格协议：只有 markdown 是减价；加价与商品原价都保持正数。
+  var isNegative = bundle.price_type === 'markdown';
   if (isNegative) return "-".concat(currencySymbol).concat(amount.abs().toFixed(2));
   return formatMoney(amount, currencySymbol);
 }