@pisell/pisellos 2.2.153 → 2.2.154

package/dist/modules/Order/index.js

@@ -54,6 +54,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     _defineProperty(_assertThisInitialized(_this), "salesSummaryModuleName", void 0);
     _defineProperty(_assertThisInitialized(_this), "rulesHooksOverride", void 0);
+    _defineProperty(_assertThisInitialized(_this), "orderHooks", void 0);
     _defineProperty(_assertThisInitialized(_this), "otherParams", void 0);
     return _this;
   }
@@ -61,7 +62,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
-        var _otherParams$rules;
+        var _otherParams$rules, _otherParams$order, _otherParams$hooks;
         var appPlugin, app, otherParams;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -90,11 +91,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.cacheId = otherParams.cacheId;
               this.salesSummaryModuleName = otherParams.salesSummaryModuleName;
               this.rulesHooksOverride = (_otherParams$rules = otherParams.rules) === null || _otherParams$rules === void 0 ? void 0 : _otherParams$rules.hooks;
+              this.orderHooks = options.hooks || ((_otherParams$order = otherParams.order) === null || _otherParams$order === void 0 ? void 0 : _otherParams$order.hooks) || ((_otherParams$hooks = otherParams.hooks) === null || _otherParams$hooks === void 0 ? void 0 : _otherParams$hooks.order);
               this.otherParams = otherParams;
               this.registerDiscountModules(options);
               this.restoreTempOrderFromStorage();
               this.logInfo('OrderModule initialized successfully');
-            case 20:
+            case 21:
             case "end":
               return _context.stop();
           }
@@ -1348,16 +1350,60 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       this.persistTempOrder();
       return tempOrder.payments;
     }
