@pisell/pisellos 0.10.21 → 0.10.22

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

@@ -1,9 +0,0 @@
-// 导出评估器
-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, ITEM_REWARD_STRATEGY } from "./examples";

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

@@ -19,12 +19,15 @@ export declare class BookingContextModule extends BaseModule implements Module,
     protected defaultVersion: string;
     private request;
     private store;
+    private otherParams;
     /** 上次成功 loadBookingConfig 的 query key；命中则不再请求。 */
     private lastConfigQueryKey;
     /** 上次成功 loadResources 的 query key（date|bookingIds）；命中则不再请求。 */
     private lastResourcesQueryKey;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    /** 同步父级解决方案的运行态参数；platform 变化后会自然切换 config endpoint/cache key。 */
+    updateOtherParams(params: Record<string, any>): void;
     loadBookingConfig(params?: LoadBookingConfigParams, options?: {
         forceRefresh?: boolean;
     }): Promise<BookingContextConfig | null>;

package/dist/modules/BookingContext/index.js

@@ -26,6 +26,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import dayjs from 'dayjs';
 import { BaseModule } from "../BaseModule";
 import { RequestModeENUM } from "../../plugins/request";
+import { normalizeRuntimePlatform } from "../../utils/platform";
 import { BookingContextEvent } from "./types";
 import { formatResourceListAndMap } from "./utils/formatResourceList";
 export * from "./types";
@@ -40,6 +41,8 @@ var DEFAULT_BOOKING_CONFIG_PARAMS = {
   item_type: 'appointment_booking',
   sub_type: 'ticket'
 };
+var BOOKING_CONFIG_ENDPOINT = '/core/board/management/config';
+var H5_BOOKING_CONFIG_ENDPOINT = '/core/board/config';
 var BOARD_CONFIG_CACHE = {
   useCache: true,
   cache: {
@@ -153,6 +156,24 @@ export function buildBookingConfigQueryKey() {
   });
   return JSON.stringify(sorted);
 }
+function resolveBookingConfigRequest(platform) {
+  var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var isH5 = normalizeRuntimePlatform(platform) === 'h5';
+  var endpoint = isH5 ? H5_BOOKING_CONFIG_ENDPOINT : BOOKING_CONFIG_ENDPOINT;
+  var query = isH5 ? {
+    item_type: params.item_type || DEFAULT_BOOKING_CONFIG_PARAMS.item_type
+  } : _objectSpread(_objectSpread({}, DEFAULT_BOOKING_CONFIG_PARAMS), params);
+  var keys = Object.keys(query).sort();
+  var sortedQuery = {};
+  keys.forEach(function (key) {
+    sortedQuery[key] = query[key];
+  });
+  return {
+    endpoint: endpoint,
+    query: query,
+    key: "".concat(endpoint, ":").concat(JSON.stringify(sortedQuery))
+  };
+}
 
 /** 稳定序列化资源列表查询（date + bookingIds），用于跳过重复 loadResources。 */
 export function buildBookingResourcesQueryKey() {
@@ -176,6 +197,7 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", _objectSpread({}, EMPTY_STATE));
+    _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     /** 上次成功 loadBookingConfig 的 query key；命中则不再请求。 */
     _defineProperty(_assertThisInitialized(_this), "lastConfigQueryKey", null);
     /** 上次成功 loadResources 的 query key（date|bookingIds）；命中则不再请求。 */
@@ -201,6 +223,7 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('BookingContextModule 需要 request 插件支持');
             case 5:
+              this.otherParams = options.otherParams || {};
               this.store = {
                 bookingConfig: null,
                 resourcesOrigin: [],
@@ -218,7 +241,7 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
               if (initialState.date) {
                 this.store.date = initialState.date;
               }
-            case 10:
+            case 11:
             case "end":
               return _context.stop();
           }
@@ -228,16 +251,22 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
         return _initialize.apply(this, arguments);
       }
       return initialize;
