@pisell/pisellos 2.2.210 → 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/index.d.ts

@@ -3,6 +3,13 @@ import { BaseModule } from '../BaseModule';
 import { BookingContextConfig, BookingContextDateInput, BookingContextModuleAPI, BookingContextResource, BookingContextResourceMap, BookingContextState, InitBookingContextParams, LoadBookingConfigParams, LoadBookingResourcesParams } from './types';
 export * from './types';
 export * from './utils';
+/**
+ * 清理跨实例共享缓存，仅供单元测试隔离使用。
+ *
+ * @example
+ * __clearBookingContextSharedCacheForTest();
+ */
+export declare function __clearBookingContextSharedCacheForTest(): void;
 /** 稳定序列化 config 查询参数，用于判断是否与上次 loadBookingConfig 一致。 */
 export declare function buildBookingConfigQueryKey(params?: LoadBookingConfigParams): string;
 /** 稳定序列化资源列表查询（date + bookingIds），用于跳过重复 loadResources。 */
@@ -18,8 +25,12 @@ export declare class BookingContextModule extends BaseModule implements Module,
     private lastResourcesQueryKey;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
-    loadBookingConfig(params?: LoadBookingConfigParams): Promise<BookingContextConfig | null>;
-    loadResources(params?: LoadBookingResourcesParams): Promise<BookingContextResource[]>;
+    loadBookingConfig(params?: LoadBookingConfigParams, options?: {
+        forceRefresh?: boolean;
+    }): Promise<BookingContextConfig | null>;
+    loadResources(params?: LoadBookingResourcesParams, options?: {
+        forceRefresh?: boolean;
+    }): Promise<BookingContextResource[]>;
     /**
      * store 内是否已具备与本次 init 入参等价的 config / resources（不再打接口）。
      */

package/dist/modules/BookingContext/index.js

@@ -55,6 +55,50 @@ var RESOURCE_LIST_CACHE = {
     type: 'memory'
   }
 };
