@pisell/pisellos 2.2.228 → 2.2.230

package/dist/modules/Order/index.d.ts

@@ -372,6 +372,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     private markLocalOrderSynced;
+    private applyRemoteOrderNumbersToTempOrder;
     private isSubmitResponseRejected;
     private isLocalPendingSubmitResult;
     private isSubmitErrorResponse;

package/dist/modules/Order/index.js

@@ -3115,7 +3115,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee16$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              tempOrder = this.ensureTempOrder(); // TODO note 改对象
+              tempOrder = this.ensureTempOrder();
               if (!booking) {
                 _context18.next = 18;
                 break;
@@ -3740,7 +3740,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 var enhancedPayload = params !== null && params !== void 0 && params.enhancePayload ? params.enhancePayload(nextPayload, ctx) : nextPayload;
                 return enhancedPayload;
               } : undefined;
-              debugger;
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
@@ -3754,10 +3753,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context26.next = 21;
+              _context26.next = 20;
               return this.saveDraft();
-            case 21:
-              _context26.prev = 21;
+            case 20:
+              _context26.prev = 20;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -3766,26 +3765,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments = payload.payments) === null || _payload$payments === void 0 ? void 0 : _payload$payments.length) || 0,
                 smallTicketDataFlag: payload.small_ticket_data_flag
               });
-              _context26.next = 25;
+              _context26.next = 24;
               return this.submitSalesOrder({
                 query: payload
               });
-            case 25:
+            case 24:
               result = _context26.sent;
-              _context26.next = 38;
+              _context26.next = 37;
               break;
-            case 28:
-              _context26.prev = 28;
-              _context26.t2 = _context26["catch"](21);
+            case 27:
+              _context26.prev = 27;
+              _context26.t2 = _context26["catch"](20);
               backendErrorResponse = this.extractSubmitErrorResponse(_context26.t2);
               if (!backendErrorResponse) {
-                _context26.next = 35;
+                _context26.next = 34;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
               return _context26.abrupt("return", backendErrorResponse);
-            case 35:
+            case 34:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
                 error: _context26.t2 instanceof Error ? _context26.t2.message : String(_context26.t2),
@@ -3795,40 +3794,40 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
               throw _context26.t2;
-            case 38:
+            case 37:
               if (!this.isSubmitResponseRejected(result)) {
-                _context26.next = 42;
+                _context26.next = 41;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
               return _context26.abrupt("return", result);
-            case 42:
+            case 41:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context26.next = 50;
+                _context26.next = 49;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context26.next = 48;
+              _context26.next = 47;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 48:
-              _context26.next = 51;
+            case 47:
+              _context26.next = 50;
               break;
-            case 50:
+            case 49:
               if (this.isLocalPendingSubmitResult(result)) {
                 this.store.syncState = 'local';
               } else {
                 this.store.syncState = 'submitted';
               }
-            case 51:
+            case 50:
               return _context26.abrupt("return", result);
-            case 52:
+            case 51:
             case "end":
               return _context26.stop();
           }
-        }, _callee24, this, [[21, 28]]);
+        }, _callee24, this, [[20, 27]]);
       }));
       function submitTempOrder(_x26) {
         return _submitTempOrder.apply(this, arguments);
@@ -3845,12 +3844,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.order_id = orderId;
+              this.applyRemoteOrderNumbersToTempOrder(tempOrder, remoteOrder);
               this.store.lastOrderInfo = remoteOrder;
               this.store.syncState = 'submitted';
               this.persistTempOrder();
-              _context27.next = 7;
+              _context27.next = 8;
               return this.saveDraft();
-            case 7:
+            case 8:
             case "end":
               return _context27.stop();
           }
@@ -3861,6 +3861,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return markLocalOrderSynced;
     }()
