@pisell/pisellos 2.2.242 → 2.2.244

package/lib/solution/VenueBooking/index.js

@@ -118,27 +118,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       moduleName: "venueBooking"
     };
   }
-  safeStringify(value) {
-    try {
-      return JSON.stringify(value);
-    } catch {
-      return void 0;
-    }
-  }
-  pickErrorMessage(error) {
-    var _a, _b, _c, _d;
-    const candidates = [
-      error.message,
-      (_a = error.data) == null ? void 0 : _a.message,
-      (_c = (_b = error.response) == null ? void 0 : _b.data) == null ? void 0 : _c.message,
-      (_d = error.error) == null ? void 0 : _d.message
-    ];
-    for (const candidate of candidates) {
-      if (typeof candidate === "string" && candidate.trim())
-        return candidate;
-    }
-    return void 0;
-  }
   serializeError(error) {
     if (error instanceof Error) {
       return {
@@ -147,17 +126,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         stack: error.stack
       };
     }
-    if (error && typeof error === "object") {
-      const raw = error;
-      const message = this.pickErrorMessage(raw) || this.safeStringify(raw) || String(error);
-      return {
-        ...typeof raw.name === "string" ? { name: raw.name } : {},
-        message,
-        ..."code" in raw ? { code: raw.code } : {},
-        ..."status" in raw ? { status: raw.status } : {},
-        ...this.safeStringify(raw) ? { raw: this.safeStringify(raw) } : {}
-      };
-    }
     return {
       message: String(error)
     };
@@ -373,14 +341,12 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       if (targetModule) {
         this.store[step] = targetModule;
         const initialState = step === "salesSummary" ? {
+          // TODO(Order types): VenueBooking should read OrderState.summary instead of tempOrder.summary.
           summary: ((_b2 = (_a2 = this.store.order) == null ? void 0 : _a2.getTempOrder()) == null ? void 0 : _b2.summary) || (0, import_utils.createEmptySummary)()
         } : {};
         const loggerProvider = ((_c2 = this.otherParams) == null ? void 0 : _c2.loggerProvider) || "feishu";
         const loggerConfig = ((_d2 = this.otherParams) == null ? void 0 : _d2.loggerConfig) || {
-          feishu: {
-            webhook: "https://open.feishu.cn/open-apis/bot/v2/hook/8f069b14-9d39-4728-8f78-b56f393bfde8",
-            errorHook: "https://open.feishu.cn/open-apis/bot/v2/hook/bdefae5e-f233-4705-8688-946887d9543d"
-          }
+          feishu: {}
         };
         this.core.registerModule(targetModule, {
           initialState,
@@ -558,10 +524,8 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         throw new Error("venueProducts 模块未初始化");
       if (!this.store.addonProducts)
         throw new Error("addonProducts 模块未初始化");
-      await this.loadOpenDataConfig();
       const associatedMenus = ((_b = (_a = this.otherParams) == null ? void 0 : _a.openData) == null ? void 0 : _b["menu.associated_menus"]) || [];
       if (!associatedMenus.length) {
-        this.logMethodError("loadAllProducts", new Error("未获取到餐牌配置（menu.associated_menus），请检查 OpenData 配置"));
         throw new Error("未获取到餐牌配置（menu.associated_menus），请检查 OpenData 配置");
       }
       const menuListIds = associatedMenus.map((n) => Number(n.value));
@@ -1025,7 +989,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         form_id: (rawResource == null ? void 0 : rawResource.form_id) ?? mapping.formId,
         relation_id: resourceId,
         capacity: 1,
-        metadata: (0, import_slotMerge.buildVenueResourceMetadata)({ mapping, rawResource })
+        metadata: {}
       };
       if (childRawResources && childRawResources.length) {
         resourceEntry.children = childRawResources.map((child) => ({
@@ -1077,7 +1041,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
               product_variant_id: 0,
               num: 1,
               product_bundle: [],
-              product_sku: { option: [] },
+              product_option_item: [],
               discount_list: [],
               custom_deposit_data: customDepositData,
               metadata: {}
@@ -1348,7 +1312,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
           (sum, pd) => sum + (pd.amount || 0),
           0
         );
-        const optionSum = (0, import_utils3.sumOptionUnitPrice)((0, import_utils3.getProductSkuOptions)(product));
+        const optionSum = (0, import_utils3.sumOptionUnitPrice)(product.product_option_item);
         const sourcePrice = ((_d = product.metadata) == null ? void 0 : _d.source_product_price) ?? (((_e = product.metadata) == null ? void 0 : _e.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
         const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
@@ -1395,8 +1359,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
   getOrderProducts() {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    const products = this.store.order.getOrderProducts();
-    return products;
+    return this.store.order.getOrderProducts();
   }
   async getSummary() {
     this.logMethodStart("getSummary");
@@ -1472,23 +1435,23 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
-  async updateOrderProduct(params) {
-    this.logMethodStart("updateOrderProduct", {
+  async updateProductInOrder(params) {
+    this.logMethodStart("updateProductInOrder", {
       product_id: params.product_id,
       product_variant_id: params.product_variant_id
     });
     try {
       if (!this.store.order)
         throw new Error("order 模块未初始化");
-      const products = await this.store.order.updateOrderProduct(params);
+      const products = await this.store.order.updateProductInOrder(params);
       await this.refreshItemRuleQuantityLimits();
       await this.refreshCartValidationPassed();
-      this.logMethodSuccess("updateOrderProduct", {
+      this.logMethodSuccess("updateProductInOrder", {
         productCount: products.length
       });
       return products;
     } catch (error) {
-      this.logMethodError("updateOrderProduct", error);
+      this.logMethodError("updateProductInOrder", error);
       throw error;
     }
   }
@@ -1567,19 +1530,18 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       return cachedData;
     }
     if (this.loadOpenDataConfigInFlight)
-      return await this.loadOpenDataConfigInFlight;
+      return this.loadOpenDataConfigInFlight;
     this.loadOpenDataConfigInFlight = this.store.openData.fetchOpenData({
       scope: "board",
       target: "venue_booking+online_store",
       section_code: [...OPEN_DATA_SECTION_CODES]
-    });
-    try {
-      const openDataConfig = await this.loadOpenDataConfigInFlight;
+    }).then((openDataConfig) => {
       this.otherParams.openData = openDataConfig;
       return openDataConfig;
-    } finally {
+    }).finally(() => {
       this.loadOpenDataConfigInFlight = null;
-    }
+    });
+    return this.loadOpenDataConfigInFlight;
   }
   async loadRuntimeConfigs() {
     await this.loadOpenDataConfig();
@@ -1755,6 +1717,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         ...targetProduct,
         ...delta > 0 ? { num: (0, import_utils.getSafeProductNum)(existedQuantity + delta) } : {},
         metadata: { ...targetProduct.metadata || {}, item_rule_prefill: true, item_rule_id: prefillItem.ruleId },
+        // TODO(Order types): migrate VenueBooking prefill origin runtime into tempOrder._extend.
         _origin: sourceItem ? { ...targetProduct._origin || {}, ...sourceItem } : targetProduct._origin
       };
       if (delta > 0 || Boolean(

package/lib/solution/VenueBooking/sales-section-4-annotated.json

@@ -71,6 +71,8 @@
         "num__comment": "数量；int；↕；必填。统一使用 num，不再使用 product_quantity。",
         "product_variant_id": 0,
         "product_variant_id__comment": "多规格 ID；int；↕；可选。",
+        "product_option_item": [],
+        "product_option_item__comment": "选项配置；array；↕；可选。",
         "selling_price": "50.00",
         "selling_price__comment": "销售单价（交易快照）；string；←；服务端返回，不能依赖基准数据回填。",
         "original_price": "60.00",

package/lib/solution/VenueBooking/utils/slotMerge.d.ts

@@ -12,10 +12,6 @@ export declare function buildPriceBreakdown(params: {
         }) => number;
     };
 }): PriceBreakdownEntry[];
-export declare function buildVenueResourceMetadata(params: {
-    mapping: ResourceProductMapping;
-    rawResource: VenueResourceRawData | undefined;
-}): Record<string, any>;
 export interface BuildVenueBookingParams {
     group: MergedSlotGroup;
     resourceId: number | string;

package/lib/solution/VenueBooking/utils/slotMerge.js

@@ -32,7 +32,6 @@ __export(slotMerge_exports, {
   buildPriceBreakdown: () => buildPriceBreakdown,
   buildVenueBookingEntry: () => buildVenueBookingEntry,
   buildVenueIdentityKey: () => buildVenueIdentityKey,
-  buildVenueResourceMetadata: () => buildVenueResourceMetadata,
   expandMergedSlotToIndividual: () => expandMergedSlotToIndividual,
   mergeConsecutiveSlots: () => mergeConsecutiveSlots
 });
@@ -107,14 +106,6 @@ function buildPriceBreakdown(params) {
   }
   return entries;
 }
-function buildVenueResourceMetadata(params) {
-  const { mapping, rawResource } = params;
-  return {
-    form_name: (rawResource == null ? void 0 : rawResource.form_name) ?? "",
-    resource_name: (rawResource == null ? void 0 : rawResource.main_field) ?? mapping.resourceName ?? "",
-    combined_resource: (rawResource == null ? void 0 : rawResource.combined_resource) ?? null
-  };
-}
 function buildVenueBookingEntry(params) {
   const { group, resourceId, mapping, rawResource, bookingUuid, productUid, childResources } = params;
   const startMoment = (0, import_dayjs.default)(group.startTime, "YYYY-MM-DD HH:mm");
@@ -229,7 +220,6 @@ function expandMergedSlotToIndividual(product, slotDurationMinutes) {
   buildPriceBreakdown,
   buildVenueBookingEntry,
   buildVenueIdentityKey,
-  buildVenueResourceMetadata,
   expandMergedSlotToIndividual,
   mergeConsecutiveSlots
 });

package/lib/types/index.d.ts

@@ -14,16 +14,6 @@ export interface Module {
     name: string;
     version: string;
     initialize: (core: PisellCore, options: ModuleOptions) => Promise<void> | void;
-    /**
-     * 父级解决方案运行时更新 otherParams 后，显式通知子模块刷新自己的运行态参数。
-     *
-     * @example
-     * await module.updateOtherParams?.({ channel: 'pos' }, { changedParams: { channel: 'pos' } });
-     */
-    updateOtherParams?: (params: Record<string, any>, meta?: {
-        changedParams?: Record<string, any>;
-        cover?: boolean;
-    }) => Promise<void> | void;
     destroy?: () => Promise<void> | void;
     exports?: Record<string, any>;
     isSolution?: boolean;

package/package.json

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

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

@@ -1,48 +0,0 @@
-import { Module, ModuleOptions, PisellCore } from '../../types';
-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。 */
-export declare function buildBookingResourcesQueryKey(params?: LoadBookingResourcesParams): string;
-export declare class BookingContextModule extends BaseModule implements Module, BookingContextModuleAPI {
-    protected defaultName: string;
-    protected defaultVersion: string;
-    private request;
-    private store;
-    /** 上次成功 loadBookingConfig 的 query key；命中则不再请求。 */
-    private lastConfigQueryKey;
-    /** 上次成功 loadResources 的 query key（date|bookingIds）；命中则不再请求。 */
-    private lastResourcesQueryKey;
-    constructor(name?: string, version?: string);
-    initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
-    loadBookingConfig(params?: LoadBookingConfigParams, options?: {
-        forceRefresh?: boolean;
-    }): Promise<BookingContextConfig | null>;
-    loadResources(params?: LoadBookingResourcesParams, options?: {
-        forceRefresh?: boolean;
-    }): Promise<BookingContextResource[]>;
-    /**
-     * store 内是否已具备与本次 init 入参等价的 config / resources（不再打接口）。
-     */
-    isBookingContextReady(params?: InitBookingContextParams): boolean;
-    initBookingContext(params?: InitBookingContextParams): Promise<BookingContextState>;
-    setBookingConfig(config: BookingContextConfig | null): void;
-    getBookingConfig(): BookingContextConfig | null;
-    setResources(resources: BookingContextResource[] | null | undefined): void;
-    getResourcesOrigin(): BookingContextResource[];
-    getResourcesOriginMap(): BookingContextResourceMap;
-    setDate(date: BookingContextDateInput): void;
-    getDate(): string | null;
-    getState(): BookingContextState;
-    clear(): void;
-}