@pisell/pisellos 0.0.549 → 0.0.551

package/dist/solution/VenueBooking/types.d.ts

@@ -1,5 +1,6 @@
 import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType, DateModule, ScheduleModule, QuotationModule, OpenDataModule } from '../../modules';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
+import { HolderModule } from '../../modules/Holder';
 export type { ScanOrderOrderProductIdentity, ScanOrderOrderProduct, ScanOrderSubmitProduct, ScanOrderSummary, ScanOrderTempOrder, ScanOrderSubmitPayload, } from '../ScanOrder/types';
 export declare enum VenueBookingHooks {
     onInited = "venueBooking:onInited",
@@ -145,6 +146,7 @@ export interface VenueBookingState {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
+    holder?: HolderModule;
 }
 export interface VenueBookingLoggerRuntimeConfig {
     provider?: ScanOrderLoggerProviderType;

package/dist/types/index.d.ts

@@ -6,6 +6,7 @@ export interface Plugin {
     version: string;
     initialize: () => Promise<void> | void;
     destroy?: () => Promise<void> | void;
+    getLocalStorage?: (key: string) => string | null;
 }
 export interface PluginOptions {
     dependencies?: string[];

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

@@ -57,6 +57,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private getTempOrderStorageKey;
     private restoreTempOrderFromStorage;
     persistTempOrder(): void;
+    notifyTempOrderChanged(): void;
     private createDefaultTempOrderInstance;
     ensureTempOrder(): ScanOrderTempOrder;
     restoreOrder(): ScanOrderTempOrder;

package/lib/modules/Order/index.js

@@ -328,6 +328,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return;
     this.window.localStorage.setItem(key, JSON.stringify(this.store.tempOrder));
   }
+  notifyTempOrderChanged() {
+    if (!this.store.tempOrder)
+      return;
+    this.store.tempOrder = {
+      ...this.store.tempOrder,
+      products: [...this.store.tempOrder.products],
+      bookings: this.store.tempOrder.bookings ? [...this.store.tempOrder.bookings] : []
+    };
+    this.persistTempOrder();
+  }
   // ─── TempOrder: 创建 & 获取 ───
   createDefaultTempOrderInstance() {
     return (0, import_utils.createDefaultTempOrder)({
@@ -605,6 +615,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         }
         const discountList = (0, import_utils.getAllDiscountList)(item);
         item._origin.product.discount_list = discountList;
+        (0, import_utils.ensureCartItemOriginHolder)(item);
         if ((0, import_utils2.isNormalProduct)(item._origin)) {
           order.relation_products.push(item._origin.product);
           const relationForms = item._origin.relation_forms || [];

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

@@ -235,6 +235,8 @@ export interface OrderModuleAPI {
     updateProductInOrder: (params: UpdateProductInOrderParams) => Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder: (identity: ScanOrderOrderProductIdentity) => Promise<ScanOrderOrderProduct[]>;
     persistTempOrder: () => void;
+    /** 提交 tempOrder 变更并触发 `{moduleName}:changed` 事件 */
+    notifyTempOrderChanged: () => void;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;

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

@@ -86,6 +86,15 @@ export declare const mergeRelationForms: (relationForms: {
     form_id: number;
     form_record_ids: number[];
 }[];
+export interface CartOrderHolder {
+    customer_id?: number;
+    form_id: number | string;
+    form_record: (number | string)[] | null;
+}
+/**
+ * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
+ */
+export declare function ensureCartItemOriginHolder(cartItem: CartItem): void;
 export declare const getAllDiscountList: (cartItem: CartItem) => any;
 export declare function createUuidV4(): string;
 export declare function isTempOrder(data: any): data is ScanOrderTempOrder;

package/lib/modules/Order/utils.js

@@ -33,8 +33,9 @@ __export(utils_exports, {
   composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
-  createEmptySummary: () => import_utils2.createEmptySummary,
+  createEmptySummary: () => import_utils3.createEmptySummary,
   createUuidV4: () => createUuidV4,
+  ensureCartItemOriginHolder: () => ensureCartItemOriginHolder,
   filterProductsForScanOrderMore: () => filterProductsForScanOrderMore,
   formatDateTime: () => formatDateTime,
   formatV1Product: () => formatV1Product,
@@ -50,8 +51,9 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
-var import_utils = require("../../solution/ScanOrder/utils");
+var import_utils = require("../Holder/utils");
 var import_utils2 = require("../../solution/ScanOrder/utils");
+var import_utils3 = require("../../solution/ScanOrder/utils");
 function composeLinePrice(params) {
   const { mainPrice, bundle, useOriginalBundle } = params;
   let total = new import_decimal.default(Number(mainPrice) || 0);
@@ -113,7 +115,7 @@ function createDefaultOrderRulesHooks() {
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
         // 不透明 identity 契约下，normalizeOrderProduct / restoreTempOrderFromStorage 已保证 identity_key 必存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
-        _id: product.identity_key ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
+        _id: product.identity_key ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils2.buildProductLineFingerprint)(
           product.product_option_item,
           product.product_bundle
         )}`,
@@ -196,6 +198,30 @@ var mergeRelationForms = (relationForms) => {
     }, {})
   ).filter((item) => item.form_record_ids.length > 0);
 };
+function resolveCartItemHolderCustomerId(cartItem) {
+  var _a, _b, _c;
+  const origin = cartItem._origin;
+  const account = (_a = origin == null ? void 0 : origin.metadata) == null ? void 0 : _a.account;
+  return ((_b = origin == null ? void 0 : origin.holder) == null ? void 0 : _b.customer_id) ?? ((_c = account == null ? void 0 : account._origin) == null ? void 0 : _c.customer_id) ?? (account == null ? void 0 : account.customer_id);
+}
+function ensureCartItemOriginHolder(cartItem) {
+  var _a;
+  if ((_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.holder) {
+    return;
+  }
+  const holderConfig = (0, import_utils.getProductHolderConfig)(
+    (cartItem == null ? void 0 : cartItem._productInit) ?? (cartItem == null ? void 0 : cartItem._productOrigin)
+  );
+  const formRecordId = cartItem == null ? void 0 : cartItem.holder_id;
+  if (!(holderConfig == null ? void 0 : holderConfig.resource_id) || formRecordId == null) {
+    return;
+  }
+  cartItem._origin.holder = {
+    customer_id: resolveCartItemHolderCustomerId(cartItem),
+    form_id: holderConfig.resource_id,
+    form_record: [formRecordId]
+  };
+}
 var getAllDiscountList = (cartItem) => {
   var _a, _b, _c, _d;
   let discountList = ((_b = (_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
@@ -378,7 +404,7 @@ function resolveSubmitCollectPax(tempOrder) {
   return normalizeSubmitCollectPaxValue((_a = tempOrder.metadata) == null ? void 0 : _a.collect_pax);
 }
 function createDefaultTempOrder(params) {
-  const summary = params.summary || (0, import_utils.createEmptySummary)();
+  const summary = params.summary || (0, import_utils2.createEmptySummary)();
   return {
     order_id: null,
     relation_id: void 0,
@@ -437,7 +463,7 @@ function buildSubmitPayload(params) {
     enhance
   } = params;
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
-  const summary = tempOrder.summary || (0, import_utils.createEmptySummary)();
+  const summary = tempOrder.summary || (0, import_utils2.createEmptySummary)();
   const relationId = tempOrder.relation_id;
   const tableFormId = tempOrder.table_form_id;
   const bookingUuid = createUuidV4();
@@ -540,6 +566,7 @@ function formatV1Product(products) {
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
+  ensureCartItemOriginHolder,
   filterProductsForScanOrderMore,
   formatDateTime,
   formatV1Product,

package/lib/plugins/window.d.ts

@@ -16,6 +16,7 @@ export interface WindowPlugin extends Plugin {
     history: History;
     interaction?: any;
     getWalletPassEvaluator?: () => WalletPassEvaluator;
+    getLocalStorage?: (key: string) => string | null;
 }
 /**
  * 简单的 Storage 接口实现

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

@@ -367,7 +367,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/BookingByStep/index.js

@@ -612,6 +612,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     date,
     account
   }) {
+    var _a, _b;
     const {
       bundle,
       options,
@@ -644,12 +645,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
     }
     try {
-      this.store.holder.ensureFormByProduct({
-        product: productData,
-        customer_id: (account == null ? void 0 : account.id) ? Number(account.id) : 16121,
-        shop_id: (productData == null ? void 0 : productData.shop_id) || "",
-        useCache: true
-      });
+      const customer = JSON.parse(((_b = (_a = this.window) == null ? void 0 : _a.getLocalStorage) == null ? void 0 : _b.call(_a, "customer")) || "{}");
+      if (customer == null ? void 0 : customer.id) {
+        this.store.holder.ensureFormByProduct({
+          product: productData,
+          customer_id: Number(customer.id),
+          shop_id: (productData == null ? void 0 : productData.shop_id) || "",
+          useCache: true
+        });
+      }
     } catch (error) {
       console.error("[BookingByStep] 加载 holder 表单失败", error);
     }

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

@@ -7,6 +7,7 @@ import type { OpenDataAvailabilityResult } from '../../modules/OpenData';
 import type { ProductData } from '../../modules/Product/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
+import type { IAppendFormRecordParams } from '../../modules/Holder/types';
 export * from './types';
 interface VenueBookingItemRuleRuntimeConfig {
     strategyConfigs?: StrategyConfig[];
@@ -52,6 +53,13 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     constructor(name?: string, version?: string);
     private normalizeCustomerId;
     private resolveCustomerIdFromLoginPayload;
+    private resolveHolderCustomerId;
+    private ensureProductHolderForm;
+    /**
+     * 按商品 holder_config 预加载表单数据到 holderMap。
+     * appointment_booking 在加购时触发；venueBooking 在商品加载后预加载，避免 getHolderFormMap 为空。
+     */
+    private preloadHolderForms;
     private clearLoginEffectListeners;
     private registerLoginEffect;
     private registerCustomerLoginListeners;
@@ -193,6 +201,15 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     setUIState(key: string, value: any): void;
     getUIState<T = any>(key: string): T | undefined;
     deleteUIState(key: string): void;
+    setBookingHolder(bookingUid: string, holder: any): void;
+    /**
+     * 获取 holder 表单 map
+     */
+    getHolderFormMap(): import("../../modules/Holder").HolderFormMap;
+    /**
+     * 添加表单记录
+     */
+    appendFormRecord(params: IAppendFormRecordParams): import("../../modules/Holder").IFormRecord;
     checkOpenDataAvailability(): Promise<OpenDataAvailabilityResult>;
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;

package/lib/solution/VenueBooking/index.js

@@ -54,6 +54,8 @@ var import_utils3 = require("../../modules/Order/utils");
 var import_Order = require("../../modules/Order");
 var import_types4 = require("../RegisterAndLogin/types");
 var import_decimal = __toESM(require("decimal.js"));
+var import_Holder = require("../../modules/Holder");
+var import_utils4 = require("../../modules/Holder/utils");
 __reExport(VenueBooking_exports, require("./types"), module.exports);
 var OPEN_DATA_SECTION_CODES = [
   "basic",
@@ -253,6 +255,46 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
     return null;
   }
+  resolveHolderCustomerId() {
+    var _a, _b;
+    const customer = JSON.parse(((_b = (_a = this.window) == null ? void 0 : _a.getLocalStorage) == null ? void 0 : _b.call(_a, "customer")) || "{}");
+    if (customer == null ? void 0 : customer.id)
+      return Number(customer.id);
+    return void 0;
+  }
+  async ensureProductHolderForm(product) {
+    if (!product)
+      return;
+    await this.preloadHolderForms([product]);
+  }
+  /**
+   * 按商品 holder_config 预加载表单数据到 holderMap。
+   * appointment_booking 在加购时触发；venueBooking 在商品加载后预加载，避免 getHolderFormMap 为空。
+   */
+  async preloadHolderForms(products) {
+    if (!this.store.holder || !products.length)
+      return;
+    const seenFormIds = /* @__PURE__ */ new Set();
+    for (const product of products) {
+      const holderConfig = (0, import_utils4.getProductHolderConfig)(product);
+      if (!holderConfig)
+        continue;
+      const formId = (0, import_utils4.getFormIdFromHolderConfig)(holderConfig);
+      if (seenFormIds.has(formId))
+        continue;
+      seenFormIds.add(formId);
+      try {
+        await this.store.holder.ensureFormByProduct({
+          product,
+          customer_id: this.resolveHolderCustomerId(),
+          shop_id: product.shop_id,
+          useCache: true
+        });
+      } catch (error) {
+        console.error("[VenueBooking] 预加载 holder 表单失败", { formId, error });
+      }
+    }
+  }
   clearLoginEffectListeners() {
     for (const dispose of this.loginEffectDisposers) {
       dispose();
@@ -326,7 +368,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async initialize(core, options = {}) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
     this.logMethodStart("initialize");
     this.core = core;
     this.initializeOptions = options || {};
@@ -451,20 +493,42 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         cacheId: (_g = this.otherParams) == null ? void 0 : _g.cacheId
       }
     });
+    let holderCacheState;
+    if ((_h = this.otherParams) == null ? void 0 : _h.cacheId) {
+      const sessionData = this.window.sessionStorage.getItem(this.name);
+      if (sessionData) {
+        try {
+          const data = JSON.parse(sessionData);
+          holderCacheState = (_i = data[this.otherParams.cacheId]) == null ? void 0 : _i[`${this.name}_holder`];
+        } catch {
+        }
+      }
+    }
+    const holderModule = new import_Holder.HolderModule(`${this.name}_holder`);
+    this.store.holder = holderModule;
+    this.core.registerModule(holderModule, {
+      initialState: holderCacheState,
+      otherParams: {
+        ...this.otherParams,
+        fatherModule: this.name,
+        openCache: !!((_j = this.otherParams) == null ? void 0 : _j.cacheId),
+        cacheId: (_k = this.otherParams) == null ? void 0 : _k.cacheId
+      }
+    });
     if (this.store.scanOrderLogger) {
       this.store.scanOrderLogger.setContext(this.getLoggerContext());
     }
     this.registerCustomerLoginListeners();
     console.log("[VenueBooking] 初始化开始");
     try {
-      await ((_h = this.store.order) == null ? void 0 : _h.recalculateSummary({ createIfMissing: false }));
-      (_i = this.store.order) == null ? void 0 : _i.persistTempOrder();
+      await ((_l = this.store.order) == null ? void 0 : _l.recalculateSummary({ createIfMissing: false }));
+      (_m = this.store.order) == null ? void 0 : _m.persistTempOrder();
       await this.loadRuntimeConfigs();
       if (this.store.schedule) {
         await this.store.schedule.loadAllSchedule();
         this.injectScheduleResolverToQuotation();
-        (_k = this.store.quotation) == null ? void 0 : _k.loadQuotations({
-          channel: (_j = this.otherParams) == null ? void 0 : _j.channel
+        (_o = this.store.quotation) == null ? void 0 : _o.loadQuotations({
+          channel: (_n = this.otherParams) == null ? void 0 : _n.channel
         });
       }
       await this.refreshItemRuleQuantityLimits();
@@ -580,6 +644,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       }
       this.store.addonProducts.addProduct(addonList);
       this.resourceProductMap = (0, import_resource.buildResourceProductMap)(venueList);
+      await this.preloadHolderForms(venueList);
       this.productsLoaded = true;
       this.logMethodSuccess("loadAllProducts", {
         total: list.length,
@@ -1009,6 +1074,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     const childRawResources = this.getCombinedChildRawResources(rawResource);
     const venueProduct = this.getVenueProducts().find((p) => p.id === mapping.productId);
     tempOrder.bookings = tempOrder.bookings || [];
+    await this.ensureProductHolderForm(venueProduct);
     for (let i = 0; i < merged.length; i++) {
       const group = merged[i];
       const identityKey = (0, import_slotMerge.buildVenueIdentityKey)(resourceId, i);
@@ -1080,7 +1146,9 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
               product_option_item: [],
               discount_list: [],
               custom_deposit_data: customDepositData,
-              metadata: {}
+              metadata: {},
+              holder_config: venueProduct == null ? void 0 : venueProduct.holder_config,
+              bookingUuid
             },
             sub_type: "minutes",
             duration,
@@ -1896,6 +1964,46 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       this.writeUIStateBucket(bucket);
     }
   }
+  setBookingHolder(bookingUid, holder) {
+    var _a, _b, _c, _d;
+    if (!this.store.order)
+      return;
+    const tempOrder = this.store.order.ensureTempOrder();
+    const booking = (_a = tempOrder.bookings) == null ? void 0 : _a.find(
+      (b) => {
+        var _a2;
+        return ((_a2 = b.metadata) == null ? void 0 : _a2.unique_identification_number) === bookingUid;
+      }
+    );
+    if (booking) {
+      booking.holder = holder;
+    }
+    for (const product of tempOrder.products) {
+      const productBookingUid = ((_b = product.metadata) == null ? void 0 : _b.booking_uid) ?? ((_d = (_c = product._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.bookingUuid);
+      if (String(productBookingUid) !== String(bookingUid))
+        continue;
+      const origin = product._origin && typeof product._origin === "object" ? product._origin : {};
+      origin.holder = holder;
+      product._origin = origin;
+    }
+    this.store.order.notifyTempOrderChanged();
+  }
+  /**
+   * 获取 holder 表单 map
+   */
+  getHolderFormMap() {
+    if (!this.store.holder)
+      throw new Error("[VenueBooking] holder 模块未初始化");
+    return this.store.holder.getHolderFormMap();
+  }
+  /**
+   * 添加表单记录
+   */
+  appendFormRecord(params) {
+    if (!this.store.holder)
+      throw new Error("[VenueBooking] holder 模块未初始化");
+    return this.store.holder.appendFormRecord(params);
+  }
   // ─── OpenData 可用性 ───
   async checkOpenDataAvailability() {
     if (!this.store.openData)

package/lib/solution/VenueBooking/types.d.ts

@@ -1,5 +1,6 @@
 import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType, DateModule, ScheduleModule, QuotationModule, OpenDataModule } from '../../modules';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
+import { HolderModule } from '../../modules/Holder';
 export type { ScanOrderOrderProductIdentity, ScanOrderOrderProduct, ScanOrderSubmitProduct, ScanOrderSummary, ScanOrderTempOrder, ScanOrderSubmitPayload, } from '../ScanOrder/types';
 export declare enum VenueBookingHooks {
     onInited = "venueBooking:onInited",
@@ -145,6 +146,7 @@ export interface VenueBookingState {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
+    holder?: HolderModule;
 }
 export interface VenueBookingLoggerRuntimeConfig {
     provider?: ScanOrderLoggerProviderType;

package/lib/types/index.d.ts

@@ -6,6 +6,7 @@ export interface Plugin {
     version: string;
     initialize: () => Promise<void> | void;
     destroy?: () => Promise<void> | void;
+    getLocalStorage?: (key: string) => string | null;
 }
 export interface PluginOptions {
     dependencies?: string[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.549",
+  "version": "0.0.551",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md}\"",
     "changeset": "changeset",
     "version": "changeset version",
-    "release": "changeset publish --registry=https://registry.npmjs.com/ && npm run sync && git push",
+    "release": "changeset publish && npm run sync && git push",
     "example": "npx parcel-bundler examples/index.html",
     "docs": "typedoc --out docs src/index.ts",
     "sync": "node sync.js",