@pisell/pisellos 2.3.16 → 2.3.17

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

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

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

@@ -230,6 +230,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * const ids = this.collectBookingHolderRecords(booking);
      */
     private collectBookingHolderRecords;
+    private setProductHolderFromBooking;
+    private syncLinkedBookingHoldersToProducts;
     /**
      * 按 form_record 顺序读取 booking holder 的主字段名称。
      *
@@ -458,7 +460,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -712,6 +712,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       // 也需要让 Rules.calcDiscount 把 DiscountModule 的 isSelected / isAvailable /
       // appliedProductDetails / savedAmount 复位。
       if (!tempOrder) return;
+      this.syncLinkedBookingHoldersToProducts(tempOrder);
       delete tempOrder.discount_list;
       var discountList = ((_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.getDiscountList()) || [];
       var shouldSkipDiscountCalculation = this.shouldSkipDiscountCalculation(tempOrder);
@@ -2431,6 +2432,48 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return record !== undefined && record !== null && record !== '';
       });
     }
+  }, {
+    key: "setProductHolderFromBooking",
+    value: function setProductHolderFromBooking(product, booking) {
+      if (!product || !booking) return;
+      var holderRecords = this.collectBookingHolderRecords(booking);
+      if (!product.metadata || _typeof(product.metadata) !== 'object') {
+        product.metadata = {};
+      }
+      product.metadata.holder_id = holderRecords.length > 0 ? holderRecords : null;
+    }
+  }, {
+    key: "syncLinkedBookingHoldersToProducts",
+    value: function syncLinkedBookingHoldersToProducts(tempOrder) {
+      var _this13 = this;
+      var bookings = tempOrder.bookings || [];
+      var products = tempOrder.products || [];
+      if (!bookings.length || !products.length) return;
+      var bookingByProductUid = new Map();
+      var bookingByBookingUid = new Map();
+      bookings.forEach(function (booking) {
+        var _booking$metadata2, _booking$metadata3;
+        if (!booking || _typeof(booking) !== 'object') return;
+        var productUid = booking.product_uid || ((_booking$metadata2 = booking.metadata) === null || _booking$metadata2 === void 0 ? void 0 : _booking$metadata2.product_uid);
+        if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
+          bookingByProductUid.set(String(productUid), booking);
+        }
+        var bookingUid = ((_booking$metadata3 = booking.metadata) === null || _booking$metadata3 === void 0 ? void 0 : _booking$metadata3.unique_identification_number) || booking.booking_uid;
+        if (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '') {
+          bookingByBookingUid.set(String(bookingUid), booking);
+        }
+      });
+      products.forEach(function (product) {
+        var _product$metadata5, _product$metadata6;
+        if (!product || _typeof(product) !== 'object') return;
+        var productUid = ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) || product.unique_identification_number;
+        var bookingUid = product.booking_uid || ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.booking_uid);
+        var linkedBooking = (productUid !== undefined && productUid !== null && String(productUid) !== '' ? bookingByProductUid.get(String(productUid)) : undefined) || (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '' ? bookingByBookingUid.get(String(bookingUid)) : undefined);
+        if (linkedBooking) {
+          _this13.setProductHolderFromBooking(product, linkedBooking);
+        }
+      });
+    }
 
     /**
      * 按 form_record 顺序读取 booking holder 的主字段名称。
@@ -2535,41 +2578,42 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function syncTempOrderHolderFromBookings(tempOrder) {
       var bookings = tempOrder.bookings || [];
       var hasHolderSource = bookings.some(function (booking) {
-        var _booking$metadata2;
-        return (booking === null || booking === void 0 ? void 0 : booking.holder) !== undefined || (booking === null || booking === void 0 || (_booking$metadata2 = booking.metadata) === null || _booking$metadata2 === void 0 ? void 0 : _booking$metadata2.holder_id) !== undefined;
+        var _booking$metadata4;
+        return (booking === null || booking === void 0 ? void 0 : booking.holder) !== undefined || (booking === null || booking === void 0 || (_booking$metadata4 = booking.metadata) === null || _booking$metadata4 === void 0 ? void 0 : _booking$metadata4.holder_id) !== undefined;
       });
       var nextHolder = this.buildTempOrderHolderFromBookings(tempOrder);
       if (nextHolder || hasHolderSource || bookings.length === 0) {
         tempOrder.holder = nextHolder;
       }
+      this.syncLinkedBookingHoldersToProducts(tempOrder);
     }
   }, {
     key: "getBookingUniqueIdentificationNumber",
     value: function getBookingUniqueIdentificationNumber(booking) {
-      var _booking$metadata3;
-      var uid = booking === null || booking === void 0 || (_booking$metadata3 = booking.metadata) === null || _booking$metadata3 === void 0 ? void 0 : _booking$metadata3.unique_identification_number;
+      var _booking$metadata5;
+      var uid = booking === null || booking === void 0 || (_booking$metadata5 = booking.metadata) === null || _booking$metadata5 === void 0 ? void 0 : _booking$metadata5.unique_identification_number;
       if (uid === undefined || uid === null || uid === '') return null;
       return String(uid);
     }
   }, {
     key: "findBookingIndexByUniqueIdentificationNumber",
     value: function findBookingIndexByUniqueIdentificationNumber(tempOrder, uniqueIdentificationNumber) {
-      var _this13 = this;
+      var _this14 = this;
       return (tempOrder.bookings || []).findIndex(function (booking) {
-        return _this13.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
+        return _this14.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
       });
     }
   }, {
     key: "removeLinkedBookingsForProduct",
     value: function removeLinkedBookingsForProduct(tempOrder, product) {
-      var _product$metadata5,
-        _product$metadata6,
-        _this14 = this;
-      var productUid = (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
-      var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.booking_uid);
+      var _product$metadata7,
+        _product$metadata8,
+        _this15 = this;
+      var productUid = (product === null || product === void 0 || (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+      var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.booking_uid);
       if (!productUid && !bookingUid) return;
       tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
-        var currentBookingUid = _this14.getBookingUniqueIdentificationNumber(booking);
+        var currentBookingUid = _this15.getBookingUniqueIdentificationNumber(booking);
         if (bookingUid && currentBookingUid === String(bookingUid)) return false;
         if (productUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) return false;
         return true;
@@ -2892,15 +2936,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "productHasCustomerBoundDiscount",
     value: function productHasCustomerBoundDiscount(product) {
-      var _this15 = this;
+      var _this16 = this;
       if (((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (discount) {
-        return _this15.isCustomerBoundDiscount(discount);
+        return _this16.isCustomerBoundDiscount(discount);
       })) {
         return true;
       }
       return ((product === null || product === void 0 ? void 0 : product.product_bundle) || []).some(function (bundle) {
         return ((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []).some(function (discount) {
-          return _this15.isCustomerBoundDiscount(discount);
+          return _this16.isCustomerBoundDiscount(discount);
         });
       });
     }
@@ -2909,18 +2953,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function shouldSkipDiscountCalculation(tempOrder) {
       var _this$store$discount13,
         _this$store$discount14,
-        _this16 = this;
+        _this17 = this;
       if (this.hasActiveCustomerBoundDiscount) return false;
       var discountList = ((_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 || (_this$store$discount14 = _this$store$discount13.getDiscountList) === null || _this$store$discount14 === void 0 ? void 0 : _this$store$discount14.call(_this$store$discount13)) || [];
       if (discountList.length > 0) return false;
       return !(tempOrder.products || []).some(function (product) {
-        return _this16.productHasCustomerBoundDiscount(product);
+        return _this17.productHasCustomerBoundDiscount(product);
       });
     }
   }, {
     key: "clearCustomerBoundDiscounts",
     value: function clearCustomerBoundDiscounts(tempOrder) {
-      var _this17 = this,
+      var _this18 = this,
         _discountModule$getDi,
         _discountModule$getOr,
         _discountModule$setDi,
@@ -2929,7 +2973,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var filterDiscountList = function filterDiscountList(discountList) {
         if (!Array.isArray(discountList)) return [];
         return discountList.filter(function (discount) {
-          var shouldRemove = _this17.isCustomerBoundDiscount(discount);
+          var shouldRemove = _this18.isCustomerBoundDiscount(discount);
           if (shouldRemove) didRemoveCustomerBoundDiscount = true;
           return !shouldRemove;
         });
@@ -2957,11 +3001,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var currentOriginalDiscounts = ((_discountModule$getOr = discountModule.getOriginalDiscountList) === null || _discountModule$getOr === void 0 ? void 0 : _discountModule$getOr.call(discountModule)) || [];
       var nextDiscounts = currentDiscounts.filter(function (discount) {
         if (discount !== null && discount !== void 0 && discount.isEditMode) return true;
-        return !_this17.isCustomerBoundDiscount(discount);
+        return !_this18.isCustomerBoundDiscount(discount);
       });
       var nextOriginalDiscounts = currentOriginalDiscounts.filter(function (discount) {
         if (discount !== null && discount !== void 0 && discount.isEditMode) return true;
-        return !_this17.isCustomerBoundDiscount(discount);
+        return !_this18.isCustomerBoundDiscount(discount);
       });
       void ((_discountModule$setDi = discountModule.setDiscountList) === null || _discountModule$setDi === void 0 ? void 0 : _discountModule$setDi.call(discountModule, nextDiscounts));
       void ((_discountModule$setOr = discountModule.setOriginalDiscountList) === null || _discountModule$setOr === void 0 ? void 0 : _discountModule$setOr.call(discountModule, nextOriginalDiscounts));
@@ -3129,7 +3173,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
-      var _this18 = this;
+      var _this19 = this;
       this.logInfo('addOrderPayment', {
         payment: payment
       });
@@ -3146,7 +3190,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this18.logError('recalculate summary after addOrderPayment failed', {
+        _this19.logError('recalculate summary after addOrderPayment failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3228,7 +3272,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyPaymentLifecycleChange",
     value: function applyPaymentLifecycleChange(tempOrder, options) {
-      var _this19 = this;
+      var _this20 = this;
       this.updateTempOrderPaymentStatus(tempOrder);
       if ((options === null || options === void 0 ? void 0 : options.persist) !== false) {
         this.persistTempOrder();
@@ -3238,7 +3282,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this19.logError("recalculate summary after ".concat(logContext, " failed"), {
+        _this20.logError("recalculate summary after ".concat(logContext, " failed"), {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3282,7 +3326,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherOrderPayments",
     value: function updateVoucherOrderPayments(payments, options) {
-      var _this20 = this;
+      var _this21 = this;
       var tempOrder = this.ensureTempOrder();
       var isOrderPaymentType = function isOrderPaymentType(value) {
         return value === 'normal' || value === 'deposit';
@@ -3317,7 +3361,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
       };
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this20.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
+        return _this21.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
           defaultPaid: false
         });
       })).filter(function (payment) {
@@ -3366,7 +3410,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this20.logError('recalculate summary after updateVoucherOrderPayments failed', {
+        _this21.logError('recalculate summary after updateVoucherOrderPayments failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3433,8 +3477,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hasLinkedBookingUid",
     value: function hasLinkedBookingUid(product) {
-      var _product$booking_uid, _product$metadata7;
-      var bookingUid = (_product$booking_uid = product === null || product === void 0 ? void 0 : product.booking_uid) !== null && _product$booking_uid !== void 0 ? _product$booking_uid : product === null || product === void 0 || (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.booking_uid;
+      var _product$booking_uid, _product$metadata9;
+      var bookingUid = (_product$booking_uid = product === null || product === void 0 ? void 0 : product.booking_uid) !== null && _product$booking_uid !== void 0 ? _product$booking_uid : product === null || product === void 0 || (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.booking_uid;
       return bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '';
     }
 
@@ -3502,7 +3546,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _appendProductLineToTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(tempOrder, product, booking) {
         var _booking_uid,
           _metadata,
-          _this21 = this;
+          _this22 = this;
         var linked, productToAdd, incomingFingerprint, normalizedIncoming, incomingBookingUid, hasIncomingGoodPass, hasIncomingProductNote, hasIncomingBookingUid, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct, nextNum, targetIsManualProductDiscount, nextDiscountList;
         return _regeneratorRuntime().wrap(function _callee16$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
@@ -3527,8 +3571,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
               shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-                if (_this21.hasGoodPassDiscount(item)) return false;
-                if (_this21.hasOrderProductLineNote(item)) return false;
+                if (_this22.hasGoodPassDiscount(item)) return false;
+                if (_this22.hasOrderProductLineNote(item)) return false;
                 if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
                 if (item.product_id !== productToAdd.product_id) return false;
                 if (item.product_variant_id !== productToAdd.product_variant_id) return false;
@@ -3825,17 +3869,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "preservePersistedBundlePriceFields",
     value: function preservePersistedBundlePriceFields(previousBundles, nextBundles) {
-      var _this22 = this;
+      var _this23 = this;
       if (!Array.isArray(nextBundles)) return nextBundles;
       if (!Array.isArray(previousBundles) || previousBundles.length === 0) return nextBundles;
       var previousByIdentity = new Map();
       previousBundles.forEach(function (bundle) {
-        var identity = _this22.getBundleRuntimeIdentity(bundle);
+        var identity = _this23.getBundleRuntimeIdentity(bundle);
         if (identity) previousByIdentity.set(identity, bundle);
       });
       return nextBundles.map(function (bundle, index) {
         if (!bundle || _typeof(bundle) !== 'object') return bundle;
-        var previous = previousByIdentity.get(_this22.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
+        var previous = previousByIdentity.get(_this23.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
         if (!previous || _typeof(previous) !== 'object') return bundle;
         return _objectSpread(_objectSpread({}, bundle), {}, {
           price: previous.price,
@@ -4022,7 +4066,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProducts",
     value: function () {
       var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(paramsList) {
-        var _this23 = this;
+        var _this24 = this;
         var tempOrder;
         return _regeneratorRuntime().wrap(function _callee20$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
@@ -4035,7 +4079,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context22.abrupt("return", tempOrder.products);
             case 3:
               paramsList.forEach(function (params) {
-                _this23.applyOrderProductUpdateToTempOrder(tempOrder, params);
+                _this24.applyOrderProductUpdateToTempOrder(tempOrder, params);
               });
               _context22.next = 6;
               return this.finalizeAfterProductsMutation(tempOrder);
@@ -4205,7 +4249,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductsFromOrder",
     value: (function () {
       var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(identities) {
-        var _this24 = this;
+        var _this25 = this;
         var tempOrder, productsBeforeRemove, bookingsBeforeRemove, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3;
         return _regeneratorRuntime().wrap(function _callee23$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
@@ -4260,7 +4304,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       if (productUid !== undefined && productUid !== null && productUid !== '') {
                         bookingsBeforeRemove.forEach(function (booking) {
-                          var bookingUid = _this24.getBookingUniqueIdentificationNumber(booking);
+                          var bookingUid = _this25.getBookingUniqueIdentificationNumber(booking);
                           if (bookingUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) {
                             linkedBookingUidsToRemove.add(bookingUid);
                           }
@@ -4739,10 +4783,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this25 = this;
+        _this26 = this;
       var candidates = [error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, error === null || error === void 0 ? void 0 : error.data, error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.body, error === null || error === void 0 ? void 0 : error.body];
       return candidates.find(function (candidate) {
-        return _this25.isSubmitErrorResponse(candidate);
+        return _this26.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -5403,7 +5447,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this26 = this;
+      var _this27 = this;
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), raw || {});
       // ES 列表详情使用 id 表示订单主键；OS 详情态统一依赖 order_id 驱动操作按钮。
       if ((nextTempOrder.order_id === undefined || nextTempOrder.order_id === null) && (raw === null || raw === void 0 ? void 0 : raw.id) !== undefined && (raw === null || raw === void 0 ? void 0 : raw.id) !== null) {
@@ -5426,10 +5470,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this26.normalizeHydratedOrderProduct(p);
+        return _this27.normalizeHydratedOrderProduct(p);
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
-        var booking = _this26.normalizeHydratedBookingHolder(b || {});
+        var booking = _this27.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -5459,11 +5503,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step22;
       try {
         for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var _product$metadata8, _ref74, _ref75, _existed$origin, _rawProduct$metadata;
+          var _product$metadata10, _ref74, _ref75, _existed$origin, _rawProduct$metadata;
           var _step22$value = _slicedToArray(_step22.value, 2),
             index = _step22$value[0],
             product = _step22$value[1];
-          var uid = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.unique_identification_number;
+          var uid = (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.unique_identification_number;
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
@@ -5501,8 +5545,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var bookingUidByProductUid = new Map();
       var productByUid = new Map();
       (tempOrder.products || []).forEach(function (product) {
-        var _product$metadata9;
-        var productUid = (product === null || product === void 0 || (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        var _product$metadata11;
+        var productUid = (product === null || product === void 0 || (_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
         if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
           productByUid.set(String(productUid), product);
         }
@@ -5523,8 +5567,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         bookingUidByProductUid.set(String(productUid), bookingUid);
       });
       (tempOrder.products || []).forEach(function (product) {
-        var _product$metadata10;
-        var productUid = (product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        var _product$metadata12;
+        var productUid = (product === null || product === void 0 || (_product$metadata12 = product.metadata) === null || _product$metadata12 === void 0 ? void 0 : _product$metadata12.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
         if (productUid === undefined || productUid === null || String(productUid) === '') return;
         var bookingUid = bookingUidByProductUid.get(String(productUid));
         if (!bookingUid) return;
@@ -5535,6 +5579,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         product.booking_uid = linkedBookingUid;
         product.metadata.booking_uid = linkedBookingUid;
       });
+      this.syncLinkedBookingHoldersToProducts(tempOrder);
     }
   }, {
     key: "pickHydratedDisplayText",
@@ -5597,7 +5642,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product) {
-      var _this27 = this;
+      var _this28 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -5605,7 +5650,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var productSku = ensureProductSku(row);
       row.product_sku = _objectSpread(_objectSpread({}, productSku), {}, {
         option: normalizeProductSkuOptions(productSku.option.map(function (optionItem) {
-          return _this27.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this28.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];

package/dist/modules/SalesSummary/utils.js

@@ -329,11 +329,12 @@ function buildSurchargeQuantityTotals(nodes) {
 }
 function getFallbackAllProductSurchargeIds(surchargeList) {
   return (surchargeList || []).reduce(function (ids, config) {
-    var _config$open_product, _config$is_all;
+    var _config$open_product, _config$is_all, _config$open_schedule;
     var id = getSurchargeConfigId(config);
     if (id === undefined) return ids;
     if (Number((_config$open_product = config.open_product) !== null && _config$open_product !== void 0 ? _config$open_product : 0) === 0) return ids;
     if (Number((_config$is_all = config.is_all) !== null && _config$is_all !== void 0 ? _config$is_all : 0) !== 1) return ids;
+    if (Number((_config$open_schedule = config.open_schedule) !== null && _config$open_schedule !== void 0 ? _config$open_schedule : 0) === 1 && config.schedule_type !== 'all') return ids;
     ids.push(id);
     return ids;
   }, []);

package/dist/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 2 | 3 | 6 | 4;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.d.ts

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -230,6 +230,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * const ids = this.collectBookingHolderRecords(booking);
      */
     private collectBookingHolderRecords;