+var requestScopeIds = new WeakMap();
+var nextRequestScopeId = 1;
+var sharedBookingConfigCache = new Map();
+var sharedBookingConfigPending = new Map();
+var sharedResourcesCache = new Map();
+var sharedResourcesPending = new Map();
+
+/**
+ * 为 request 插件生成稳定作用域，避免不同 request 客户端之间共享缓存数据。
+ *
+ * @example
+ * const scopedKey = buildSharedCacheKey(requestPlugin, '{"sub_type":"ticket"}');
+ */
+function getRequestScopeId(request) {
+  var key = request;
+  var existed = requestScopeIds.get(key);
+  if (existed) return existed;
+  var id = nextRequestScopeId++;
+  requestScopeIds.set(key, id);
+  return id;
+}
+
+/**
+ * 共享缓存 key = request 作用域 + 已稳定序列化的业务参数。
+ *
+ * @example
+ * const cacheKey = buildSharedCacheKey(requestPlugin, '2026-06-10|1,2');
+ */
+function buildSharedCacheKey(request, queryKey) {
+  return "".concat(getRequestScopeId(request), ":").concat(queryKey);
+}
+
+/**
+ * 清理跨实例共享缓存，仅供单元测试隔离使用。
+ *
+ * @example
+ * __clearBookingContextSharedCacheForTest();
+ */
+export function __clearBookingContextSharedCacheForTest() {
+  sharedBookingConfigCache.clear();
+  sharedBookingConfigPending.clear();
+  sharedResourcesCache.clear();
+  sharedResourcesPending.clear();
+}
 
 /**
  * 把多形态 date 入参 normalize 成字符串。
@@ -188,40 +232,82 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadBookingConfig",
     value: function () {
-      var _loadBookingConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _res$data;
+      var _loadBookingConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var _this2 = this;
         var params,
+          options,
           configKey,
           query,
-          res,
+          sharedKey,
+          _sharedBookingConfigC,
+          cached,
+          pending,
+          requestPromise,
           config,
-          _args2 = arguments;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+          _args3 = arguments;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              params = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+              params = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
+              options = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : {};
               configKey = buildBookingConfigQueryKey(params);
-              if (!(this.store.bookingConfig != null && this.lastConfigQueryKey === configKey)) {
-                _context2.next = 4;
+              if (!(!options.forceRefresh && this.store.bookingConfig != null && this.lastConfigQueryKey === configKey)) {
+                _context3.next = 5;
                 break;
               }
-              return _context2.abrupt("return", this.store.bookingConfig);
-            case 4:
+              return _context3.abrupt("return", this.store.bookingConfig);
+            case 5:
               query = _objectSpread(_objectSpread({}, DEFAULT_BOOKING_CONFIG_PARAMS), params);
-              _context2.next = 7;
-              return this.request.get('/core/board/management/config', query, BOARD_CONFIG_CACHE);
-            case 7:
-              res = _context2.sent;
-              config = (_res$data = res === null || res === void 0 ? void 0 : res.data) !== null && _res$data !== void 0 ? _res$data : null;
-              console.log('config123', config);
+              sharedKey = buildSharedCacheKey(this.request, configKey);
+              if (!(!options.forceRefresh && sharedBookingConfigCache.has(sharedKey))) {
+                _context3.next = 12;
+                break;
+              }
+              cached = (_sharedBookingConfigC = sharedBookingConfigCache.get(sharedKey)) !== null && _sharedBookingConfigC !== void 0 ? _sharedBookingConfigC : null;
+              this.setBookingConfig(cached);
+              this.lastConfigQueryKey = configKey;
+              return _context3.abrupt("return", cached);
+            case 12:
+              pending = !options.forceRefresh ? sharedBookingConfigPending.get(sharedKey) : undefined;
+              if (!pending) {
+                requestPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+                  var _res$data, res, _config;
+                  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                    while (1) switch (_context2.prev = _context2.next) {
+                      case 0:
+                        _context2.prev = 0;
+                        _context2.next = 3;
+                        return _this2.request.get('/core/board/management/config', 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;
+                        sharedBookingConfigCache.set(sharedKey, _config);
+                        return _context2.abrupt("return", _config);
+                      case 7:
+                        _context2.prev = 7;
+                        sharedBookingConfigPending.delete(sharedKey);
+                        return _context2.finish(7);
+                      case 10:
+                      case "end":
+                        return _context2.stop();
+                    }
+                  }, _callee2, null, [[0,, 7, 10]]);
+                }))();
+                pending = requestPromise;
+                sharedBookingConfigPending.set(sharedKey, requestPromise);
+              }
+              _context3.next = 16;
+              return pending;
+            case 16:
+              config = _context3.sent;
               this.setBookingConfig(config);
-              this.lastConfigQueryKey = buildBookingConfigQueryKey(params);
-              return _context2.abrupt("return", config);
-            case 13:
+              this.lastConfigQueryKey = configKey;
+              return _context3.abrupt("return", config);
+            case 20:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function loadBookingConfig() {
         return _loadBookingConfig.apply(this, arguments);
@@ -231,48 +317,88 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadResources",
     value: function () {
-      var _loadResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _params$date;
+      var _loadResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+        var _params$date,
+          _this3 = this;
         var params,
+          options,
           date,
           resourcesKey,
-          res,
-          _formatResourceListAn,
+          sharedKey,
+          _sharedResourcesCache,
+          cached,
+          pending,
+          requestPromise,
           list,
-          _args3 = arguments;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+          _args5 = arguments;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              params = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
+              params = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {};
+              options = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
               date = toScheduleQueryDate((_params$date = params.date) !== null && _params$date !== void 0 ? _params$date : this.store.date);
               resourcesKey = buildBookingResourcesQueryKey({
                 date: date,
                 bookingIds: params.bookingIds
               });
-              if (!(this.lastResourcesQueryKey === resourcesKey)) {
-                _context3.next = 5;
+              if (!(!options.forceRefresh && this.lastResourcesQueryKey === resourcesKey)) {
+                _context5.next = 6;
                 break;
               }
-              return _context3.abrupt("return", this.getResourcesOrigin());
-            case 5:
-              _context3.next = 7;
-              return this.request.get('/schedule/resource/list', {
-                date: date
-              }, RESOURCE_LIST_CACHE);
-            case 7:
-              res = _context3.sent;
-              _formatResourceListAn = formatResourceListAndMap(res === null || res === void 0 ? void 0 : res.data, params.bookingIds || []), list = _formatResourceListAn.list;
-              this.setResources(list);
-              this.lastResourcesQueryKey = buildBookingResourcesQueryKey({
-                date: date,
-                bookingIds: params.bookingIds
-              });
-              return _context3.abrupt("return", list);
+              return _context5.abrupt("return", this.getResourcesOrigin());
+            case 6:
+              sharedKey = buildSharedCacheKey(this.request, resourcesKey);
+              if (!(!options.forceRefresh && sharedResourcesCache.has(sharedKey))) {
+                _context5.next = 12;
+                break;
+              }
+              cached = (_sharedResourcesCache = sharedResourcesCache.get(sharedKey)) !== null && _sharedResourcesCache !== void 0 ? _sharedResourcesCache : [];
+              this.setResources(cached);
+              this.lastResourcesQueryKey = resourcesKey;
+              return _context5.abrupt("return", this.getResourcesOrigin());
             case 12:
+              pending = !options.forceRefresh ? sharedResourcesPending.get(sharedKey) : undefined;
+              if (!pending) {
+                requestPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+                  var res, _formatResourceListAn, _list;
+                  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                    while (1) switch (_context4.prev = _context4.next) {
+                      case 0:
+                        _context4.prev = 0;
+                        _context4.next = 3;
+                        return _this3.request.get('/schedule/resource/list', {
+                          date: date
+                        }, RESOURCE_LIST_CACHE);
+                      case 3:
+                        res = _context4.sent;
+                        _formatResourceListAn = formatResourceListAndMap(res === null || res === void 0 ? void 0 : res.data, params.bookingIds || []), _list = _formatResourceListAn.list;
+                        sharedResourcesCache.set(sharedKey, _list);
+                        return _context4.abrupt("return", _list);
+                      case 7:
+                        _context4.prev = 7;
+                        sharedResourcesPending.delete(sharedKey);
+                        return _context4.finish(7);
+                      case 10:
+                      case "end":
+                        return _context4.stop();
+                    }
+                  }, _callee4, null, [[0,, 7, 10]]);
+                }))();
+                pending = requestPromise;
+                sharedResourcesPending.set(sharedKey, requestPromise);
+              }
+              _context5.next = 16;
+              return pending;
+            case 16:
+              list = _context5.sent;
+              this.setResources(list);
+              this.lastResourcesQueryKey = resourcesKey;
+              return _context5.abrupt("return", this.getResourcesOrigin());
+            case 20:
             case "end":
-              return _context3.stop();
+              return _context5.stop();
           }
-        }, _callee3, this);
+        }, _callee5, this);
       }));
       function loadResources() {
         return _loadResources.apply(this, arguments);
@@ -285,10 +411,10 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isBookingContextReady",
     value: function isBookingContextReady() {
-      var _ref, _params$date2;
+      var _ref3, _params$date2;
       var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var configKey = buildBookingConfigQueryKey(params.bookingConfigParams);
-      var dateInput = (_ref = (_params$date2 = params.date) !== null && _params$date2 !== void 0 ? _params$date2 : this.store.date) !== null && _ref !== void 0 ? _ref : dayjs();
+      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({
         date: queryDate,
@@ -301,8 +427,8 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "initBookingContext",
     value: function () {
-      var _initBookingContext = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var _ref2, _params$date3;
+      var _initBookingContext = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        var _ref4, _params$date3;
         var params,
           dateInput,
           queryDate,
@@ -310,19 +436,19 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
           resourcesKey,
           needConfig,
           needResources,
-          _args4 = arguments;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+          _args6 = arguments;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              params = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
-              dateInput = (_ref2 = (_params$date3 = params.date) !== null && _params$date3 !== void 0 ? _params$date3 : this.store.date) !== null && _ref2 !== void 0 ? _ref2 : dayjs();
+              params = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {};
+              dateInput = (_ref4 = (_params$date3 = params.date) !== null && _params$date3 !== void 0 ? _params$date3 : this.store.date) !== null && _ref4 !== void 0 ? _ref4 : dayjs();
               queryDate = toScheduleQueryDate(dateInput);
               this.setDate(dateInput);
               if (!(!params.forceRefresh && this.isBookingContextReady(params))) {
-                _context4.next = 6;
+                _context6.next = 6;
                 break;
               }
-              return _context4.abrupt("return", this.getState());
+              return _context6.abrupt("return", this.getState());
             case 6:
               configKey = buildBookingConfigQueryKey(params.bookingConfigParams);
               resourcesKey = buildBookingResourcesQueryKey({
@@ -332,28 +458,32 @@ export var BookingContextModule = /*#__PURE__*/function (_BaseModule) {
               needConfig = params.forceRefresh || this.store.bookingConfig == null || this.lastConfigQueryKey !== configKey;
               needResources = params.loadResources !== false && (params.forceRefresh || this.lastResourcesQueryKey !== resourcesKey);
               if (!needConfig) {
-                _context4.next = 13;
+                _context6.next = 13;
                 break;
               }
-              _context4.next = 13;
-              return this.loadBookingConfig(params.bookingConfigParams);
+              _context6.next = 13;
+              return this.loadBookingConfig(params.bookingConfigParams, {
+                forceRefresh: params.forceRefresh
+              });
             case 13:
               if (!needResources) {
-                _context4.next = 16;
+                _context6.next = 16;
                 break;
               }
-              _context4.next = 16;
+              _context6.next = 16;
               return this.loadResources({
                 date: queryDate,
                 bookingIds: params.bookingIds
+              }, {
+                forceRefresh: params.forceRefresh
               });
             case 16:
-              return _context4.abrupt("return", this.getState());
+              return _context6.abrupt("return", this.getState());
             case 17:
             case "end":
-              return _context4.stop();
+              return _context6.stop();
           }
-        }, _callee4, this);
+        }, _callee6, this);
       }));
       function initBookingContext() {
         return _initBookingContext.apply(this, arguments);

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;
@@ -328,6 +363,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     }): Promise<T>;
     private markLocalOrderSynced;
     private isSubmitResponseRejected;
+    private isLocalPendingSubmitResult;
     private isSubmitErrorResponse;
     private extractSubmitErrorResponse;
     private logSubmitBackendRejected;