-
-    // ─── TempOrder: 商品 CRUD ───
   }, {
-    key: "addProductToOrder",
+    key: "shouldMergeProductToOrder",
     value: function () {
-      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(product, booking) {
-        var _this3 = this;
-        var tempOrder, linked, productToAdd, incomingFingerprint, normalizedIncoming, hasIncomingGoodPass, shouldForceNewLine, matchedIndex, _targetProduct$metada, targetProduct, targetUid, normalizedProduct;
+      var _shouldMergeProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(params) {
+        var _this$orderHooks;
+        var onBeforeMergeProductToOrder, result;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
+            case 0:
+              onBeforeMergeProductToOrder = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.onBeforeMergeProductToOrder;
+              if (onBeforeMergeProductToOrder) {
+                _context12.next = 3;
+                break;
+              }
+              return _context12.abrupt("return", true);
+            case 3:
+              _context12.next = 5;
+              return onBeforeMergeProductToOrder(_objectSpread(_objectSpread({}, params), {}, {
+                defaultShouldMerge: true
+              }));
+            case 5:
+              result = _context12.sent;
+              if (!(typeof result === 'boolean')) {
+                _context12.next = 8;
+                break;
+              }
+              return _context12.abrupt("return", result);
+            case 8:
+              if (!(result && _typeof(result) === 'object' && typeof result.shouldMerge === 'boolean')) {
+                _context12.next = 10;
+                break;
+              }
+              return _context12.abrupt("return", result.shouldMerge);
+            case 10:
+              return _context12.abrupt("return", true);
+            case 11:
+            case "end":
+              return _context12.stop();
+          }
+        }, _callee12, this);
+      }));
+      function shouldMergeProductToOrder(_x11) {
+        return _shouldMergeProductToOrder.apply(this, arguments);
+      }
+      return shouldMergeProductToOrder;
+    }() // ─── TempOrder: 商品 CRUD ───
+  }, {
+    key: "addProductToOrder",
+    value: function () {
+      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(product, booking) {
+        var _this3 = this;
+        var tempOrder, linked, productToAdd, incomingFingerprint, normalizedIncoming, hasIncomingGoodPass, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct;
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               linked = booking ? this.createLinkedProductAndBooking({
@@ -1376,7 +1422,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 var existedFingerprint = buildProductLineFingerprint(item.product_option_item, item.product_bundle);
                 return existedFingerprint === incomingFingerprint;
               });
-              if (matchedIndex === -1) {
+              matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
+              existedFingerprint = matchedProduct ? buildProductLineFingerprint(matchedProduct.product_option_item, matchedProduct.product_bundle) : '';
+              if (!matchedProduct) {
+                _context13.next = 16;
+                break;
+              }
+              _context13.next = 13;
+              return this.shouldMergeProductToOrder({
+                incomingProduct: productToAdd,
+                normalizedIncoming: normalizedIncoming,
+                matchedProduct: matchedProduct,
+                matchedIndex: matchedIndex,
+                incomingFingerprint: incomingFingerprint,
+                existedFingerprint: existedFingerprint,
+                tempOrder: tempOrder,
+                booking: booking
+              });
+            case 13:
+              _context13.t0 = _context13.sent;
+              _context13.next = 17;
+              break;
+            case 16:
+              _context13.t0 = false;
+            case 17:
+              shouldMerge = _context13.t0;
+              if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
                 this.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
                 if (linked) {
                   normalizedIncoming.booking_uid = linked.bookingUid;
@@ -1386,7 +1457,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
                 tempOrder.products.push(normalizedIncoming);
               } else {
-                targetProduct = tempOrder.products[matchedIndex];
+                targetProduct = matchedProduct;
                 targetUid = (_targetProduct$metada = targetProduct.metadata) === null || _targetProduct$metada === void 0 ? void 0 : _targetProduct$metada.unique_identification_number;
                 normalizedProduct = normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
                   metadata: _objectSpread(_objectSpread({}, productToAdd.metadata || {}), {}, {
@@ -1407,20 +1478,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
               }
               this.applyDiscount();
-              _context12.next = 13;
+              _context13.next = 23;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 13:
+            case 23:
               this.persistTempOrder();
-              return _context12.abrupt("return", tempOrder.products);
-            case 15:
+              return _context13.abrupt("return", tempOrder.products);
+            case 25:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
-      function addProductToOrder(_x11, _x12) {
+      function addProductToOrder(_x12, _x13) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -1447,11 +1518,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateProductInOrder",
     value: function () {
-      var _updateProductInOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(params) {
+      var _updateProductInOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(params) {
         var _targetProduct$metada2, _metadata, _metadata2, _metadata3, _tempOrder$products$p;
         var product_id, product_variant_id, updates, unique_identification_number, product_option_item, product_bundle, tempOrder, identityLookup, productIndex, targetProduct, nextProduct, callerUpdatesTopPrice, callerUpdatesMainMeta, existedMeta;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               product_id = params.product_id, product_variant_id = params.product_variant_id, updates = params.updates, unique_identification_number = params.unique_identification_number, product_option_item = params.product_option_item, product_bundle = params.product_bundle;
               tempOrder = this.ensureTempOrder();
@@ -1466,7 +1537,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (product_bundle !== undefined) identityLookup.product_bundle = product_bundle;
               productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               if (!(productIndex === -1)) {
-                _context13.next = 9;
+                _context14.next = 9;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新');
@@ -1501,20 +1572,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.products[productIndex] = normalizeOrderProduct(nextProduct);
               this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], (_tempOrder$products$p = tempOrder.products[productIndex].metadata) === null || _tempOrder$products$p === void 0 ? void 0 : _tempOrder$products$p.unique_identification_number);
               this.applyDiscount();
-              _context13.next = 20;
+              _context14.next = 20;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 20:
               this.persistTempOrder();
-              return _context13.abrupt("return", tempOrder.products);
+              return _context14.abrupt("return", tempOrder.products);
             case 22:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
-      function updateProductInOrder(_x13) {
+      function updateProductInOrder(_x14) {
         return _updateProductInOrder.apply(this, arguments);
       }
       return updateProductInOrder;
@@ -1522,30 +1593,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductFromOrder",
     value: function () {
-      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(identity) {
+      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(identity) {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.products = tempOrder.products.filter(function (item) {
                 return !isIdentityMatch(item, identity);
               });
               this.applyDiscount();
-              _context14.next = 5;
+              _context15.next = 5;
               return this.recalculateSummary({
                 createIfMissing: true
               });
             case 5:
               this.persistTempOrder();
-              return _context14.abrupt("return", tempOrder.products);
+              return _context15.abrupt("return", tempOrder.products);
             case 7:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee14, this);
+        }, _callee15, this);
       }));
-      function removeProductFromOrder(_x14) {
+      function removeProductFromOrder(_x15) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -1559,11 +1630,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTempOrder",
     value: function () {
-      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(params) {
+      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(params) {
         var _params$cacheId, _this$otherParams;
         var tempOrder, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.persistTempOrder();
@@ -1590,10 +1661,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 type: params === null || params === void 0 ? void 0 : params.type,
                 enhance: enhancePayload
               });
-              _context15.next = 10;
+              _context16.next = 10;
               return this.saveDraft();
             case 10:
-              _context15.prev = 10;
+              _context16.prev = 10;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -1601,62 +1672,62 @@ 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
               });
-              _context15.next = 14;
+              _context16.next = 14;
               return this.submitSalesOrder({
                 query: payload
               });
             case 14:
-              result = _context15.sent;
-              _context15.next = 27;
+              result = _context16.sent;
+              _context16.next = 27;
               break;
             case 17:
-              _context15.prev = 17;
-              _context15.t0 = _context15["catch"](10);
-              backendErrorResponse = this.extractSubmitErrorResponse(_context15.t0);
+              _context16.prev = 17;
+              _context16.t0 = _context16["catch"](10);
+              backendErrorResponse = this.extractSubmitErrorResponse(_context16.t0);
               if (!backendErrorResponse) {
-                _context15.next = 24;
+                _context16.next = 24;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
-              return _context15.abrupt("return", backendErrorResponse);
+              return _context16.abrupt("return", backendErrorResponse);
             case 24:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
-                error: _context15.t0 instanceof Error ? _context15.t0.message : String(_context15.t0),
+                error: _context16.t0 instanceof Error ? _context16.t0.message : String(_context16.t0),
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
                 paymentStatus: payload.payment_status,
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
-              throw _context15.t0;
+              throw _context16.t0;
             case 27:
               if (!this.isSubmitResponseRejected(result)) {
-                _context15.next = 31;
+                _context16.next = 31;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
-              return _context15.abrupt("return", result);
+              return _context16.abrupt("return", result);
             case 31:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context15.next = 37;
+                _context16.next = 37;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context15.next = 37;
+              _context16.next = 37;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
             case 37:
-              return _context15.abrupt("return", result);
+              return _context16.abrupt("return", result);
             case 38:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15, this, [[10, 17]]);
+        }, _callee16, this, [[10, 17]]);
       }));
-      function submitTempOrder(_x15) {
+      function submitTempOrder(_x16) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -1664,25 +1735,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "markLocalOrderSynced",
     value: function () {
-      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(orderId, remoteOrder) {
+      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(orderId, remoteOrder) {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.order_id = orderId;
               this.store.lastOrderInfo = remoteOrder;
               this.store.syncState = 'submitted';
               this.persistTempOrder();
-              _context16.next = 7;
+              _context17.next = 7;
               return this.saveDraft();
             case 7:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16, this);
+        }, _callee17, this);
       }));
-      function markLocalOrderSynced(_x16, _x17) {
+      function markLocalOrderSynced(_x17, _x18) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -1729,49 +1800,49 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncPaymentsToOrder",
     value: function () {
-      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
+      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
         var tempOrder, mappedPayments, paymentTotal, targetAmount, isFullyPaid, submitResult;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               mappedPayments = mapPaymentItemsToOrderPayments(params.payments || []);
               tempOrder.payments = mappedPayments;
               if (params.paymentStatus) tempOrder.payment_status = params.paymentStatus;
               this.persistTempOrder();
-              _context17.next = 7;
+              _context18.next = 7;
               return this.saveDraft();
             case 7:
               paymentTotal = this.calculatePaymentTotal(mappedPayments);
               targetAmount = this.getPaymentTargetAmount();
               isFullyPaid = targetAmount.lte(0) ? false : paymentTotal.gte(targetAmount);
               if (!(!isFullyPaid || !params.submitWhenPaid)) {
-                _context17.next = 12;
+                _context18.next = 12;
                 break;
               }
-              return _context17.abrupt("return", {
+              return _context18.abrupt("return", {
                 isFullyPaid: isFullyPaid
               });
             case 12:
-              _context17.next = 14;
+              _context18.next = 14;
               return this.submitTempOrder({
                 payments: mappedPayments,
                 paymentStatus: params.paymentStatus || 'paid',
                 smallTicketDataFlag: params.smallTicketDataFlag
               });
             case 14:
-              submitResult = _context17.sent;
-              return _context17.abrupt("return", {
+              submitResult = _context18.sent;
+              return _context18.abrupt("return", {
                 isFullyPaid: isFullyPaid,
                 submitResult: submitResult
               });
             case 16:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee17, this);
+        }, _callee18, this);
       }));
-      function syncPaymentsToOrder(_x18) {
+      function syncPaymentsToOrder(_x19) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -1860,11 +1931,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(order) {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(order) {
         var _order$query$cartItem, _params$bookings, _params$relation_prod;
         var url, query, fetchUrl, params;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               this.logInfo('submitOrder called', {
                 url: order.url,
@@ -1884,14 +1955,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 relationProductsCount: ((_params$relation_prod = params.relation_products) === null || _params$relation_prod === void 0 ? void 0 : _params$relation_prod.length) || 0,
                 scheduleDate: params.schedule_date
               });
-              return _context18.abrupt("return", this.request.post(fetchUrl, params));
+              return _context19.abrupt("return", this.request.post(fetchUrl, params));
             case 6:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
-        }, _callee18, this);
+        }, _callee19, this);
       }));
