@pisell/pisellos 2.2.211 → 2.2.212

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/BookingContext/utils/cacheItemToBookingInput.d.ts

@@ -67,6 +67,7 @@ export interface BookingMetadataInput {
     capacity?: number | BookingCapacityMetadataItem[];
     /** 协议要求始终提交（即使为 null）。 */
     holder_id: any;
+    holder?: any;
     resource_select_type?: 'single' | 'multiple' | string;
 }
 /**

package/dist/modules/BookingContext/utils/cacheItemToBookingInput.js

@@ -193,6 +193,9 @@ export function cacheItemToBookingInput(cacheItem, options) {
   if (ext.holder_id !== undefined && ext.holder_id !== null) {
     metadata.holder_id = ext.holder_id;
   }
+  if (ext.holder !== undefined) {
+    metadata.holder = ext.holder;
+  }
   if (ext.collect_pax !== undefined) metadata.collect_pax = ext.collect_pax;
   // 与 info2 formatMetaData 一致：优先写入完整人数维度数组，供编辑回显 / 详情回灌。
   var extendCapacity = normalizeExtendCapacityForMetadata(ext.capacity);

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

@@ -186,6 +186,41 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private ensureExtend;
     private captureProductRuntime;
     private createLinkedProductAndBooking;
+    /**
+     * booking.holder 是提交真源；metadata.holder 作为详情/回显冗余字段同步保存。
+     *
+     * @example
+     * this.syncBookingMetadataHolder(booking, metadata);
+     */
+    private syncBookingMetadataHolder;
+    /**
+     * 从单条 booking 的 holder / metadata 中收集 holder form_record。
+     *
+     * @example
+     * const ids = this.collectBookingHolderRecords(booking);
+     */
+    private collectBookingHolderRecords;
+    /**
+     * 按 form_record 顺序读取 booking holder 的主字段名称。
+     *
+     * @example
+     * const names = this.collectBookingHolderNames(booking);
+     */
+    private collectBookingHolderNames;
+    /**
+     * 按老 ticketBooking `formatHolder` 语义汇总订单顶层 holder。
+     *
+     * @example
+     * const holder = this.buildTempOrderHolderFromBookings(tempOrder);
+     */
+    private buildTempOrderHolderFromBookings;
+    /**
+     * 将 booking 级 holder 汇总到 tempOrder 顶层 holder。
+     *
+     * @example
+     * this.syncTempOrderHolderFromBookings(tempOrder);
+     */
+    private syncTempOrderHolderFromBookings;
     private getBookingUniqueIdentificationNumber;
     private findBookingIndexByUniqueIdentificationNumber;
     private removeLinkedBookingsForProduct;

package/dist/modules/Order/index.js

@@ -2052,6 +2052,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var bookingUid = String(bookingMetadata.unique_identification_number || createUuidV4());
       productMetadata.unique_identification_number = productUid;
       bookingMetadata.unique_identification_number = bookingUid;
+      this.syncBookingMetadataHolder(params.booking, bookingMetadata);
       return {
         productUid: productUid,
         bookingUid: bookingUid,
@@ -2070,11 +2071,155 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         })
       };
     }