-    }()
+    }() /** 同步父级解决方案的运行态参数；platform 变化后会自然切换 config endpoint/cache key。 */
+  }, {
+    key: "updateOtherParams",
+    value: function updateOtherParams(params) {
+      this.otherParams = params || {};
+    }
   }, {
     key: "loadBookingConfig",
     value: function () {
       var _loadBookingConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _this2 = this;
+        var _this$otherParams,
+          _this2 = this;
         var params,
           options,
+          requestConfig,
           configKey,
-          query,
           sharedKey,
           _sharedBookingConfigC,
           cached,
@@ -250,14 +279,14 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               params = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
               options = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : {};
-              configKey = buildBookingConfigQueryKey(params);
+              requestConfig = resolveBookingConfigRequest((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.platform, params);
+              configKey = requestConfig.key;
               if (!(!options.forceRefresh && this.store.bookingConfig != null && this.lastConfigQueryKey === configKey)) {
-                _context3.next = 5;
+                _context3.next = 6;
                 break;
               }
               return _context3.abrupt("return", this.store.bookingConfig);
-            case 5:
-              query = _objectSpread(_objectSpread({}, DEFAULT_BOOKING_CONFIG_PARAMS), params);
+            case 6:
               sharedKey = buildSharedCacheKey(this.request, configKey);
               if (!(!options.forceRefresh && sharedBookingConfigCache.has(sharedKey))) {
                 _context3.next = 12;
@@ -277,7 +306,7 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
                       case 0:
                         _context2.prev = 0;
                         _context2.next = 3;
-                        return _this2.request.get('/core/board/management/config', query, BOARD_CONFIG_CACHE);
+                        return _this2.request.get(requestConfig.endpoint, requestConfig.query, BOARD_CONFIG_CACHE);
                       case 3:
                         res = _context2.sent;
                         _config = (_res$data = res === null || res === void 0 ? void 0 : res.data) !== null && _res$data !== void 0 ? _res$data : null;
@@ -411,9 +440,9 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isBookingContextReady",
     value: function isBookingContextReady() {
-      var _ref3, _params$date2;
+      var _this$otherParams2, _ref3, _params$date2;
       var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var configKey = buildBookingConfigQueryKey(params.bookingConfigParams);
+      var configKey = resolveBookingConfigRequest((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.platform, params.bookingConfigParams).key;
       var dateInput = (_ref3 = (_params$date2 = params.date) !== null && _params$date2 !== void 0 ? _params$date2 : this.store.date) !== null && _ref3 !== void 0 ? _ref3 : dayjs();
       var queryDate = toScheduleQueryDate(dateInput);
       var resourcesKey = buildBookingResourcesQueryKey({
@@ -428,7 +457,7 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
     key: "initBookingContext",
     value: function () {
       var _initBookingContext = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var _ref4, _params$date3;
+        var _ref4, _params$date3, _this$otherParams3;
         var params,
           dateInput,
           queryDate,
@@ -450,7 +479,7 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context6.abrupt("return", this.getState());
             case 6:
-              configKey = buildBookingConfigQueryKey(params.bookingConfigParams);
+              configKey = resolveBookingConfigRequest((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.platform, params.bookingConfigParams).key;
               resourcesKey = buildBookingResourcesQueryKey({
                 date: queryDate,
                 bookingIds: params.bookingIds

package/dist/modules/BookingContext/types.d.ts

@@ -1,7 +1,7 @@
 /**
  * BookingContext 子模块：承载「预约 UI 上下文」三件套。
  *
- *  - bookingConfig：来自 `/core/board/management/config` 的整套预约配置（service_time / resource_tab /
+ *  - bookingConfig：来自 staff `/core/board/management/config` 或 H5 `/core/board/config` 的整套预约配置（service_time / resource_tab /
  *    appointment_subject / subject_require / stock_setting / basic / capacity 等）。
  *  - resourcesOrigin / resourcesOriginMap：来自 `/schedule/resource/list` 的资源全集，含 times / event_list /
  *    combined_resource 等运行态信息，是 getResourceByIds / getResourceTimeIsUsable 的输入。
@@ -11,7 +11,7 @@
  *  - 默认由 `loadBookingConfig` / `loadResources` 拉取并写入 store；也支持消费方 `set*` 直接灌入（复用 ticketBooking 已拉到的数据）。
  *  - 所有读 API 返回浅克隆（数组）或原引用（map / config），避免 UI 写穿。
  */
-/** `loadBookingConfig` 入参，与 ticketBooking `getBookingConfig` 一致。 */
+/** `loadBookingConfig` 入参；H5 公共接口只消费 `item_type`。 */
 export interface LoadBookingConfigParams {
     item_type?: string;
     sub_type?: string;
@@ -42,7 +42,7 @@ export interface InitBookingContextParams {
 export type BookingContextResource = Record<string, any>;
 export type BookingContextResourceMap = Record<string, BookingContextResource>;
 /**
- * 形参 booking_config（结构来自 `/core/board/management/config` 接口）。
+ * 形参 booking_config（结构来自 staff management 或 H5 board config 接口的 `data`）。
  * OS 不强制 schema，保留 `Record<string, any>` 兼容现网；常用路径文档化在 SDK docs。
  */
 export type BookingContextConfig = Record<string, any>;
@@ -80,7 +80,7 @@ export interface BookingContextModuleAPI {
     getState(): BookingContextState;
     /** 一键清空，destroy / 切租户场景用。 */
     clear(): void;
-    /** 拉取 board config 并写入 store（`/core/board/management/config`）。 */
+    /** 按运行平台拉取 board config 并写入 store。 */
     loadBookingConfig(params?: LoadBookingConfigParams): Promise<BookingContextConfig | null>;
     /** 拉取资源全集并写入 store（`/schedule/resource/list`）。 */
     loadResources(params?: LoadBookingResourcesParams): Promise<BookingContextResource[]>;

package/dist/modules/BookingContext/types.js

@@ -1,7 +1,7 @@
 /**
  * BookingContext 子模块：承载「预约 UI 上下文」三件套。
  *
- *  - bookingConfig：来自 `/core/board/management/config` 的整套预约配置（service_time / resource_tab /
+ *  - bookingConfig：来自 staff `/core/board/management/config` 或 H5 `/core/board/config` 的整套预约配置（service_time / resource_tab /
  *    appointment_subject / subject_require / stock_setting / basic / capacity 等）。
  *  - resourcesOrigin / resourcesOriginMap：来自 `/schedule/resource/list` 的资源全集，含 times / event_list /
  *    combined_resource 等运行态信息，是 getResourceByIds / getResourceTimeIsUsable 的输入。
@@ -12,7 +12,7 @@
  *  - 所有读 API 返回浅克隆（数组）或原引用（map / config），避免 UI 写穿。
  */
 
-/** `loadBookingConfig` 入参，与 ticketBooking `getBookingConfig` 一致。 */
+/** `loadBookingConfig` 入参；H5 公共接口只消费 `item_type`。 */
 
 /** `loadResources` 入参，与 info2 `getResourceList` 一致。 */
 
@@ -24,7 +24,7 @@
  */
 
 /**
- * 形参 booking_config（结构来自 `/core/board/management/config` 接口）。
+ * 形参 booking_config（结构来自 staff management 或 H5 board config 接口的 `data`）。
  * OS 不强制 schema，保留 `Record<string, any>` 兼容现网；常用路径文档化在 SDK docs。
  */
 

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

@@ -192,10 +192,11 @@ function synthesizeProductResourceFromBooking(booking) {
  * 调用方须传入与该行关联的 booking（通常 bookings[].product_uid === product.metadata.unique_identification_number）。
  */
 export function buildCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$bundle_edit, _product$product_vari, _product$num, _ref11, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref12, _extension_type, _booking$product2, _booking$product3, _price, _product$product_sku, _product$order_detail, _ref13, _booking$id;
+  var _ref11, _sourceProduct$holder, _sourceProduct$origin, _product$metadata, _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$bundle_edit, _product$product_vari, _product$num, _ref12, _product$note, _booking$detail2, _product$metadata2, _product$metadata3, _ref13, _extension_type, _booking$product2, _booking$product3, _price, _product$product_sku, _product$order_detail, _ref14, _booking$id;
   var product = input.product,
     booking = input.booking,
     sourceProduct = input.sourceProduct;
+  var holderConfig = (_ref11 = (_sourceProduct$holder = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.holder_config) !== null && _sourceProduct$holder !== void 0 ? _sourceProduct$holder : sourceProduct === null || sourceProduct === void 0 || (_sourceProduct$origin = sourceProduct.origin) === null || _sourceProduct$origin === void 0 ? void 0 : _sourceProduct$origin.holder_config) !== null && _ref11 !== void 0 ? _ref11 : (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.holder_config;
   var resolvedId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id;
   var selling = Number((_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : 0);
   var original = Number((_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : selling);
@@ -229,7 +230,7 @@ export function buildCacheItemFromOrderLine(input) {
     quantity: (_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : 1,
     product_name: productTitle,
     product_cover: productCover,
-    note: (_ref11 = (_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : booking === null || booking === void 0 || (_booking$detail2 = booking.detail) === null || _booking$detail2 === void 0 ? void 0 : _booking$detail2.note) !== null && _ref11 !== void 0 ? _ref11 : '',
+    note: (_ref12 = (_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : booking === null || booking === void 0 || (_booking$detail2 = booking.detail) === null || _booking$detail2 === void 0 ? void 0 : _booking$detail2.note) !== null && _ref12 !== void 0 ? _ref12 : '',
     price: mainProductPrice,
     total: selling,
     origin_total: original,
@@ -238,7 +239,7 @@ export function buildCacheItemFromOrderLine(input) {
     holder_id: holderId,
     other: other,
     like_status: booking.like_status || 'common',
-    discount_reason: resolveManualDiscountMessage(product.discount_list, (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.product_discount_reason) || undefined
+    discount_reason: resolveManualDiscountMessage(product.discount_list, (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.product_discount_reason) || undefined
   }, bundleEdit !== undefined ? {
     bundle_edit: bundleEdit
   } : {}), productOptionString ? {
@@ -254,7 +255,7 @@ export function buildCacheItemFromOrderLine(input) {
       extend.origin_total = selling + manualAmount;
     }
   }
-  if (((_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.price_override) != null || manualDiscount) {
+  if (((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.price_override) != null || manualDiscount) {
     extend.priceOverride = selling;
   }
   if (booking.holder !== undefined) {
@@ -263,10 +264,12 @@ export function buildCacheItemFromOrderLine(input) {
   if (Array.isArray(booking.relation_forms)) {
     extend.relation_forms = booking.relation_forms;
   }
-  var base = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
+  var base = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), holderConfig !== undefined && holderConfig !== null ? {
+    holder_config: holderConfig
+  } : {}), {}, {
     id: resolvedId,
     product_id: resolvedId,
-    extension_type: (_ref12 = (_extension_type = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type) !== null && _extension_type !== void 0 ? _extension_type : booking === null || booking === void 0 || (_booking$product2 = booking.product) === null || _booking$product2 === void 0 ? void 0 : _booking$product2.extension_type) !== null && _ref12 !== void 0 ? _ref12 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
+    extension_type: (_ref13 = (_extension_type = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type) !== null && _extension_type !== void 0 ? _extension_type : booking === null || booking === void 0 || (_booking$product2 = booking.product) === null || _booking$product2 === void 0 ? void 0 : _booking$product2.extension_type) !== null && _ref13 !== void 0 ? _ref13 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
     title: productTitle || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || (booking === null || booking === void 0 || (_booking$product3 = booking.product) === null || _booking$product3 === void 0 ? void 0 : _booking$product3.title),
     price: (_price = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price !== void 0 ? _price : selling,
     selling_price: product.selling_price,
@@ -280,7 +283,7 @@ export function buildCacheItemFromOrderLine(input) {
     new: 0,
     autoClose: false,
     order_detail_id: (_product$order_detail = product.order_detail_id) !== null && _product$order_detail !== void 0 ? _product$order_detail : null,
-    booking_id: (_ref13 = (_booking$id = booking.id) !== null && _booking$id !== void 0 ? _booking$id : booking.booking_id) !== null && _ref13 !== void 0 ? _ref13 : 0
+    booking_id: (_ref14 = (_booking$id = booking.id) !== null && _booking$id !== void 0 ? _booking$id : booking.booking_id) !== null && _ref14 !== void 0 ? _ref14 : 0
   });
   if ((sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.capacity) !== undefined) {
     base.capacity = sourceProduct.capacity;

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

@@ -415,6 +415,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * if (pending) await pending;
      */
     private appendProductLineToTempOrder;
+    /**
+     * booking 数量拆行时，若 Holder 数量与拆行数严格一致，则按下标分配。
+     * 数量不一致时保持旧数据，避免猜测 Holder 与商品份数的对应关系。
+     */
+    private createSplitBookingLine;
     /**
      * 添加商品行。带 booking 时强制独立行；num>1 时拆成多条 num=1 的 product+booking（对齐 BookingByStep / ticketBooking addService）。
      *