+    private setProductHolderFromBooking;
+    private syncLinkedBookingHoldersToProducts;
     /**
      * 按 form_record 顺序读取 booking holder 的主字段名称。
      *
@@ -458,7 +460,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -544,6 +544,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const tempOrder = this.store.tempOrder;
     if (!tempOrder)
       return;
+    this.syncLinkedBookingHoldersToProducts(tempOrder);
     delete tempOrder.discount_list;
     const discountList = ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
     const shouldSkipDiscountCalculation = this.shouldSkipDiscountCalculation(tempOrder);
@@ -1787,6 +1788,47 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const records = Array.isArray(source) ? source : [source];
     return records.filter((record) => record !== void 0 && record !== null && record !== "");
   }
+  setProductHolderFromBooking(product, booking) {
+    if (!product || !booking)
+      return;
+    const holderRecords = this.collectBookingHolderRecords(booking);
+    if (!product.metadata || typeof product.metadata !== "object") {
+      product.metadata = {};
+    }
+    product.metadata.holder_id = holderRecords.length > 0 ? holderRecords : null;
+  }
+  syncLinkedBookingHoldersToProducts(tempOrder) {
+    const bookings = tempOrder.bookings || [];
+    const products = tempOrder.products || [];
+    if (!bookings.length || !products.length)
+      return;
+    const bookingByProductUid = /* @__PURE__ */ new Map();
+    const bookingByBookingUid = /* @__PURE__ */ new Map();
+    bookings.forEach((booking) => {
+      var _a, _b;
+      if (!booking || typeof booking !== "object")
+        return;
+      const productUid = booking.product_uid || ((_a = booking.metadata) == null ? void 0 : _a.product_uid);
+      if (productUid !== void 0 && productUid !== null && String(productUid) !== "") {
+        bookingByProductUid.set(String(productUid), booking);
+      }
+      const bookingUid = ((_b = booking.metadata) == null ? void 0 : _b.unique_identification_number) || booking.booking_uid;
+      if (bookingUid !== void 0 && bookingUid !== null && String(bookingUid) !== "") {
+        bookingByBookingUid.set(String(bookingUid), booking);
+      }
+    });
+    products.forEach((product) => {
+      var _a, _b;
+      if (!product || typeof product !== "object")
+        return;
+      const productUid = ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) || product.unique_identification_number;
+      const bookingUid = product.booking_uid || ((_b = product.metadata) == null ? void 0 : _b.booking_uid);
+      const linkedBooking = (productUid !== void 0 && productUid !== null && String(productUid) !== "" ? bookingByProductUid.get(String(productUid)) : void 0) || (bookingUid !== void 0 && bookingUid !== null && String(bookingUid) !== "" ? bookingByBookingUid.get(String(bookingUid)) : void 0);
+      if (linkedBooking) {
+        this.setProductHolderFromBooking(product, linkedBooking);
+      }
+    });
+  }
   /**
    * 按 form_record 顺序读取 booking holder 的主字段名称。
    *
@@ -1866,6 +1908,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (nextHolder || hasHolderSource || bookings.length === 0) {
       tempOrder.holder = nextHolder;
     }
+    this.syncLinkedBookingHoldersToProducts(tempOrder);
   }
   getBookingUniqueIdentificationNumber(booking) {
     var _a;
@@ -4069,6 +4112,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       product.booking_uid = linkedBookingUid;
       product.metadata.booking_uid = linkedBookingUid;
     });
+    this.syncLinkedBookingHoldersToProducts(tempOrder);
   }
   pickHydratedDisplayText(value) {
     if (value === void 0 || value === null)

package/lib/modules/SalesSummary/utils.js

@@ -308,6 +308,8 @@ function getFallbackAllProductSurchargeIds(surchargeList) {
       return ids;
     if (Number(config.is_all ?? 0) !== 1)
       return ids;
+    if (Number(config.open_schedule ?? 0) === 1 && config.schedule_type !== "all")
+      return ids;
     ids.push(id);
     return ids;
   }, []);

package/lib/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 2 | 3 | 6 | 4;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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