@pisell/pisellos 2.2.244 → 2.2.246

package/lib/solution/VenueBooking/index.js

@@ -118,6 +118,27 @@ 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 {
@@ -126,6 +147,17 @@ 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)
     };
@@ -341,12 +373,14 @@ 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: {}
+          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"
+          }
         };
         this.core.registerModule(targetModule, {
           initialState,
@@ -524,8 +558,10 @@ 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));
@@ -989,7 +1025,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: {}
+        metadata: (0, import_slotMerge.buildVenueResourceMetadata)({ mapping, rawResource })
       };
       if (childRawResources && childRawResources.length) {
         resourceEntry.children = childRawResources.map((child) => ({
@@ -1041,7 +1077,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
               product_variant_id: 0,
               num: 1,
               product_bundle: [],
-              product_option_item: [],
+              product_sku: { option: [] },
               discount_list: [],
               custom_deposit_data: customDepositData,
               metadata: {}
@@ -1312,7 +1348,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
           (sum, pd) => sum + (pd.amount || 0),
           0
         );
-        const optionSum = (0, import_utils3.sumOptionUnitPrice)(product.product_option_item);
+        const optionSum = (0, import_utils3.sumOptionUnitPrice)((0, import_utils3.getProductSkuOptions)(product));
         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);
@@ -1359,7 +1395,8 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
   getOrderProducts() {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    return this.store.order.getOrderProducts();
+    const products = this.store.order.getOrderProducts();
+    return products;
   }
   async getSummary() {
     this.logMethodStart("getSummary");
@@ -1435,23 +1472,23 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
-  async updateProductInOrder(params) {
-    this.logMethodStart("updateProductInOrder", {
+  async updateOrderProduct(params) {
+    this.logMethodStart("updateOrderProduct", {
       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.updateProductInOrder(params);
+      const products = await this.store.order.updateOrderProduct(params);
       await this.refreshItemRuleQuantityLimits();
       await this.refreshCartValidationPassed();
-      this.logMethodSuccess("updateProductInOrder", {
+      this.logMethodSuccess("updateOrderProduct", {
         productCount: products.length
       });
       return products;
     } catch (error) {
-      this.logMethodError("updateProductInOrder", error);
+      this.logMethodError("updateOrderProduct", error);
       throw error;
     }
   }
@@ -1530,18 +1567,19 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       return cachedData;
     }
     if (this.loadOpenDataConfigInFlight)
-      return this.loadOpenDataConfigInFlight;
+      return await this.loadOpenDataConfigInFlight;
     this.loadOpenDataConfigInFlight = this.store.openData.fetchOpenData({
       scope: "board",
       target: "venue_booking+online_store",
       section_code: [...OPEN_DATA_SECTION_CODES]
-    }).then((openDataConfig) => {
+    });
+    try {
+      const openDataConfig = await this.loadOpenDataConfigInFlight;
       this.otherParams.openData = openDataConfig;
       return openDataConfig;
-    }).finally(() => {
+    } finally {
       this.loadOpenDataConfigInFlight = null;
-    });
-    return this.loadOpenDataConfigInFlight;
+    }
   }
   async loadRuntimeConfigs() {
     await this.loadOpenDataConfig();
@@ -1717,7 +1755,6 @@ 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,8 +71,6 @@
         "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,6 +12,10 @@ 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,6 +32,7 @@ __export(slotMerge_exports, {
   buildPriceBreakdown: () => buildPriceBreakdown,
   buildVenueBookingEntry: () => buildVenueBookingEntry,
   buildVenueIdentityKey: () => buildVenueIdentityKey,
+  buildVenueResourceMetadata: () => buildVenueResourceMetadata,
   expandMergedSlotToIndividual: () => expandMergedSlotToIndividual,
   mergeConsecutiveSlots: () => mergeConsecutiveSlots
 });
@@ -106,6 +107,14 @@ 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");
@@ -220,6 +229,7 @@ function expandMergedSlotToIndividual(product, slotDurationMinutes) {
   buildPriceBreakdown,
   buildVenueBookingEntry,
   buildVenueIdentityKey,
+  buildVenueResourceMetadata,
   expandMergedSlotToIndividual,
   mergeConsecutiveSlots
 });

package/lib/types/index.d.ts

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

package/dist/solution/Checkout/appointmentDemo.json

@@ -1 +0,0 @@
-{"type":"appointment_booking","platform":"PC","sales_channel":"my_pisel","order_sales_channel":"online_store","bookings":[{"id":0,"number":1,"registration_type":"all","relation_products":[],"is_all":false,"product":{"num":1,"product_id":61170,"product_variant_id":0,"product_bundle":[],"product_option_item":[],"discount_list":[{"amount":100,"type":"good_pass","discount":{"resource_id":64523,"title":{"auto":"玄-商品券","original":"玄-商品券","en":null,"zh-CN":null,"zh-HK":null},"original_amount":100,"product_id":61170,"percent":"1.00"}}]},"sub_type":"minutes","duration":480,"like_status":"common","resources":[{"relation_type":"form","like_status":"common","form_id":35,"relation_id":40357,"capacity":1,"metadata":{"combined_resource":{"status":1,"resource_ids":[40262,40263]},"form_name":"桌台","resource_name":"组合资源测试table-0422-01"},"children":[{"relation_type":"form","like_status":"common","id":40262,"main_field":"A01（组合资源-小桌-4 人）","resourceType":"single","form_id":35,"relation_id":40262,"capacity":1,"metadata":{"combined_resource":null,"form_name":"桌台","resource_name":"A01（组合资源-小桌-4 人）"}},{"relation_type":"form","like_status":"common","id":40263,"main_field":"A02（组合资源-小桌-4 人）","resourceType":"single","form_id":35,"relation_id":40263,"capacity":0,"metadata":{"combined_resource":null,"form_name":"桌台","resource_name":"A02（组合资源-小桌-4 人）"}}]},{"relation_type":"form","like_status":"common","form_id":214,"relation_id":38350,"capacity":1,"metadata":{"combined_resource":null,"form_name":"校区2","resource_name":"West Campus"}}],"schedule_id":0,"start_date":"2025-08-22","start_time":"09:00","select_date":"2025-08-22","end_time":"17:00","end_date":"2025-08-22","metadata":{"account":{"id":13433,"username":"a a"},"capacity":[{"id":0,"value":1,"name":""}]},"holder":null,"relation_forms":[]}],"shop_note":"","schedule_date":"2025-08-22 09:00:00","is_deposit":0,"relation_products":[],"relation_forms":[]}

package/lib/solution/Checkout/appointmentDemo.json

@@ -1 +0,0 @@
-{"type":"appointment_booking","platform":"PC","sales_channel":"my_pisel","order_sales_channel":"online_store","bookings":[{"id":0,"number":1,"registration_type":"all","relation_products":[],"is_all":false,"product":{"num":1,"product_id":61170,"product_variant_id":0,"product_bundle":[],"product_option_item":[],"discount_list":[{"amount":100,"type":"good_pass","discount":{"resource_id":64523,"title":{"auto":"玄-商品券","original":"玄-商品券","en":null,"zh-CN":null,"zh-HK":null},"original_amount":100,"product_id":61170,"percent":"1.00"}}]},"sub_type":"minutes","duration":480,"like_status":"common","resources":[{"relation_type":"form","like_status":"common","form_id":35,"relation_id":40357,"capacity":1,"metadata":{"combined_resource":{"status":1,"resource_ids":[40262,40263]},"form_name":"桌台","resource_name":"组合资源测试table-0422-01"},"children":[{"relation_type":"form","like_status":"common","id":40262,"main_field":"A01（组合资源-小桌-4 人）","resourceType":"single","form_id":35,"relation_id":40262,"capacity":1,"metadata":{"combined_resource":null,"form_name":"桌台","resource_name":"A01（组合资源-小桌-4 人）"}},{"relation_type":"form","like_status":"common","id":40263,"main_field":"A02（组合资源-小桌-4 人）","resourceType":"single","form_id":35,"relation_id":40263,"capacity":0,"metadata":{"combined_resource":null,"form_name":"桌台","resource_name":"A02（组合资源-小桌-4 人）"}}]},{"relation_type":"form","like_status":"common","form_id":214,"relation_id":38350,"capacity":1,"metadata":{"combined_resource":null,"form_name":"校区2","resource_name":"West Campus"}}],"schedule_id":0,"start_date":"2025-08-22","start_time":"09:00","select_date":"2025-08-22","end_time":"17:00","end_date":"2025-08-22","metadata":{"account":{"id":13433,"username":"a a"},"capacity":[{"id":0,"value":1,"name":""}]},"holder":null,"relation_forms":[]}],"shop_note":"","schedule_date":"2025-08-22 09:00:00","is_deposit":0,"relation_products":[],"relation_forms":[]}