+
+    /**
+     * booking.holder 是提交真源；metadata.holder 作为详情/回显冗余字段同步保存。
+     *
+     * @example
+     * this.syncBookingMetadataHolder(booking, metadata);
+     */
+  }, {
+    key: "syncBookingMetadataHolder",
+    value: function syncBookingMetadataHolder(booking, metadata) {
+      if ((booking === null || booking === void 0 ? void 0 : booking.holder) !== undefined) {
+        metadata.holder = booking.holder;
+      }
+    }
+
+    /**
+     * 从单条 booking 的 holder / metadata 中收集 holder form_record。
+     *
+     * @example
+     * const ids = this.collectBookingHolderRecords(booking);
+     */
+  }, {
+    key: "collectBookingHolderRecords",
+    value: function collectBookingHolderRecords(booking) {
+      var _holder$form_record, _booking$metadata;
+      var holder = booking !== null && booking !== void 0 && booking.holder && _typeof(booking.holder) === 'object' ? booking.holder : null;
+      var source = (_holder$form_record = holder === null || holder === void 0 ? void 0 : holder.form_record) !== null && _holder$form_record !== void 0 ? _holder$form_record : booking === null || booking === void 0 || (_booking$metadata = booking.metadata) === null || _booking$metadata === void 0 ? void 0 : _booking$metadata.holder_id;
+      var records = Array.isArray(source) ? source : [source];
+      return records.filter(function (record) {
+        return record !== undefined && record !== null && record !== '';
+      });
+    }
+
+    /**
+     * 按 form_record 顺序读取 booking holder 的主字段名称。
+     *
+     * @example
+     * const names = this.collectBookingHolderNames(booking);
+     */
+  }, {
+    key: "collectBookingHolderNames",
+    value: function collectBookingHolderNames(booking) {
+      var holder = booking !== null && booking !== void 0 && booking.holder && _typeof(booking.holder) === 'object' ? booking.holder : null;
+      var rawName = holder === null || holder === void 0 ? void 0 : holder.name;
+      if (Array.isArray(rawName)) {
+        return rawName.map(function (name) {
+          return String(name || '').trim();
+        });
+      }
+      if (typeof rawName === 'string') {
+        return rawName.split(',').map(function (name) {
+          return name.trim();
+        });
+      }
+      return [];
+    }
+
+    /**
+     * 按老 ticketBooking `formatHolder` 语义汇总订单顶层 holder。
+     *
+     * @example
+     * const holder = this.buildTempOrderHolderFromBookings(tempOrder);
+     */
+  }, {
+    key: "buildTempOrderHolderFromBookings",
+    value: function buildTempOrderHolderFromBookings(tempOrder) {
+      var _baseHolder$customer_, _baseHolder, _ref44, _baseHolder$form_id, _baseHolder2, _tempOrder$holder5, _baseHolder3, _this$otherParams;
+      var holderRecords = [];
+      var holderNames = [];
+      var baseHolder = null;
+      var seen = new Set();
+      var _iterator18 = _createForOfIteratorHelper(tempOrder.bookings || []),
+        _step18;
+      try {
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var booking = _step18.value;
+          var holder = booking !== null && booking !== void 0 && booking.holder && _typeof(booking.holder) === 'object' ? booking.holder : null;
+          if (!baseHolder && holder) {
+            baseHolder = holder;
+          }
+          var records = this.collectBookingHolderRecords(booking);
+          var names = this.collectBookingHolderNames(booking);
+          var _iterator19 = _createForOfIteratorHelper(records.entries()),
+            _step19;
+          try {
+            for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+              var _step19$value = _slicedToArray(_step19.value, 2),
+                index = _step19$value[0],
+                record = _step19$value[1];
+              var key = String(record);
+              if (seen.has(key)) continue;
+              seen.add(key);
+              holderRecords.push(record);
+              if (names[index]) {
+                holderNames.push(names[index]);
+              }
+            }
+          } catch (err) {
+            _iterator19.e(err);
+          } finally {
+            _iterator19.f();
+          }
+        }
+      } catch (err) {
+        _iterator18.e(err);
+      } finally {
+        _iterator18.f();
+      }
+      if (!holderRecords.length) {
+        return null;
+      }
+      var nextHolder = {
+        customer_id: (_baseHolder$customer_ = (_baseHolder = baseHolder) === null || _baseHolder === void 0 ? void 0 : _baseHolder.customer_id) !== null && _baseHolder$customer_ !== void 0 ? _baseHolder$customer_ : tempOrder.customer_id,
+        form_id: (_ref44 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder5 = tempOrder.holder) === null || _tempOrder$holder5 === void 0 ? void 0 : _tempOrder$holder5.form_id) !== null && _ref44 !== void 0 ? _ref44 : 0,
+        form_record: holderRecords
+      };
+      if (holderNames.length) {
+        nextHolder.name = holderNames.join(',');
+      }
+      if ((_baseHolder3 = baseHolder) !== null && _baseHolder3 !== void 0 && _baseHolder3.is_source_shop || (_this$otherParams = this.otherParams) !== null && _this$otherParams !== void 0 && _this$otherParams.isFranchisee) {
+        nextHolder.is_source_shop = 1;
+      }
+      return nextHolder;
+    }
+
+    /**
+     * 将 booking 级 holder 汇总到 tempOrder 顶层 holder。
+     *
+     * @example
+     * this.syncTempOrderHolderFromBookings(tempOrder);
+     */
+  }, {
+    key: "syncTempOrderHolderFromBookings",
+    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 nextHolder = this.buildTempOrderHolderFromBookings(tempOrder);
+      if (nextHolder || hasHolderSource || bookings.length === 0) {
+        tempOrder.holder = nextHolder;
+      }
+    }
   }, {
     key: "getBookingUniqueIdentificationNumber",
     value: function getBookingUniqueIdentificationNumber(booking) {
-      var _booking$metadata;
-      var uid = booking === null || booking === void 0 || (_booking$metadata = booking.metadata) === null || _booking$metadata === void 0 ? void 0 : _booking$metadata.unique_identification_number;
+      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;
       if (uid === undefined || uid === null || uid === '') return null;
       return String(uid);
     }
@@ -2114,7 +2259,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "recalculateSummary",
     value: function () {
       var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(options) {
-        var _ref44, _salesSummaryResult$e;
+        var _ref45, _salesSummaryResult$e;
         var tempOrder, snapshotSummary, shouldFullRecalculateFromSnapshot, summaryProducts, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummary, salesSummaryResult, roundingAmount, payServiceChargeAmount, hasSalesSummaryAmount, expectAmount, amountPaymentPatch, normalizedExpectAmountPatch, summaryForGap, summary;
         return _regeneratorRuntime().wrap(function _callee10$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
@@ -2184,7 +2329,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               roundingAmount = paidPaymentSummary.roundingAmount;
               payServiceChargeAmount = paidPaymentSummary.payServiceChargeAmount;
               hasSalesSummaryAmount = salesSummaryResult.expect_amount !== undefined || salesSummaryResult.total_amount !== undefined;
-              expectAmount = hasSalesSummaryAmount ? new Decimal((_ref44 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref44 !== void 0 ? _ref44 : 0) : null;
+              expectAmount = hasSalesSummaryAmount ? new Decimal((_ref45 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref45 !== void 0 ? _ref45 : 0) : null;
               amountPaymentPatch = hasSalesSummaryAmount || !roundingAmount.eq(0) || !payServiceChargeAmount.eq(0) ? _objectSpread({
                 rounding_amount: roundingAmount.toFixed(2)
               }, expectAmount ? {
@@ -2340,17 +2485,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderCustomer",
     value: function buildTempOrderCustomer(params) {
-      var _ref45, _ref46, _ref47, _source$name, _ref48, _ref49, _ref50, _source$customer_name, _source$id, _source$customer_id, _ref51, _source$country_calli, _source$phone, _source$email;
+      var _ref46, _ref47, _ref48, _source$name, _ref49, _ref50, _ref51, _source$customer_name, _source$id, _source$customer_id, _ref52, _source$country_calli, _source$phone, _source$email;
       if (!params.customerId) return null;
       var source = params.source ? cloneDeep(params.source) : {};
-      var name = (_ref45 = (_ref46 = (_ref47 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref47 !== void 0 ? _ref47 : source.customerName) !== null && _ref46 !== void 0 ? _ref46 : source.customer_name) !== null && _ref45 !== void 0 ? _ref45 : params.customerName;
-      var customerName = (_ref48 = (_ref49 = (_ref50 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref50 !== void 0 ? _ref50 : source.display_name) !== null && _ref49 !== void 0 ? _ref49 : source.name) !== null && _ref48 !== void 0 ? _ref48 : params.customerName;
+      var name = (_ref46 = (_ref47 = (_ref48 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref48 !== void 0 ? _ref48 : source.customerName) !== null && _ref47 !== void 0 ? _ref47 : source.customer_name) !== null && _ref46 !== void 0 ? _ref46 : params.customerName;
+      var customerName = (_ref49 = (_ref50 = (_ref51 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref51 !== void 0 ? _ref51 : source.display_name) !== null && _ref50 !== void 0 ? _ref50 : source.name) !== null && _ref49 !== void 0 ? _ref49 : params.customerName;
       return _objectSpread(_objectSpread({}, source), {}, {
         id: (_source$id = source.id) !== null && _source$id !== void 0 ? _source$id : params.customerId,
         customer_id: (_source$customer_id = source.customer_id) !== null && _source$customer_id !== void 0 ? _source$customer_id : params.customerId,
         name: String(name || ''),
         customer_name: String(customerName || ''),
-        country_calling_code: String((_ref51 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref51 !== void 0 ? _ref51 : params.countryCallingCode),
+        country_calling_code: String((_ref52 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref52 !== void 0 ? _ref52 : params.countryCallingCode),
         phone: String((_source$phone = source.phone) !== null && _source$phone !== void 0 ? _source$phone : params.phone),
         email: String((_source$email = source.email) !== null && _source$email !== void 0 ? _source$email : params.email)
       });
@@ -2415,14 +2560,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateTempOrderCustomer",
     value: function updateTempOrderCustomer(customer) {
-      var _tempOrder$customer_i2, _ref52, _ref53, _customer$customer_id, _ref54, _ref55, _ref56, _customer$customer_na, _ref57, _customer$country_cal, _tempOrder$customer_i3;
+      var _tempOrder$customer_i2, _ref53, _ref54, _customer$customer_id, _ref55, _ref56, _ref57, _customer$customer_na, _ref58, _customer$country_cal, _tempOrder$customer_i3;
       var tempOrder = this.ensureTempOrder();
       var previousCustomerId = (_tempOrder$customer_i2 = tempOrder.customer_id) !== null && _tempOrder$customer_i2 !== void 0 ? _tempOrder$customer_i2 : null;
-      var customerId = (_ref52 = (_ref53 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref53 !== void 0 ? _ref53 : customer.id) !== null && _ref52 !== void 0 ? _ref52 : null;
-      var customerName = (_ref54 = (_ref55 = (_ref56 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref56 !== void 0 ? _ref56 : customer.display_name) !== null && _ref55 !== void 0 ? _ref55 : customer.name) !== null && _ref54 !== void 0 ? _ref54 : '';
+      var customerId = (_ref53 = (_ref54 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref54 !== void 0 ? _ref54 : customer.id) !== null && _ref53 !== void 0 ? _ref53 : null;
+      var customerName = (_ref55 = (_ref56 = (_ref57 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref57 !== void 0 ? _ref57 : customer.display_name) !== null && _ref56 !== void 0 ? _ref56 : customer.name) !== null && _ref55 !== void 0 ? _ref55 : '';
       tempOrder.customer_id = customerId === null || customerId === undefined || customerId === '' ? null : Number(customerId);
       tempOrder.customer_name = String(customerName || '');
-      tempOrder.country_calling_code = String((_ref57 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref57 !== void 0 ? _ref57 : '');
+      tempOrder.country_calling_code = String((_ref58 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref58 !== void 0 ? _ref58 : '');
       tempOrder.phone = String(customer.phone || '');
       tempOrder.email = String(customer.email || '');
       tempOrder.customer = this.buildTempOrderCustomer({
@@ -2748,21 +2893,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee14$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              _context16.next = 2;
+              this.syncTempOrderHolderFromBookings(tempOrder);
+              _context16.next = 3;
               return this.ensureEditDiscountConfigForProductChange(tempOrder);
-            case 2:
-              _context16.next = 4;
+            case 3:
+              _context16.next = 5;
               return this.applyPromotion();
-            case 4:
+            case 5:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context16.next = 8;
+              _context16.next = 9;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 8:
-              this.persistTempOrder();
             case 9:
+              this.persistTempOrder();
+            case 10:
             case "end":
               return _context16.stop();
           }
@@ -2905,7 +3051,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductToOrder",
     value: (function () {
       var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(product, booking) {
-        var tempOrder, _ref58, _productRecord$num, productRecord, splitCount, i, singleLine;
+        var tempOrder, _ref59, _productRecord$num, productRecord, splitCount, i, singleLine;
         return _regeneratorRuntime().wrap(function _callee16$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
@@ -2915,7 +3061,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref58 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref58 !== void 0 ? _ref58 : 1);
+              splitCount = getSafeProductNum((_ref59 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref59 !== void 0 ? _ref59 : 1);
               if (!(splitCount > 1)) {
                 _context18.next = 18;
                 break;
@@ -2981,9 +3127,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getBundleRuntimeIdentity",
     value: function getBundleRuntimeIdentity(bundle) {
-      var _ref59, _bundle$bundle_id2, _ref60, _bundle$bundle_group_2, _ref61, _ref62, _bundle$bundle_produc3, _ref63, _bundle$bundle_varian3;
+      var _ref60, _bundle$bundle_id2, _ref61, _bundle$bundle_group_2, _ref62, _ref63, _bundle$bundle_produc3, _ref64, _bundle$bundle_varian3;
       if (!bundle || _typeof(bundle) !== 'object') return '';
-      return [(_ref59 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref59 !== void 0 ? _ref59 : '', (_ref60 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref60 !== void 0 ? _ref60 : '', (_ref61 = (_ref62 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref62 !== void 0 ? _ref62 : bundle.product_id) !== null && _ref61 !== void 0 ? _ref61 : '', (_ref63 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref63 !== void 0 ? _ref63 : 0].join('|');
+      return [(_ref60 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref60 !== void 0 ? _ref60 : '', (_ref61 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref61 !== void 0 ? _ref61 : '', (_ref62 = (_ref63 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref63 !== void 0 ? _ref63 : bundle.product_id) !== null && _ref62 !== void 0 ? _ref62 : '', (_ref64 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref64 !== void 0 ? _ref64 : 0].join('|');
     }
   }, {
     key: "preservePersistedBundlePriceFields",
@@ -3130,20 +3276,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
               }
               tempOrder.products[productIndex] = normalizedProduct;
+              this.syncTempOrderHolderFromBookings(tempOrder);
               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);
-              _context19.next = 30;
+              _context19.next = 31;
               return this.applyPromotion();
-            case 30:
+            case 31:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context19.next = 34;
+              _context19.next = 35;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 34:
+            case 35:
               this.persistTempOrder();
               return _context19.abrupt("return", tempOrder.products);
-            case 36:
+            case 37:
             case "end":
               return _context19.stop();
           }
@@ -3244,9 +3391,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           unique_identification_number: bookingUid
         })
       });
+      this.syncBookingMetadataHolder(nextBooking, nextBooking.metadata);
       nextBooking.is_all = normalizeBookingIsAll(nextBooking);
       nextBooking.sub_type = normalizeBookingSubType(nextBooking);
       tempOrder.bookings[bookingIndex] = nextBooking;
+      this.syncTempOrderHolderFromBookings(tempOrder);
       this.persistTempOrder();
       return tempOrder.bookings;
     }
@@ -3265,18 +3414,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee19$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
-              _context21.next = 2;
+              this.syncTempOrderHolderFromBookings(tempOrder);
+              _context21.next = 3;
               return this.applyPromotion();
-            case 2:
+            case 3:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context21.next = 6;
+              _context21.next = 7;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 6:
-              this.persistTempOrder();
             case 7:
+              this.persistTempOrder();
+            case 8:
             case "end":
               return _context21.stop();
           }
@@ -3370,24 +3520,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder = this.ensureTempOrder();
               tempOrder.products = [];
               tempOrder.bookings = [];
+              this.syncTempOrderHolderFromBookings(tempOrder);
               if (tempOrder._extend && _typeof(tempOrder._extend) === 'object') {
                 tempOrder._extend = _objectSpread(_objectSpread({}, tempOrder._extend), {}, {
                   productsByUid: {}
                 });
               }
-              _context24.next = 6;
+              _context24.next = 7;
               return this.applyPromotion();
-            case 6:
+            case 7:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context24.next = 10;
+              _context24.next = 11;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 10:
+            case 11:
               this.persistTempOrder();
               return _context24.abrupt("return", tempOrder);
-            case 12:
+            case 13:
             case "end":
               return _context24.stop();
           }
@@ -3402,23 +3553,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildCurrentSubmitPayloadForLocalPrint",
     value: function buildCurrentSubmitPayloadForLocalPrint(params) {
-      var _params$cacheId, _this$otherParams, _ref64, _params$businessCode, _this$otherParams2, _this$otherParams3;
+      var _params$cacheId, _this$otherParams2, _ref65, _params$businessCode, _this$otherParams3, _this$otherParams4;
       var tempOrder = this.ensureTempOrder();
       this.persistTempOrder();
       var payload = buildSubmitPayload({
         tempOrder: tempOrder,
         cacheId: (_params$cacheId = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId !== void 0 ? _params$cacheId : this.cacheId,
-        platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.platform),
-        businessCode: (_ref64 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.businessCode) !== null && _ref64 !== void 0 ? _ref64 : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.business_code,
+        platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.platform),
+        businessCode: (_ref65 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.businessCode) !== null && _ref65 !== void 0 ? _ref65 : (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.business_code,
         channel: params === null || params === void 0 ? void 0 : params.channel,
         type: params === null || params === void 0 ? void 0 : params.type,
         summary: this.store.summary || createEmptySummary(),
         enhance: function enhance(nextPayload) {
-          var _ref65, _tempOrder$order_numb, _ref66, _tempOrder$shop_order, _ref67, _tempOrder$shop_full_;
+          var _ref66, _tempOrder$order_numb, _ref67, _tempOrder$shop_order, _ref68, _tempOrder$shop_full_;
           return _objectSpread(_objectSpread({}, nextPayload), {}, {
-            order_number: (_ref65 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref65 !== void 0 ? _ref65 : null,
-            shop_order_number: (_ref66 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref66 !== void 0 ? _ref66 : null,
-            shop_full_order_number: (_ref67 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref67 !== void 0 ? _ref67 : null,
+            order_number: (_ref66 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref66 !== void 0 ? _ref66 : null,
+            shop_order_number: (_ref67 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref67 !== void 0 ? _ref67 : null,
+            shop_full_order_number: (_ref68 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref68 !== void 0 ? _ref68 : null,
             small_ticket_data_flag: 1
           });
         }
@@ -3475,7 +3626,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "submitTempOrder",
     value: (function () {
       var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
-        var _params$cacheId2, _this$otherParams4, _ref68, _params$businessCode2, _this$otherParams5, _this$otherParams6;
+        var _params$cacheId2, _this$otherParams5, _ref69, _params$businessCode2, _this$otherParams6, _this$otherParams7;
         var tempOrder, latestSummary, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee24$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
@@ -3520,8 +3671,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
-                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.platform),
-                businessCode: (_ref68 = (_params$businessCode2 = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode2 !== void 0 ? _params$businessCode2 : (_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.businessCode) !== null && _ref68 !== void 0 ? _ref68 : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.business_code,
+                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.platform),
+                businessCode: (_ref69 = (_params$businessCode2 = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode2 !== void 0 ? _params$businessCode2 : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref69 !== void 0 ? _ref69 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: params === null || params === void 0 ? void 0 : params.type,
                 summary: latestSummary,
@@ -4324,19 +4475,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       };
       var tempOrderExtend = nextTempOrder._extend;
       var productsByUid = tempOrderExtend.productsByUid || {};
-      var _iterator18 = _createForOfIteratorHelper(nextTempOrder.products.entries()),
-        _step18;
+      var _iterator20 = _createForOfIteratorHelper(nextTempOrder.products.entries()),
+        _step20;
       try {
-        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-          var _product$metadata7, _ref69, _ref70, _existed$origin, _rawProduct$metadata;
-          var _step18$value = _slicedToArray(_step18.value, 2),
-            index = _step18$value[0],
-            product = _step18$value[1];
+        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
+          var _product$metadata7, _ref70, _ref71, _existed$origin, _rawProduct$metadata;
+          var _step20$value = _slicedToArray(_step20.value, 2),
+            index = _step20$value[0],
+            product = _step20$value[1];
           var uid = (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.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;
-          var origin = (_ref69 = (_ref70 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref70 !== void 0 ? _ref70 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref69 !== void 0 ? _ref69 : rawProduct;
+          var origin = (_ref70 = (_ref71 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref71 !== void 0 ? _ref71 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref70 !== void 0 ? _ref70 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -4352,9 +4503,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           });
         }
       } catch (err) {
-        _iterator18.e(err);
+        _iterator20.e(err);
       } finally {
-        _iterator18.f();
+        _iterator20.f();
       }
       tempOrderExtend.productsByUid = productsByUid;
       if ((options === null || options === void 0 ? void 0 : options.ensureIdentity) !== false) {
@@ -4385,18 +4536,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var segments = [];
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       if (Array.isArray(sku.variant)) {
-        var _iterator19 = _createForOfIteratorHelper(sku.variant),
-          _step19;
+        var _iterator21 = _createForOfIteratorHelper(sku.variant),
+          _step21;
         try {
-          for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-            var variant = _step19.value;
+          for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
+            var variant = _step21.value;
             var segment = this.formatHydratedNamePair(variant === null || variant === void 0 ? void 0 : variant.group, variant === null || variant === void 0 ? void 0 : variant.item);
             if (segment) segments.push(segment);
           }
         } catch (err) {
-          _iterator19.e(err);
+          _iterator21.e(err);
         } finally {
-          _iterator19.f();
+          _iterator21.f();
         }
       }
       return segments.join(', ');
@@ -4404,10 +4555,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref71, _optionItem$num, _ref72, _optionItem$add_price;
-      var rawNum = (_ref71 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref71 !== void 0 ? _ref71 : 1;
+      var _ref72, _optionItem$num, _ref73, _optionItem$add_price;
+      var rawNum = (_ref72 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref72 !== void 0 ? _ref72 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref72 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref72 !== void 0 ? _ref72 : 0;
+      var rawPrice = (_ref73 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref73 !== void 0 ? _ref73 : 0;
       var parsedPrice = Number(rawPrice);
       var normalized = _objectSpread(_objectSpread({}, optionItem), {}, {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
@@ -4498,67 +4649,67 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var amount = new Decimal(discount.amount || 0).times(qty).plus(((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0);
         savedMap.set(discountKey, (savedMap.get(discountKey) || new Decimal(0)).plus(amount));
       };
-      var _iterator20 = _createForOfIteratorHelper(productList),
-        _step20;
+      var _iterator22 = _createForOfIteratorHelper(productList),
+        _step22;
       try {
-        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-          var product = _step20.value;
+        for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
+          var product = _step22.value;
           var qty = product.num || 1;
-          var _iterator22 = _createForOfIteratorHelper(product.discount_list || []),
-            _step22;
+          var _iterator24 = _createForOfIteratorHelper(product.discount_list || []),
+            _step24;
           try {
-            for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-              var pd = _step22.value;
+            for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
+              var pd = _step24.value;
               addDiscountAmount(pd, qty);
             }
           } catch (err) {
-            _iterator22.e(err);
+            _iterator24.e(err);
           } finally {
-            _iterator22.f();
+            _iterator24.f();
           }
-          var _iterator23 = _createForOfIteratorHelper(product.product_bundle || []),
-            _step23;
+          var _iterator25 = _createForOfIteratorHelper(product.product_bundle || []),
+            _step25;
           try {
-            for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
-              var _ref73, _bundle$num3;
-              var bundle = _step23.value;
-              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref73 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref73 !== void 0 ? _ref73 : 1) || 1).toNumber();
-              var _iterator24 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
-                _step24;
+            for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
+              var _ref74, _bundle$num3;
+              var bundle = _step25.value;
+              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref74 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref74 !== void 0 ? _ref74 : 1) || 1).toNumber();
+              var _iterator26 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
+                _step26;
               try {
-                for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-                  var _pd = _step24.value;
+                for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
+                  var _pd = _step26.value;
                   addDiscountAmount(_pd, bundleQty);
                 }
               } catch (err) {
-                _iterator24.e(err);
+                _iterator26.e(err);
               } finally {
-                _iterator24.f();
+                _iterator26.f();
               }
             }
           } catch (err) {
-            _iterator23.e(err);
+            _iterator25.e(err);
           } finally {
-            _iterator23.f();
+            _iterator25.f();
           }
         }
       } catch (err) {
-        _iterator20.e(err);
+        _iterator22.e(err);
       } finally {
-        _iterator20.f();
+        _iterator22.f();
       }
-      var _iterator21 = _createForOfIteratorHelper(discountList),
-        _step21;
+      var _iterator23 = _createForOfIteratorHelper(discountList),
+        _step23;
       try {
-        for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
-          var d = _step21.value;
+        for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
+          var d = _step23.value;
           var key = d.id;
           d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
         }
       } catch (err) {
-        _iterator21.e(err);
+        _iterator23.e(err);
       } finally {
-        _iterator21.f();
+        _iterator23.f();
       }
     }
   }]);

package/dist/modules/Order/utils.js

@@ -677,7 +677,7 @@ function normalizeSubmitProduct(product) {
     payment_price: (_submitProduct$paymen = submitProduct.payment_price) !== null && _submitProduct$paymen !== void 0 ? _submitProduct$paymen : submitProduct.selling_price
   });
 }
-var SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type'];
+var SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type', 'holder'];
 export function normalizeBookingIsAll(booking) {
   return booking.is_all === true || booking.is_all === 1 || booking.is_all === '1' || booking.is_all === 'true' ? 1 : 0;
 }

package/dist/server/modules/order/utils/filterBookings.js

@@ -54,6 +54,29 @@ function bookingDateTimeString(datePart, timePart) {
   }
   return "".concat(d, " ").concat(t).trim();
 }
+
+/**
+ * 解析预约自身的起止时间区间，供 `sales_time_between` 做区间重叠匹配。
+ *
+ * @example
+ * const span = resolveBookingTimeRange({ start_date: '2026-06-09', start_time: '10:00', end_date: '2026-06-15', end_time: '10:00' })
+ */
+function resolveBookingTimeRange(booking) {
+  var start = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
+  if (!start) return null;
+  var end = toTimestamp(bookingDateTimeString(booking.end_date || booking.start_date, booking.end_time || booking.start_time)) || start;
+  return end >= start ? [start, end] : [end, start];
+}
+
+/**
+ * 判断两个闭区间是否有交集。
+ *
+ * @example
+ * isRangeOverlapping([1, 10], [5, 6]) // true
+ */
+function isRangeOverlapping(left, right) {
+  return left[0] <= right[1] && left[1] >= right[0];
+}
 function parseDateRange(range) {
   if (!Array.isArray(range) || range.length < 2) return null;
   var start = toRangeBoundary(range[0], false);
@@ -160,8 +183,8 @@ function matchBooking(booking, orderInfo, ctx) {
   }
   if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking))) return false;
   if (ctx.bookingTimeRange) {
-    var ts = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
-    if (ts < ctx.bookingTimeRange[0] || ts > ctx.bookingTimeRange[1]) return false;
+    var bookingRange = resolveBookingTimeRange(booking);
+    if (!bookingRange || !isRangeOverlapping(bookingRange, ctx.bookingTimeRange)) return false;
   }
   if (ctx.afterExecutionTimeMs != null) {
     var bookingStartMs = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));

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 | 1 | 2 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -330,7 +330,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -310,7 +310,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

@@ -1,49 +0,0 @@
-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/BookingContext/utils/cacheItemToBookingInput.d.ts

@@ -67,6 +67,7 @@ export interface BookingMetadataInput {
     capacity?: number | BookingCapacityMetadataItem[];
     /** 协议要求始终提交（即使为 null）。 */
     holder_id: any;
+    holder?: any;
     resource_select_type?: 'single' | 'multiple' | string;
 }
 /**

package/lib/modules/BookingContext/utils/cacheItemToBookingInput.js

@@ -174,6 +174,9 @@ function cacheItemToBookingInput(cacheItem, options) {
   if (ext.holder_id !== void 0 && ext.holder_id !== null) {
     metadata.holder_id = ext.holder_id;
   }
+  if (ext.holder !== void 0) {
+    metadata.holder = ext.holder;
+  }
   if (ext.collect_pax !== void 0)
     metadata.collect_pax = ext.collect_pax;
   const extendCapacity = normalizeExtendCapacityForMetadata(ext.capacity);

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

@@ -186,6 +186,41 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private ensureExtend;
     private captureProductRuntime;
     private createLinkedProductAndBooking;
+    /**
+     * booking.holder 是提交真源；metadata.holder 作为详情/回显冗余字段同步保存。
+     *
+     * @example
+     * this.syncBookingMetadataHolder(booking, metadata);
+     */
+    private syncBookingMetadataHolder;
+    /**
+     * 从单条 booking 的 holder / metadata 中收集 holder form_record。
+     *
+     * @example
+     * const ids = this.collectBookingHolderRecords(booking);
+     */
+    private collectBookingHolderRecords;
+    /**
+     * 按 form_record 顺序读取 booking holder 的主字段名称。
+     *
+     * @example
+     * const names = this.collectBookingHolderNames(booking);
+     */
+    private collectBookingHolderNames;
+    /**
+     * 按老 ticketBooking `formatHolder` 语义汇总订单顶层 holder。
+     *
+     * @example
+     * const holder = this.buildTempOrderHolderFromBookings(tempOrder);
+     */
+    private buildTempOrderHolderFromBookings;
+    /**
+     * 将 booking 级 holder 汇总到 tempOrder 顶层 holder。
+     *
+     * @example
+     * this.syncTempOrderHolderFromBookings(tempOrder);
+     */
+    private syncTempOrderHolderFromBookings;
     private getBookingUniqueIdentificationNumber;
     private findBookingIndexByUniqueIdentificationNumber;
     private removeLinkedBookingsForProduct;

package/lib/modules/Order/index.js

@@ -1438,6 +1438,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
     productMetadata.unique_identification_number = productUid;
     bookingMetadata.unique_identification_number = bookingUid;
+    this.syncBookingMetadataHolder(params.booking, bookingMetadata);
     return {
       productUid,
       bookingUid,
@@ -1459,6 +1460,110 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
     };
   }
+  /**
+   * booking.holder 是提交真源；metadata.holder 作为详情/回显冗余字段同步保存。
+   *
+   * @example
+   * this.syncBookingMetadataHolder(booking, metadata);
+   */
+  syncBookingMetadataHolder(booking, metadata) {
+    if ((booking == null ? void 0 : booking.holder) !== void 0) {
+      metadata.holder = booking.holder;
+    }
+  }
+  /**
+   * 从单条 booking 的 holder / metadata 中收集 holder form_record。
+   *
+   * @example
+   * const ids = this.collectBookingHolderRecords(booking);
+   */
+  collectBookingHolderRecords(booking) {
+    var _a;
+    const holder = (booking == null ? void 0 : booking.holder) && typeof booking.holder === "object" ? booking.holder : null;
+    const source = (holder == null ? void 0 : holder.form_record) ?? ((_a = booking == null ? void 0 : booking.metadata) == null ? void 0 : _a.holder_id);
+    const records = Array.isArray(source) ? source : [source];
+    return records.filter((record) => record !== void 0 && record !== null && record !== "");
+  }
+  /**
+   * 按 form_record 顺序读取 booking holder 的主字段名称。
+   *
+   * @example
+   * const names = this.collectBookingHolderNames(booking);
+   */
+  collectBookingHolderNames(booking) {
+    const holder = (booking == null ? void 0 : booking.holder) && typeof booking.holder === "object" ? booking.holder : null;
+    const rawName = holder == null ? void 0 : holder.name;
+    if (Array.isArray(rawName)) {
+      return rawName.map((name) => String(name || "").trim());
+    }
+    if (typeof rawName === "string") {
+      return rawName.split(",").map((name) => name.trim());
+    }
+    return [];
+  }
+  /**
+   * 按老 ticketBooking `formatHolder` 语义汇总订单顶层 holder。
+   *
+   * @example
+   * const holder = this.buildTempOrderHolderFromBookings(tempOrder);
+   */
+  buildTempOrderHolderFromBookings(tempOrder) {
+    var _a, _b;
+    const holderRecords = [];
+    const holderNames = [];
+    let baseHolder = null;
+    const seen = /* @__PURE__ */ new Set();
+    for (const booking of tempOrder.bookings || []) {
+      const holder = (booking == null ? void 0 : booking.holder) && typeof booking.holder === "object" ? booking.holder : null;
+      if (!baseHolder && holder) {
+        baseHolder = holder;
+      }
+      const records = this.collectBookingHolderRecords(booking);
+      const names = this.collectBookingHolderNames(booking);
+      for (const [index, record] of records.entries()) {
+        const key = String(record);
+        if (seen.has(key))
+          continue;
+        seen.add(key);
+        holderRecords.push(record);
+        if (names[index]) {
+          holderNames.push(names[index]);
+        }
+      }
+    }
+    if (!holderRecords.length) {
+      return null;
+    }
+    const nextHolder = {
+      customer_id: (baseHolder == null ? void 0 : baseHolder.customer_id) ?? tempOrder.customer_id,
+      form_id: (baseHolder == null ? void 0 : baseHolder.form_id) ?? ((_a = tempOrder.holder) == null ? void 0 : _a.form_id) ?? 0,
+      form_record: holderRecords
+    };
+    if (holderNames.length) {
+      nextHolder.name = holderNames.join(",");
+    }
+    if ((baseHolder == null ? void 0 : baseHolder.is_source_shop) || ((_b = this.otherParams) == null ? void 0 : _b.isFranchisee)) {
+      nextHolder.is_source_shop = 1;
+    }
+    return nextHolder;
+  }
+  /**
+   * 将 booking 级 holder 汇总到 tempOrder 顶层 holder。
+   *
+   * @example
+   * this.syncTempOrderHolderFromBookings(tempOrder);
+   */
+  syncTempOrderHolderFromBookings(tempOrder) {
+    const bookings = tempOrder.bookings || [];
+    const hasHolderSource = bookings.some((booking) => {
+      var _a;
+      return (booking == null ? void 0 : booking.holder) !== void 0 || ((_a = booking == null ? void 0 : booking.metadata) == null ? void 0 : _a.holder_id) !== void 0;
+    });
+    const nextHolder = this.buildTempOrderHolderFromBookings(tempOrder);
+    if (nextHolder || hasHolderSource || bookings.length === 0) {
+      tempOrder.holder = nextHolder;
+    }
+  }
   getBookingUniqueIdentificationNumber(booking) {
     var _a;
     const uid = (_a = booking == null ? void 0 : booking.metadata) == null ? void 0 : _a.unique_identification_number;
@@ -1996,6 +2101,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * await this.finalizeProductOrderMutation(tempOrder);
    */
   async finalizeProductOrderMutation(tempOrder) {
+    this.syncTempOrderHolderFromBookings(tempOrder);
     await this.ensureEditDiscountConfigForProductChange(tempOrder);
     await this.applyPromotion();
     this.applyDiscount();
@@ -2360,6 +2466,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder.bookings = [...tempOrder.bookings || [], linked.booking];
     }
     tempOrder.products[productIndex] = normalizedProduct;
+    this.syncTempOrderHolderFromBookings(tempOrder);
     this.captureProductRuntime(
       tempOrder,
       updates,
@@ -2458,9 +2565,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         unique_identification_number: bookingUid
       }
     };
+    this.syncBookingMetadataHolder(nextBooking, nextBooking.metadata);
     nextBooking.is_all = (0, import_utils.normalizeBookingIsAll)(nextBooking);
     nextBooking.sub_type = (0, import_utils.normalizeBookingSubType)(nextBooking);
     tempOrder.bookings[bookingIndex] = nextBooking;
+    this.syncTempOrderHolderFromBookings(tempOrder);
     this.persistTempOrder();
     return tempOrder.bookings;
   }
@@ -2472,6 +2581,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * await this.finalizeAfterProductsMutation(tempOrder);
    */
   async finalizeAfterProductsMutation(tempOrder) {
+    this.syncTempOrderHolderFromBookings(tempOrder);
     await this.applyPromotion();
     this.applyDiscount();
     this.sanitizeTempOrderProducts(tempOrder);
@@ -2513,6 +2623,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const tempOrder = this.ensureTempOrder();
     tempOrder.products = [];
     tempOrder.bookings = [];
+    this.syncTempOrderHolderFromBookings(tempOrder);
     if (tempOrder._extend && typeof tempOrder._extend === "object") {
       tempOrder._extend = {
         ...tempOrder._extend,

package/lib/modules/Order/utils.js

@@ -608,7 +608,8 @@ var SUBMIT_BOOKING_METADATA_WHITELIST = [
   "collect_pax",
   "capacity",
   "holder_id",
-  "resource_select_type"
+  "resource_select_type",
+  "holder"
 ];
 function normalizeBookingIsAll(booking) {
   return booking.is_all === true || booking.is_all === 1 || booking.is_all === "1" || booking.is_all === "true" ? 1 : 0;

package/lib/server/modules/order/utils/filterBookings.js

@@ -71,6 +71,21 @@ function bookingDateTimeString(datePart, timePart) {
   }
   return `${d} ${t}`.trim();
 }
+function resolveBookingTimeRange(booking) {
+  const start = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
+  if (!start)
+    return null;
+  const end = toTimestamp(
+    bookingDateTimeString(
+      booking.end_date || booking.start_date,
+      booking.end_time || booking.start_time
+    )
+  ) || start;
+  return end >= start ? [start, end] : [end, start];
+}
+function isRangeOverlapping(left, right) {
+  return left[0] <= right[1] && left[1] >= right[0];
+}
 function parseDateRange(range) {
   if (!Array.isArray(range) || range.length < 2)
     return null;
@@ -178,8 +193,8 @@ function matchBooking(booking, orderInfo, ctx) {
   if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking)))
     return false;
   if (ctx.bookingTimeRange) {
-    const ts = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
-    if (ts < ctx.bookingTimeRange[0] || ts > ctx.bookingTimeRange[1])
+    const bookingRange = resolveBookingTimeRange(booking);
+    if (!bookingRange || !isRangeOverlapping(bookingRange, ctx.bookingTimeRange))
       return false;
   }
   if (ctx.afterExecutionTimeMs != null) {

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 | 1 | 2 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -330,7 +330,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -310,7 +310,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.2.211",
+  "version": "2.2.212",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",