-      function submitOrder(_x19) {
+      function submitOrder(_x20) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -1899,13 +1970,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "cancelOrder",
     value: function () {
-      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(params) {
+      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
         var payload;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               if (!(!Array.isArray(params.order_ids) || params.order_ids.length === 0)) {
-                _context19.next = 2;
+                _context20.next = 2;
                 break;
               }
               throw new Error('取消订单失败：order_ids 不能为空');
@@ -1921,16 +1992,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 method: 'PUT',
                 orderIdsCount: params.order_ids.length
               });
-              return _context19.abrupt("return", this.request.put('/order/update-status', payload, {
+              return _context20.abrupt("return", this.request.put('/order/update-status', payload, {
                 isShopApi: true
               }));
             case 5:
             case "end":
-              return _context19.stop();
+              return _context20.stop();
           }
-        }, _callee19, this);
+        }, _callee20, this);
       }));
-      function cancelOrder(_x20) {
+      function cancelOrder(_x21) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -1938,19 +2009,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "changeBookingStatus",
     value: function () {
-      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
+      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
         var url, payload;
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               if (params.booking_id) {
-                _context20.next = 2;
+                _context21.next = 2;
                 break;
               }
               throw new Error('变更预约状态失败：booking_id 不能为空');
             case 2:
               if (params.appointment_status) {
-                _context20.next = 4;
+                _context21.next = 4;
                 break;
               }
               throw new Error('变更预约状态失败：appointment_status 不能为空');
@@ -1965,16 +2036,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 bookingId: params.booking_id,
                 appointmentStatus: params.appointment_status
               });