+  }, {
+    key: "applyRemoteOrderNumbersToTempOrder",
+    value: function applyRemoteOrderNumbersToTempOrder(tempOrder, remoteOrder) {
+      var applyOrderNumber = function applyOrderNumber(key) {
+        var value = remoteOrder === null || remoteOrder === void 0 ? void 0 : remoteOrder[key];
+        if (value !== undefined && value !== null && value !== '') {
+          tempOrder[key] = String(value);
+        }
+      };
+      applyOrderNumber('order_number');
+      applyOrderNumber('shop_order_number');
+      applyOrderNumber('shop_full_order_number');
+    }
   }, {
     key: "isSubmitResponseRejected",
     value: function isSubmitResponseRejected(response) {

package/dist/server/index.js

@@ -3785,7 +3785,7 @@ var Server = /*#__PURE__*/function () {
     key: "normalizeCheckoutSubmitData",
     value: function () {
       var _normalizeCheckoutSubmitData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(data, title) {
-        var next, externalSaleNumber, shouldClearLocalOrderId, localOrder;
+        var next, externalSaleNumber, shouldClearLocalOrderId, hasCheckoutOrderNumbers, localOrder;
         return _regeneratorRuntime().wrap(function _callee40$(_context40) {
           while (1) switch (_context40.prev = _context40.next) {
             case 0:
@@ -3799,8 +3799,22 @@ var Server = /*#__PURE__*/function () {
               externalSaleNumber = next.external_sale_number;
               shouldClearLocalOrderId = this.isLocalCheckoutOrderId(next.order_id);
               if (shouldClearLocalOrderId) next.order_id = null;
+              hasCheckoutOrderNumbers = !this.isBlankCheckoutValue(next.shop_order_number) && !this.isBlankCheckoutValue(next.shop_full_order_number);
+              if (!hasCheckoutOrderNumbers) {
+                _context40.next = 10;
+                break;
+              }
+              this.logInfo("".concat(title, ": checkout \u5DF2\u643A\u5E26\u8BA2\u5355\u53F7\uFF0C\u8DF3\u8FC7\u67E5\u91CD"), {
+                original_order_id: data.order_id,
+                order_id: next.order_id,
+                external_sale_number: externalSaleNumber,
+                shop_order_number: next.shop_order_number,
+                shop_full_order_number: next.shop_full_order_number
+              });
+              return _context40.abrupt("return", next);
+            case 10:
               if (!this.isBlankCheckoutValue(externalSaleNumber)) {
-                _context40.next = 9;
+                _context40.next = 13;
                 break;
               }
               if (shouldClearLocalOrderId) {
@@ -3810,9 +3824,9 @@ var Server = /*#__PURE__*/function () {
                 });
               }
               return _context40.abrupt("return", next);
-            case 9:
-              if (!(!this.order || typeof this.order.getLocalOrderByLookup !== 'function')) {
-                _context40.next = 12;
+            case 13:
+              if (!(!this.order || typeof this.order.getLocalOrderFromMemoryByLookup !== 'function')) {
+                _context40.next = 16;
                 break;
               }
               if (shouldClearLocalOrderId) {
@@ -3822,14 +3836,11 @@ var Server = /*#__PURE__*/function () {
                 });
               }
               return _context40.abrupt("return", next);
-            case 12:
-              _context40.prev = 12;
-              _context40.next = 15;
-              return this.order.getLocalOrderByLookup(externalSaleNumber);
-            case 15:
-              localOrder = _context40.sent;
+            case 16:
+              _context40.prev = 16;
+              localOrder = this.order.getLocalOrderFromMemoryByLookup(externalSaleNumber);
               if (localOrder) {
-                _context40.next = 19;
+                _context40.next = 21;
                 break;
               }
               if (shouldClearLocalOrderId) {
@@ -3840,7 +3851,7 @@ var Server = /*#__PURE__*/function () {
                 });
               }
               return _context40.abrupt("return", next);
-            case 19:
+            case 21:
               if (this.isBlankCheckoutValue(next.shop_order_number)) {
                 next.shop_order_number = localOrder.shop_order_number;
               }
@@ -3856,20 +3867,20 @@ var Server = /*#__PURE__*/function () {
                 shop_full_order_number: next.shop_full_order_number
               });
               return _context40.abrupt("return", next);
-            case 25:
-              _context40.prev = 25;
-              _context40.t0 = _context40["catch"](12);
+            case 27:
+              _context40.prev = 27;
+              _context40.t0 = _context40["catch"](16);
               this.logWarning("".concat(title, ": checkout \u67E5\u627E\u672C\u5730\u8BA2\u5355\u5931\u8D25"), {
                 external_sale_number: externalSaleNumber,
                 error: this.getUnknownErrorMessage(_context40.t0),
                 error_detail: this.normalizeUnknownError(_context40.t0)
               });
               return _context40.abrupt("return", next);
-            case 29:
+            case 31:
             case "end":
               return _context40.stop();
           }
-        }, _callee40, this, [[12, 25]]);
+        }, _callee40, this, [[16, 27]]);
       }));
       function normalizeCheckoutSubmitData(_x42, _x43) {
         return _normalizeCheckoutSubmitData.apply(this, arguments);

package/dist/server/modules/order/index.d.ts

@@ -79,6 +79,7 @@ export declare class OrderModule extends BaseModule implements Module {
     getOrderById(id: OrderId): OrderData | undefined;
     /** 按 order_id 查询内存订单。 */
     getOrderByOrderId(orderId: OrderId): OrderData | undefined;
+    getLocalOrderFromMemoryByLookup(lookup: OrderId): OrderData | null;
     getLocalOrderByLookup(lookup: OrderId): Promise<OrderData | null>;
     loadOrdersByServer(): Promise<OrderData[]>;
     /**

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

@@ -561,11 +561,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function getOrderByOrderId(orderId) {
       return this.store.map.get(this.getIdKey(orderId));
     }
+  }, {
+    key: "getLocalOrderFromMemoryByLookup",
+    value: function getLocalOrderFromMemoryByLookup(lookup) {
+      var _this5 = this;
+      var key = this.getIdKey(lookup);
+      var memoryOrderById = this.store.map.get(key);
+      if (memoryOrderById) return memoryOrderById;
+      var memoryOrder = this.store.list.find(function (order) {
+        return _this5.isOrderLookupMatch(order, key);
+      });
+      return memoryOrder || null;
+    }
   }, {
     key: "getLocalOrderByLookup",
     value: function () {
       var _getLocalOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(lookup) {
-        var _this5 = this;
+        var _this6 = this;
         var key, memoryOrderById, memoryOrder, orders, localOrder;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
@@ -579,7 +591,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context5.abrupt("return", memoryOrderById);
             case 4:
               memoryOrder = this.store.list.find(function (order) {
-                return _this5.isOrderLookupMatch(order, key);
+                return _this6.isOrderLookupMatch(order, key);
               });
               if (!memoryOrder) {
                 _context5.next = 7;
@@ -592,7 +604,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 9:
               orders = _context5.sent;
               localOrder = orders.find(function (order) {
-                return _this5.isOrderLookupMatch(order, key);
+                return _this6.isOrderLookupMatch(order, key);
               });
               if (localOrder) {
                 _context5.next = 13;
@@ -601,7 +613,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context5.abrupt("return", null);
             case 13:
               this.store.list = orders.map(function (order) {
-                return _this5.normalizeOrderForMemoryList(order);
+                return _this6.normalizeOrderForMemoryList(order);
               });
               this.syncOrdersMap();
               return _context5.abrupt("return", this.normalizeOrderForMemoryList(localOrder));
@@ -621,7 +633,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadOrdersByServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
         var _this$store,
-          _this6 = this;
+          _this7 = this;
         var orderList, data, mergedOrders, memoryOrders;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
@@ -663,7 +675,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 19:
               mergedOrders = _context6.sent;
               memoryOrders = mergedOrders.map(function (order) {
-                return _this6.normalizeOrderForMemoryList(order);
+                return _this7.normalizeOrderForMemoryList(order);
               });
               this.logInfo('loadOrdersByServer-结束', {
                 count: memoryOrders.length
@@ -753,10 +765,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrdersByResourceId",
     value: function getOrdersByResourceId(resourceId) {
-      var _this7 = this;
+      var _this8 = this;
       var ids = this.resourceIdIndex.get(String(resourceId)) || [];
       return ids.map(function (id) {
-        return _this7.store.map.get(id);
+        return _this8.store.map.get(id);
       }).filter(function (order) {
         return !!order;
       });
@@ -784,7 +796,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "overwriteExistingOrder",
     value: (function () {
       var _overwriteExistingOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(fresh) {
-        var _this8 = this;
+        var _this9 = this;
         var orderId, key;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
@@ -818,7 +830,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.store.list = this.store.list.map(function (order) {
                 var id = order === null || order === void 0 ? void 0 : order.order_id;
                 if (id === undefined || id === null) return order;
-                return _this8.getIdKey(id) === key ? fresh : order;
+                return _this9.getIdKey(id) === key ? fresh : order;
               });
               this.syncOrdersMap();
               _context8.next = 13;
@@ -884,7 +896,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "markOrderSyncedByExternalSaleNumber",
     value: function () {
       var _markOrderSyncedByExternalSaleNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        var _this9 = this,
+        var _this10 = this,
           _existing$external_sa,
           _nextOrder$order_id;
         var externalSaleNumber, key, targetIndex, existing, nextOrder, storageKey;
@@ -905,7 +917,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               targetIndex = this.store.list.findIndex(function (order) {
                 var value = order === null || order === void 0 ? void 0 : order.external_sale_number;
                 if (value === undefined || value === null || value === '') return false;
-                return _this9.getIdKey(value) === key;
+                return _this10.getIdKey(value) === key;
               });
               if (!(targetIndex < 0)) {
                 _context10.next = 9;
@@ -1162,7 +1174,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncOrdersMap",
     value: function syncOrdersMap() {
-      var _this10 = this;
+      var _this11 = this;
       this.store.map.clear();
       this.resourceIdIndex.clear();
       var _iterator7 = _createForOfIteratorHelper(this.store.list),
@@ -1170,22 +1182,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       try {
         var _loop = function _loop() {
           var order = _step7.value;
-          var primaryIdentity = _this10.getOrderMapKey(order);
+          var primaryIdentity = _this11.getOrderMapKey(order);
           if (!primaryIdentity) return 1; // continue
-          _this10.store.map.set(primaryIdentity, order);
-          var resourceIds = _this10.extractResourceIds(order);
+          _this11.store.map.set(primaryIdentity, order);
+          var resourceIds = _this11.extractResourceIds(order);
           var _iterator8 = _createForOfIteratorHelper(resourceIds),
             _step8;
           try {
             for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
               var resourceId = _step8.value;
               var key = String(resourceId);
-              var existing = _this10.resourceIdIndex.get(key) || [];
+              var existing = _this11.resourceIdIndex.get(key) || [];
               if (existing.some(function (eid) {
-                return _this10.getIdKey(eid) === primaryIdentity;
+                return _this11.getIdKey(eid) === primaryIdentity;
               })) continue;
               existing.push(primaryIdentity);
-              _this10.resourceIdIndex.set(key, existing);
+              _this11.resourceIdIndex.set(key, existing);
             }
           } catch (err) {
             _iterator8.e(err);
@@ -1223,7 +1235,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentityEntries",
     value: function getOrderIdentityEntries(order) {
-      var _this11 = this;
+      var _this12 = this;
       if (!order) return [];
       var record = order;
       var candidates = [{
@@ -1242,8 +1254,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var entries = [];
       var _loop2 = function _loop2() {
           var candidate = _candidates[_i];
-          if (_this11.isBlankIdentityValue(candidate.value)) return 0; // continue
-          var key = _this11.getIdKey(candidate.value);
+          if (_this12.isBlankIdentityValue(candidate.value)) return 0; // continue
+          var key = _this12.getIdKey(candidate.value);
           if (entries.some(function (entry) {
             return entry.field === candidate.field && entry.key === key;
           })) return 0; // continue
@@ -1329,7 +1341,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setupOrderSync",
     value: function setupOrderSync() {
-      var _this12 = this;
+      var _this13 = this;
       if (!this.orderDataSource) return;
       this.orderDataSource.run({
         pubsub: {
@@ -1337,22 +1349,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             var _message$id, _message$order_id, _message$type;
             console.log('orderDataSource', res);
             var pubsubReceivedAt = Date.now();
-            var message = _this12.normalizeOrderSyncMessage(res);
+            var message = _this13.normalizeOrderSyncMessage(res);
             if (!message) return;
             message._pubsubReceivedAt = pubsubReceivedAt;
-            _this12.pendingSyncMessages.push(message);
-            var throttleMs = _this12.getOrderSyncThrottleMs();
-            var routeInfo = _this12.resolveSyncMessageRoute(message);
-            _this12.logInfo('orderSync-收到消息并入队', {
+            _this13.pendingSyncMessages.push(message);
+            var throttleMs = _this13.getOrderSyncThrottleMs();
+            var routeInfo = _this13.resolveSyncMessageRoute(message);
+            _this13.logInfo('orderSync-收到消息并入队', {
               id: (_message$id = message.id) !== null && _message$id !== void 0 ? _message$id : null,
               order_id: (_message$order_id = message.order_id) !== null && _message$order_id !== void 0 ? _message$order_id : null,
               type: (_message$type = message.type) !== null && _message$type !== void 0 ? _message$type : null,
-              pendingCount: _this12.pendingSyncMessages.length,
+              pendingCount: _this13.pendingSyncMessages.length,
               throttleMs: throttleMs,
               pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString(),
               fullMessage: JSON.stringify(message)
             });
-            _this12.scheduleOrderSyncThrottle();
+            _this13.scheduleOrderSyncThrottle();
           }
         }
       }).catch(function () {
@@ -1369,7 +1381,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scheduleOrderSyncThrottle",
     value: function scheduleOrderSyncThrottle() {
-      var _this13 = this;
+      var _this14 = this;
       if (this.isProcessingSyncBatch) return;
       if (this.isIdlePhase) {
         this.isIdlePhase = false;
@@ -1380,8 +1392,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (this.syncTimer) return;
       var throttleMs = this.getOrderSyncThrottleMs();
       this.syncTimer = setTimeout(function () {
-        _this13.syncTimer = undefined;
-        void _this13.flushOrderSyncMessagesByThrottle();
+        _this14.syncTimer = undefined;
+        void _this14.flushOrderSyncMessagesByThrottle();
       }, throttleMs);
     }
 
@@ -1449,7 +1461,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "processOrderSyncMessages",
     value: (function () {
       var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-        var _this14 = this;
+        var _this15 = this;
         var messages, batchProcessStartAt, earliestReceivedAt, upsertOrders, refreshIds, uniqueRefreshIds, upsertList, _this$filterRedundant, toFetch, skipped, freshOrders, batchProcessEndAt;
         return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
@@ -1476,13 +1488,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               upsertOrders = new Map();
               refreshIds = [];
               messages.forEach(function (msg, msgIndex) {
-                var routeInfo = _this14.resolveSyncMessageRoute(msg);
+                var routeInfo = _this15.resolveSyncMessageRoute(msg);
                 var hasBatchIds = routeInfo.hasBatchIds;
                 var singleId = routeInfo.singleId;
                 var hasSingleId = routeInfo.hasSingleId;
-                var normalizedBody = _this14.normalizeOrderSyncPayload(msg.body || msg.data);
+                var normalizedBody = _this15.normalizeOrderSyncPayload(msg.body || msg.data);
                 if (routeInfo.route === 'bodyUpsert' && normalizedBody) {
-                  upsertOrders.set(_this14.getIdKey(normalizedBody.order_id), normalizedBody);
+                  upsertOrders.set(_this15.getIdKey(normalizedBody.order_id), normalizedBody);
                   return;
                 }
                 if (hasBatchIds) refreshIds.push.apply(refreshIds, _toConsumableArray(routeInfo.batchIds));else if (routeInfo.route === 'httpRefresh.singleId' && singleId !== null) refreshIds.push(singleId);else if (routeInfo.route === 'httpRefresh.relationIds') refreshIds.push.apply(refreshIds, _toConsumableArray(routeInfo.batchIds));
@@ -1797,12 +1809,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isOrderLookupMatch",
     value: function isOrderLookupMatch(order, lookupKey) {
-      var _this15 = this;
+      var _this16 = this;
       if (!order || !lookupKey) return false;
       var candidates = [order.order_id, order.external_sale_number, order.order_number, order.shop_order_number, order.shop_full_order_number];
       return candidates.some(function (value) {
         if (value === undefined || value === null || value === '') return false;
-        return _this15.getIdKey(value) === lookupKey;
+        return _this16.getIdKey(value) === lookupKey;
       });
     }
 
@@ -1845,10 +1857,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findOrderIndexByIdentity",
     value: function findOrderIndexByIdentity(orders, target) {
-      var _this16 = this;
+      var _this17 = this;
       if (this.getOrderIdentityMatchKeys(target).length === 0) return -1;
       return orders.findIndex(function (order) {
-        return _this16.doOrdersShareIdentity(order, target);
+        return _this17.doOrdersShareIdentity(order, target);
       });
     }
   }, {
@@ -2137,9 +2149,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "mergeRemoteSnapshotWithPendingOrders",
     value: function mergeRemoteSnapshotWithPendingOrders(remoteOrders, existingOrders) {
-      var _this17 = this;
+      var _this18 = this;
       var merged = remoteOrders.map(function (order) {
-        return _this17.normalizeRemoteSyncedOrder(order);
+        return _this18.normalizeRemoteSyncedOrder(order);
       });
       var _iterator16 = _createForOfIteratorHelper(existingOrders),
         _step16;
@@ -2208,7 +2220,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "patchOrdersInSQLite",
     value: (function () {
       var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(orders, source) {
-        var _this18 = this;
+        var _this19 = this;
         var mergeActions,
           ordersSnapshot,
           _this$filterRedundant2,
@@ -2227,7 +2239,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context20.abrupt("return");
             case 3:
               ordersSnapshot = cloneDeep(orders).filter(function (order) {
-                return _this18.getOrderStorageKey(order);
+                return _this19.getOrderStorageKey(order);
               });
               if (!(ordersSnapshot.length === 0)) {
                 _context20.next = 6;
@@ -2257,34 +2269,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   while (1) switch (_context19.prev = _context19.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this18.logInfo('patchOrdersInSQLite-开始', {
+                      _this19.logInfo('patchOrdersInSQLite-开始', {
                         source: source,
                         count: compactedToWrite.length,
                         dedupedCount: skipped.length
                       });
-                      if (!(typeof _this18.dbManager.bulkUpdate === 'function')) {
+                      if (!(typeof _this19.dbManager.bulkUpdate === 'function')) {
                         _context19.next = 8;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
                       _context19.next = 6;
-                      return _this18.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
+                      return _this19.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
                     case 6:
                       _context19.next = 33;
                       break;
                     case 8:
-                      if (!(typeof _this18.dbManager.bulkAdd === 'function')) {
+                      if (!(typeof _this19.dbManager.bulkAdd === 'function')) {
                         _context19.next = 14;
                         break;
                       }
                       writeMethod = 'bulkAdd';
                       _context19.next = 12;
-                      return _this18.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
+                      return _this19.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
                     case 12:
                       _context19.next = 33;
                       break;
                     case 14:
-                      if (!(typeof _this18.dbManager.update === 'function')) {
+                      if (!(typeof _this19.dbManager.update === 'function')) {
                         _context19.next = 33;
                         break;
                       }
@@ -2299,7 +2311,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       order = _step17.value;
                       _context19.next = 23;
-                      return _this18.dbManager.update(INDEXDB_STORE_NAME, order);
+                      return _this19.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
                       _context19.next = 19;
                       break;
@@ -2315,8 +2327,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       _iterator17.f();
                       return _context19.finish(30);
                     case 33:
-                      _this18.recordRecentSqliteWrite(source, compactedToWrite);
-                      _this18.logInfo('patchOrdersInSQLite-完成', {
+                      _this19.recordRecentSqliteWrite(source, compactedToWrite);
+                      _this19.logInfo('patchOrdersInSQLite-完成', {
                         source: source,
                         count: compactedToWrite.length,
                         writeMethod: writeMethod,
@@ -2360,7 +2372,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderInSQLite",
     value: (function () {
       var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(order, source) {
-        var _this19 = this;
+        var _this20 = this;
         var orderSnapshot, _orderSnapshot$order_3;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
@@ -2381,43 +2393,43 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   while (1) switch (_context21.prev = _context21.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this19.logInfo('updateOrderInSQLite-开始', {
+                      _this20.logInfo('updateOrderInSQLite-开始', {
                         source: source,
                         orderId: (_orderSnapshot$order_ = orderSnapshot.order_id) !== null && _orderSnapshot$order_ !== void 0 ? _orderSnapshot$order_ : null,
-                        storageKey: _this19.getOrderStorageKey(orderSnapshot)
+                        storageKey: _this20.getOrderStorageKey(orderSnapshot)
                       });
-                      if (!(typeof _this19.dbManager.update === 'function')) {
+                      if (!(typeof _this20.dbManager.update === 'function')) {
                         _context21.next = 8;
                         break;
                       }
                       writeMethod = 'update';
                       _context21.next = 6;
-                      return _this19.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
+                      return _this20.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
                     case 6:
                       _context21.next = 18;
                       break;
                     case 8:
-                      if (!(typeof _this19.dbManager.bulkUpdate === 'function')) {
+                      if (!(typeof _this20.dbManager.bulkUpdate === 'function')) {
                         _context21.next = 14;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
                       _context21.next = 12;
-                      return _this19.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      return _this20.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 12:
                       _context21.next = 18;
                       break;
                     case 14:
-                      if (!(typeof _this19.dbManager.bulkAdd === 'function')) {
+                      if (!(typeof _this20.dbManager.bulkAdd === 'function')) {
                         _context21.next = 18;
                         break;
                       }
                       writeMethod = 'bulkAdd';
                       _context21.next = 18;
-                      return _this19.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      return _this20.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 18:
-                      _this19.recordRecentSqliteWrite(source, [orderSnapshot]);
-                      _this19.logInfo('updateOrderInSQLite-完成', {
+                      _this20.recordRecentSqliteWrite(source, [orderSnapshot]);
+                      _this20.logInfo('updateOrderInSQLite-完成', {
                         source: source,
                         orderId: (_orderSnapshot$order_2 = orderSnapshot.order_id) !== null && _orderSnapshot$order_2 !== void 0 ? _orderSnapshot$order_2 : null,
                         writeMethod: writeMethod
@@ -2460,7 +2472,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "replaceOrdersSnapshotInSQLite",
     value: (function () {
       var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(orderList, source) {
-        var _this20 = this;
+        var _this21 = this;
         var remoteSnapshot, mergedSnapshot;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
@@ -2470,12 +2482,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               return _context24.abrupt("return", this.compactOrderListByIdentity(orderList.map(function (order) {
-                return _this20.normalizeRemoteSyncedOrder(order);
+                return _this21.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".snapshotNoDb")).list);
             case 2:
               remoteSnapshot = cloneDeep(orderList);
               mergedSnapshot = this.compactOrderListByIdentity(remoteSnapshot.map(function (order) {
-                return _this20.normalizeRemoteSyncedOrder(order);
+                return _this21.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".remoteSnapshot")).list;
               _context24.prev = 4;
               _context24.next = 7;
@@ -2484,12 +2496,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return _regeneratorRuntime().wrap(function _callee23$(_context23) {
                   while (1) switch (_context23.prev = _context23.next) {
                     case 0:
-                      if (!(typeof _this20.dbManager.getAll === 'function')) {
+                      if (!(typeof _this21.dbManager.getAll === 'function')) {
                         _context23.next = 6;
                         break;
                       }
                       _context23.next = 3;
-                      return _this20.dbManager.getAll(INDEXDB_STORE_NAME);
+                      return _this21.dbManager.getAll(INDEXDB_STORE_NAME);
                     case 3:
                       _context23.t0 = _context23.sent;
                       _context23.next = 7;
@@ -2498,18 +2510,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       _context23.t0 = [];
                     case 7:
                       existingOrders = _context23.t0;
-                      orderListSnapshot = _this20.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, existingOrders || []);
-                      mergedSnapshot = _this20.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
-                      _this20.logInfo('replaceOrdersSnapshotInSQLite-开始', {
+                      orderListSnapshot = _this21.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, existingOrders || []);
+                      mergedSnapshot = _this21.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
+                      _this21.logInfo('replaceOrdersSnapshotInSQLite-开始', {
                         source: source,
                         count: mergedSnapshot.length,
                         remoteCount: remoteSnapshot.length,
                         preservedPendingCount: mergedSnapshot.length - remoteSnapshot.length
                       });
                       _context23.next = 13;
-                      return _this20.dbManager.clear(INDEXDB_STORE_NAME);
+                      return _this21.dbManager.clear(INDEXDB_STORE_NAME);
                     case 13:
-                      _this20.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
+                      _this21.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
                         count: mergedSnapshot.length
                       });
                       if (!(mergedSnapshot.length === 0)) {
@@ -2519,10 +2531,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       return _context23.abrupt("return");
                     case 16:
                       _context23.next = 18;
-                      return _this20.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
+                      return _this21.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
                     case 18:
-                      _this20.recordRecentSqliteWrite(source, mergedSnapshot);
-                      _this20.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
+                      _this21.recordRecentSqliteWrite(source, mergedSnapshot);
+                      _this21.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
                         source: source,
                         count: mergedSnapshot.length
                       });
@@ -2566,7 +2578,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "clear",
     value: (function () {
       var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
-        var _this21 = this;
+        var _this22 = this;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -2583,7 +2595,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   while (1) switch (_context25.prev = _context25.next) {
                     case 0:
                       _context25.next = 2;
-                      return _this21.dbManager.clear(INDEXDB_STORE_NAME);
+                      return _this22.dbManager.clear(INDEXDB_STORE_NAME);
                     case 2:
                     case "end":
                       return _context25.stop();

package/dist/solution/BaseSales/index.js

@@ -2719,7 +2719,6 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               params = {
                 product_id: identity.product_id,
                 product_variant_id: identity.product_variant_id,
-                // TODO: 改成对象
                 updates: {
                   note: String(note || '')
                 }

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/modules/Order/index.d.ts

@@ -372,6 +372,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     private markLocalOrderSynced;
+    private applyRemoteOrderNumbersToTempOrder;
     private isSubmitResponseRejected;
     private isLocalPendingSubmitResult;
     private isSubmitErrorResponse;

package/lib/modules/Order/index.js

@@ -2761,7 +2761,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const enhancedPayload = (params == null ? void 0 : params.enhancePayload) ? params.enhancePayload(nextPayload, ctx) : nextPayload;
       return enhancedPayload;
     } : void 0;
-    debugger;
     const payload = (0, import_utils.buildSubmitPayload)({
       tempOrder,
       cacheId: effectiveCacheId,
@@ -2829,11 +2828,23 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async markLocalOrderSynced(orderId, remoteOrder) {
     const tempOrder = this.ensureTempOrder();
     tempOrder.order_id = orderId;
+    this.applyRemoteOrderNumbersToTempOrder(tempOrder, remoteOrder);
     this.store.lastOrderInfo = remoteOrder;
     this.store.syncState = "submitted";
     this.persistTempOrder();
     await this.saveDraft();
   }
+  applyRemoteOrderNumbersToTempOrder(tempOrder, remoteOrder) {
+    const applyOrderNumber = (key) => {
+      const value = remoteOrder == null ? void 0 : remoteOrder[key];
+      if (value !== void 0 && value !== null && value !== "") {
+        tempOrder[key] = String(value);
+      }
+    };
+    applyOrderNumber("order_number");
+    applyOrderNumber("shop_order_number");
+    applyOrderNumber("shop_full_order_number");
+  }
   isSubmitResponseRejected(response) {
     const isErrorCode = (response == null ? void 0 : response.code) !== void 0 && response.code !== 200 && response.code !== "200";
     const isErrorStatus = (response == null ? void 0 : response.status) === false || typeof (response == null ? void 0 : response.status) === "number" && response.status >= 400;

package/lib/server/index.js

@@ -2373,6 +2373,17 @@ var Server = class {
     const shouldClearLocalOrderId = this.isLocalCheckoutOrderId(next.order_id);
     if (shouldClearLocalOrderId)
       next.order_id = null;
+    const hasCheckoutOrderNumbers = !this.isBlankCheckoutValue(next.shop_order_number) && !this.isBlankCheckoutValue(next.shop_full_order_number);
+    if (hasCheckoutOrderNumbers) {
+      this.logInfo(`${title}: checkout 已携带订单号，跳过查重`, {
+        original_order_id: data.order_id,
+        order_id: next.order_id,
+        external_sale_number: externalSaleNumber,
+        shop_order_number: next.shop_order_number,
+        shop_full_order_number: next.shop_full_order_number
+      });
+      return next;
+    }
     if (this.isBlankCheckoutValue(externalSaleNumber)) {
       if (shouldClearLocalOrderId) {
         this.logInfo(`${title}: checkout 本地订单号已清理`, {
@@ -2382,7 +2393,7 @@ var Server = class {
       }
       return next;
     }
-    if (!this.order || typeof this.order.getLocalOrderByLookup !== "function") {
+    if (!this.order || typeof this.order.getLocalOrderFromMemoryByLookup !== "function") {
       if (shouldClearLocalOrderId) {
         this.logInfo(`${title}: checkout 本地订单号已清理`, {
           original_order_id: data.order_id,
@@ -2392,7 +2403,7 @@ var Server = class {
       return next;
     }
     try {
-      const localOrder = await this.order.getLocalOrderByLookup(externalSaleNumber);
+      const localOrder = this.order.getLocalOrderFromMemoryByLookup(externalSaleNumber);
       if (!localOrder) {
         if (shouldClearLocalOrderId) {
           this.logInfo(`${title}: checkout 本地订单号已清理`, {

package/lib/server/modules/order/index.d.ts

@@ -79,6 +79,7 @@ export declare class OrderModule extends BaseModule implements Module {
     getOrderById(id: OrderId): OrderData | undefined;
     /** 按 order_id 查询内存订单。 */
     getOrderByOrderId(orderId: OrderId): OrderData | undefined;
+    getLocalOrderFromMemoryByLookup(lookup: OrderId): OrderData | null;
     getLocalOrderByLookup(lookup: OrderId): Promise<OrderData | null>;
     loadOrdersByServer(): Promise<OrderData[]>;
     /**

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

@@ -379,6 +379,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   getOrderByOrderId(orderId) {
     return this.store.map.get(this.getIdKey(orderId));
   }
+  getLocalOrderFromMemoryByLookup(lookup) {
+    const key = this.getIdKey(lookup);
+    const memoryOrderById = this.store.map.get(key);
+    if (memoryOrderById)
+      return memoryOrderById;
+    const memoryOrder = this.store.list.find((order) => this.isOrderLookupMatch(order, key));
+    return memoryOrder || null;
+  }
   async getLocalOrderByLookup(lookup) {
     const key = this.getIdKey(lookup);
     const memoryOrderById = this.store.map.get(key);

package/lib/solution/BaseSales/index.js

@@ -1721,7 +1721,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const params = {
         product_id: identity.product_id,
         product_variant_id: identity.product_variant_id,
-        // TODO: 改成对象
         updates: { note: String(note || "") }
       };
       if (identity.unique_identification_number !== void 0) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.228",
+  "version": "2.2.230",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",