-              return _context20.abrupt("return", this.request.put(url, payload, {
+              return _context21.abrupt("return", this.request.put(url, payload, {
                 isShopApi: true
               }));
             case 8:
             case "end":
-              return _context20.stop();
+              return _context21.stop();
           }
-        }, _callee20, this);
+        }, _callee21, this);
       }));
-      function changeBookingStatus(_x21) {
+      function changeBookingStatus(_x22) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -1992,11 +2063,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrderByCheckout",
     value: (function () {
-      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
+      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
         var _params$payments, _params$bookings2, _params$relation_prod2, _params$payments2, _params$payments3, _params$bookings3, _params$relation_prod3, _params$payments4;
         var onlineStorePaymentCodeList, _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _orderData$bookings2, _orderData$relation_p2, _orderData$payments4, _orderData$payments5, _response$data, orderData, response;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               // 过滤掉由在线店铺下单的 payment 支付数据
               onlineStorePaymentCodeList = ['WXPAY', 'WECHAT', 'ALIPAY', 'APPLE_PAY', 'CREDIT_CARD_3DS', 'CREDIT_CARD_TOKEN', 'GOOGLE_PAY', 'GOOGLE_PAY_3DS', 'CREDIT_CARD'];
@@ -2030,7 +2101,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 relationProductsCount: ((_params$relation_prod3 = params.relation_products) === null || _params$relation_prod3 === void 0 ? void 0 : _params$relation_prod3.length) || 0,
                 paymentsCount: ((_params$payments4 = params.payments) === null || _params$payments4 === void 0 ? void 0 : _params$payments4.length) || 0
               });
-              _context21.prev = 4;
+              _context22.prev = 4;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -2094,10 +2165,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 调用后端接口
-              _context21.next = 12;
+              _context22.next = 12;
               return this.request.post('/order/checkout', orderData);
             case 12:
-              response = _context21.sent;
+              response = _context22.sent;
               this.logInfo('Order API called successfully', {
                 response: response
               });
@@ -2105,22 +2176,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 success: !!response,
                 hasOrderId: !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.order_id || response !== null && response !== void 0 && response.order_id)
               });
-              return _context21.abrupt("return", response);
+              return _context22.abrupt("return", response);
             case 18:
-              _context21.prev = 18;
-              _context21.t0 = _context21["catch"](4);
-              console.error('[Order] createOrderByCheckout 创建订单失败:', _context21.t0);
+              _context22.prev = 18;
+              _context22.t0 = _context22["catch"](4);
+              console.error('[Order] createOrderByCheckout 创建订单失败:', _context22.t0);
               this.logInfo('Order API called failed', {
-                error: _context21.t0 instanceof Error ? _context21.t0.message : String(_context21.t0)
+                error: _context22.t0 instanceof Error ? _context22.t0.message : String(_context22.t0)
               });
-              throw _context21.t0;
+              throw _context22.t0;
             case 23:
             case "end":
-              return _context21.stop();
+              return _context22.stop();
           }
-        }, _callee21, this, [[4, 18]]);
+        }, _callee22, this, [[4, 18]]);
       }));
-      function createOrderByCheckout(_x22) {
+      function createOrderByCheckout(_x23) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -2128,23 +2199,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitSalesOrder",
     value: function () {
-      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
+      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
         var url, query, fetchUrl;
-        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              return _context22.abrupt("return", this.request.post(fetchUrl, query, {
+              return _context23.abrupt("return", this.request.post(fetchUrl, query, {
                 customToast: function customToast() {}
               }));
             case 3:
             case "end":
-              return _context22.stop();
+              return _context23.stop();
           }
-        }, _callee22, this);
+        }, _callee23, this);
       }));
-      function submitSalesOrder(_x23) {
+      function submitSalesOrder(_x24) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -2158,37 +2229,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sendCustomerPayLink",
     value: (function () {
-      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
+      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
         var _params$emails;
         var orderIds;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
               orderIds = params.order_ids || params.orderIds || [];
               if (orderIds.length) {
-                _context23.next = 3;
+                _context24.next = 3;
                 break;
               }
               throw new Error('发送支付链接前必须先提交本地订单并取得订单 ID');
             case 3:
               if ((_params$emails = params.emails) !== null && _params$emails !== void 0 && _params$emails.length) {
-                _context23.next = 5;
+                _context24.next = 5;
                 break;
               }
               throw new Error('发送支付链接需要至少一个邮箱');
             case 5:
-              return _context23.abrupt("return", this.request.post('/order/batch-email', {
+              return _context24.abrupt("return", this.request.post('/order/batch-email', {
                 order_ids: orderIds,
                 notify_action: params.notify_action || 'order_payment_reminder',
                 emails: params.emails
               }));
             case 6:
             case "end":
-              return _context23.stop();
+              return _context24.stop();
           }
-        }, _callee23, this);
+        }, _callee24, this);
       }));
-      function sendCustomerPayLink(_x24) {
+      function sendCustomerPayLink(_x25) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -2197,28 +2268,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderInfoByRemote",
     value: function () {
-      var _getOrderInfoByRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(order_id) {
+      var _getOrderInfoByRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(order_id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              _context24.next = 2;
+              _context25.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
-                with: ['products', 'scheduleEvents', 'payments', 'customer', 'summary', 'contacts_info']
+                with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info']
               });
             case 2:
-              res = _context24.sent;
+              res = _context25.sent;
               if (res.code === 200) {
                 this.store.lastOrderInfo = res.data;
               }
-              return _context24.abrupt("return", res);
+              return _context25.abrupt("return", res);
             case 5:
             case "end":
-              return _context24.stop();
+              return _context25.stop();
           }
-        }, _callee24, this);
+        }, _callee25, this);
       }));
-      function getOrderInfoByRemote(_x25) {
+      function getOrderInfoByRemote(_x26) {
         return _getOrderInfoByRemote.apply(this, arguments);
       }
       return getOrderInfoByRemote;
@@ -2232,11 +2303,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
-      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(record, options) {
+      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(record, options) {
         var _this5 = this;
         var raw, defaults, nextTempOrder, TEMP_ORDER_KEYS;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
               raw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
               defaults = this.createDefaultTempOrderInstance();
@@ -2284,23 +2355,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.store.summary = raw.summary && _typeof(raw.summary) === 'object' ? _objectSpread(_objectSpread({}, createEmptySummary()), raw.summary) : createEmptySummary();
               this.store.lastOrderInfo = raw.lastOrderInfo || raw;
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context25.next = 23;
+                _context26.next = 23;
                 break;
               }
-              _context25.next = 23;
+              _context26.next = 23;
               return this.recalculateSummary({
                 createIfMissing: false
               });
             case 23:
               this.persistTempOrder();
-              return _context25.abrupt("return", nextTempOrder);
+              return _context26.abrupt("return", nextTempOrder);
             case 25:
             case "end":
-              return _context25.stop();
+              return _context26.stop();
           }
-        }, _callee25, this);
+        }, _callee26, this);
       }));
-      function hydrateTempOrderFromRecord(_x26, _x27) {
+      function hydrateTempOrderFromRecord(_x27, _x28) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -2335,25 +2406,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderInfo",
     value: function () {
-      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(order_id) {
+      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(order_id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              _context26.next = 2;
+              _context27.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
-                with: ['products', 'scheduleEvents']
+                with: ['products', 'bookings']
               });
             case 2:
-              res = _context26.sent;
-              return _context26.abrupt("return", res);
+              res = _context27.sent;
+              return _context27.abrupt("return", res);
             case 4:
             case "end":
-              return _context26.stop();
+              return _context27.stop();
           }
-        }, _callee26, this);
+        }, _callee27, this);
       }));
-      function getOrderInfo(_x28) {
+      function getOrderInfo(_x29) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;