@pisell/pisellos 2.2.244 → 2.2.246

package/lib/solution/ScanOrder/index.js

@@ -89,13 +89,45 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       moduleName: "scanOrder"
     };
   }
+  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 JSON.stringify({
+      return {
         name: error.name,
         message: error.message,
         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)
@@ -155,6 +187,14 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       }
     });
   }
+  assertProductListLoaded(method, result, payload = {}) {
+    if (Array.isArray(result))
+      return result;
+    const error = result instanceof Error ? result : new Error("商品列表接口返回异常");
+    this.logMethodError(method, error, payload);
+    error.__scanOrderLogged = true;
+    throw error;
+  }
   async addLog(params) {
     await this.addScanOrderLog({
       ...params,
@@ -319,13 +359,13 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       if (targetModule) {
         this.store[step] = targetModule;
         const initialState = step === "salesSummary" ? {
-          // TODO(Order types): ScanOrder runtime 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.scanOrderLoggerProvider) || "feishu";
         const loggerConfig = ((_d2 = this.otherParams) == null ? void 0 : _d2.scanOrderLoggerConfig) || {
           feishu: {
-            webhook: "https://open.feishu.cn/open-apis/bot/v2/hook/216b3fe6-af98-424e-8706-f0471241a7ed"
+            webhook: "https://open.feishu.cn/open-apis/bot/v2/hook/216b3fe6-af98-424e-8706-f0471241a7ed",
+            errorHook: "https://open.feishu.cn/open-apis/bot/v2/hook/015b7c2a-dd3c-4c30-9898-ef0f5253111f"
           }
         };
         this.core.registerModule(targetModule, {
@@ -711,7 +751,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
           (sum, pd) => sum + (pd.amount || 0),
           0
         );
-        const optionSum = (0, import_utils2.sumOptionUnitPrice)(product.product_option_item);
+        const optionSum = (0, import_utils2.sumOptionUnitPrice)((0, import_utils2.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);
@@ -747,6 +787,34 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  findReservationRuleResource(formId) {
+    var _a;
+    if (formId == null)
+      return void 0;
+    const numericFormId = Number(formId);
+    if (!Number.isFinite(numericFormId) || numericFormId <= 0)
+      return void 0;
+    for (const product of this.enabledReservationRuleProducts) {
+      const resources = (_a = product == null ? void 0 : product.product_resource) == null ? void 0 : _a.resources;
+      if (!Array.isArray(resources))
+        continue;
+      const matched = resources.find((resource) => Number(resource == null ? void 0 : resource.id) === numericFormId);
+      if (matched)
+        return matched;
+    }
+    return void 0;
+  }
+  buildScanOrderResourceMetadata(params) {
+    const { resourceState, resourceName } = params;
+    const ruleResource = this.findReservationRuleResource(resourceState.tableFormId);
+    const combined = ruleResource == null ? void 0 : ruleResource.combined_resource;
+    const isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
+    return {
+      form_name: (ruleResource == null ? void 0 : ruleResource.title) ?? "",
+      resource_name: resourceName,
+      combined_resource: isCombined ? combined : null
+    };
+  }
   // ScanOrder 提交 payload enhancer：
   // - 给所有 booking 注入 appointment_status: 'started'（扫码点餐语义）
   // - 给所有 booking 的 metadata 注入 resource_select_type（来自预约规则商品的 resource.type）
@@ -770,6 +838,9 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     return (payload, { bookingUuid, tempOrder }) => {
       var _a, _b;
       const resourceId = tempOrder.resource_id ?? (resourceState == null ? void 0 : resourceState.relationId);
+      const rawCollectPax = (_a = tempOrder.metadata) == null ? void 0 : _a.collect_pax;
+      const hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== void 0 && rawCollectPax !== "";
+      const resourceCapacityValue = hasCollectPaxForCapacity ? (0, import_utils2.normalizeSubmitCollectPaxValue)(rawCollectPax) : resolveResourceCapacity();
       const pickOriginal = (value) => {
         if (value && typeof value === "object" && !Array.isArray(value)) {
           const original = value.original;
@@ -777,7 +848,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         }
         return void 0;
       };
-      const mainField = pickOriginal(tempOrder.table_number) ?? pickOriginal((_a = resourceState == null ? void 0 : resourceState.table_form_record) == null ? void 0 : _a.name) ?? "";
+      const mainField = pickOriginal(tempOrder.table_number) ?? pickOriginal((_b = resourceState == null ? void 0 : resourceState.table_form_record) == null ? void 0 : _b.name) ?? "";
       const resourceEntry = resourceState && resourceId ? {
         relation_type: "form",
         like_status: "common",
@@ -785,37 +856,35 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         main_field: mainField,
         form_id: resourceState.tableFormId,
         relation_id: resourceState.relationId ?? resourceId,
-        capacity: resolveResourceCapacity(),
-        metadata: {}
+        capacity: resourceCapacityValue,
+        metadata: this.buildScanOrderResourceMetadata({
+          resourceState,
+          resourceName: mainField
+        })
       } : void 0;
       const ruleProductUid = ruleProduct ? (0, import_utils2.createUuidV4)() : void 0;
-      const rawCollectPax = (_b = tempOrder.metadata) == null ? void 0 : _b.collect_pax;
-      const hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== void 0 && rawCollectPax !== "";
-      const bookingCapacityValue = hasCollectPaxForCapacity ? (0, import_utils2.normalizeSubmitCollectPaxValue)(rawCollectPax) : resolveResourceCapacity();
+      const bookingCapacityValue = resourceCapacityValue;
       const bookingCapacityDimensionId = (0, import_utils.pickFirstCustomCapacityDimensionId)(this.enabledReservationRuleProducts) ?? 0;
-      const nextBookings = (payload.bookings || []).map((booking, idx) => {
-        var _a2;
-        return {
-          ...booking,
-          appointment_status: "started",
-          metadata: {
-            ...booking.metadata || {},
-            holder_id: ((_a2 = booking.metadata) == null ? void 0 : _a2.holder_id) ?? null,
-            ...resourceSelectType ? { resource_select_type: resourceSelectType } : {},
-            ...resourceSelectType ? {
-              capacity: [
-                {
-                  id: bookingCapacityDimensionId,
-                  value: bookingCapacityValue,
-                  name: ""
-                }
-              ]
-            } : {}
-          },
-          ...idx === 0 && resourceEntry ? { resources: [resourceEntry] } : {},
-          ...idx === 0 && ruleProductUid ? { product_uid: ruleProductUid } : {}
-        };
-      });
+      const nextBookings = (payload.bookings || []).map((booking, idx) => ({
+        ...booking,
+        number: bookingCapacityValue,
+        appointment_status: "started",
+        metadata: {
+          ...booking.metadata || {},
+          ...resourceSelectType ? { resource_select_type: resourceSelectType } : {},
+          ...resourceSelectType ? {
+            capacity: [
+              {
+                id: bookingCapacityDimensionId,
+                value: bookingCapacityValue,
+                name: ""
+              }
+            ]
+          } : {}
+        },
+        ...idx === 0 && resourceEntry ? { resources: [resourceEntry] } : {},
+        ...idx === 0 && ruleProductUid ? { product_uid: ruleProductUid } : {}
+      }));
       const nextProducts = [...payload.products || []];
       if (ruleProduct && ruleProductUid && !tempOrder.order_id) {
         const sellingPrice = String(ruleProduct.price ?? "0.00");
@@ -830,7 +899,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
           original_price: originalPrice,
           payment_price: sellingPrice,
           is_charge_tax: ruleProduct.is_gst ?? 0,
-          product_option_item: [],
+          product_sku: { option: [] },
           discount_list: [],
           product_bundle: [],
           booking_uid: bookingUuid,
@@ -903,23 +972,23 @@ var _ScanOrderImpl = 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;
     }
   }
@@ -938,15 +1007,14 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         product_variant_id: identity.product_variant_id,
         updates: { note: String(note || "") }
       };
-      if (identity.identity_key !== void 0) {
+      if (identity.identity_key !== void 0)
         params.identity_key = identity.identity_key;
-      }
-      if (identity.product_option_item !== void 0) {
-        params.product_option_item = identity.product_option_item;
+      if (identity.product_sku !== void 0) {
+        params.product_sku = identity.product_sku;
       }
       if (identity.product_bundle !== void 0)
         params.product_bundle = identity.product_bundle;
-      const products = await this.updateProductInOrder(params);
+      const products = await this.updateOrderProduct(params);
       this.logMethodSuccess("setOrderProductLineNote", { productCount: products.length });
       return products;
     } catch (error) {
@@ -1208,7 +1276,6 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
           item_rule_prefill: true,
           item_rule_id: prefillItem.ruleId
         },
-        // TODO(Order types): migrate ScanOrder prefill origin runtime into tempOrder._extend.
         _origin: sourceItem ? {
           ...targetProduct._origin || {},
           ...sourceItem
@@ -1433,14 +1500,17 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   // 通过 resource_id + 店铺配置
   // hasOrderId 表示 url 上是否有 orderid，如果是的话，后续的流程会走加单
   async checkResourceAvailable(resourceId, hasOrderId) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     this.logMethodStart("checkResourceAvailable", {
       resourceId
     });
     try {
-      const openData = await ((_b = (_a = this.otherParams) == null ? void 0 : _a.getOpenData) == null ? void 0 : _b.call(_a, {
+      const businessCode = String(((_a = this.otherParams) == null ? void 0 : _a.businessCode) ?? "").trim();
+      const channel = String(((_b = this.otherParams) == null ? void 0 : _b.channel) ?? "").trim();
+      const openDataTarget = businessCode && channel ? `${businessCode}+${channel}` : "dine_in+scan_to_order";
+      const openData = await ((_d = (_c = this.otherParams) == null ? void 0 : _c.getOpenData) == null ? void 0 : _d.call(_c, {
         scope: "board",
-        target: "dine_in+scan_to_order",
+        target: openDataTarget,
         section_code: ["basic", "fulfillment", "reservation", "sale", "menu", "availability", "workflow"]
       }));
       if ((openData == null ? void 0 : openData.status) === false) {
@@ -1531,13 +1601,13 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
           }
         } else {
           this.enabledReservationRuleProducts = [];
-          void this.addScanOrderLog({
-            level: "error",
-            title: "[ScanOrder] enabled_reservation_rules product query failed",
-            payload: {
-              linkIds: reservationLinkIds,
-              error: this.serializeError(loaded)
-            }
+          const error = loaded instanceof Error ? loaded : new Error("预约规则商品列表接口返回异常");
+          this.logMethodError("loadReservationRuleProducts", error, {
+            resourceId,
+            reservationLinkIds,
+            scheduleDate,
+            scheduleDatetime,
+            cacheId: this.cacheId
           });
         }
       }
@@ -1567,16 +1637,16 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         table_form_id: resourceState.tableFormId,
         deskmate_valid: resourceState.deskmate_valid,
         table_form_record: resourceState.table_form_record,
-        policy: (_c = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _c.policy,
-        partyroom_booking: (_d = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _d.partyroom_booking,
+        policy: (_e = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _e.policy,
+        partyroom_booking: (_f = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _f.partyroom_booking,
         ...this.store.resource.requestEntryPax !== void 0 ? { requestEntryPax: this.store.resource.requestEntryPax } : {},
         ...this.store.resource.requestPaxMin !== void 0 ? { requestPaxMin: this.store.resource.requestPaxMin } : {},
         ...this.store.resource.requestPaxMax !== void 0 ? { requestPaxMax: this.store.resource.requestPaxMax } : {}
       };
-      tempOrder.relation_id = resourceId || ((_e = this.otherParams) == null ? void 0 : _e.relation_id);
+      tempOrder.relation_id = resourceId || ((_g = this.otherParams) == null ? void 0 : _g.relation_id);
       tempOrder.table_form_id = resourceState.tableFormId;
       tempOrder.resource_id = resourceId;
-      (_f = this.store.order) == null ? void 0 : _f.persistTempOrder();
+      (_h = this.store.order) == null ? void 0 : _h.persistTempOrder();
       if (availabilityInfo.mode === "idle") {
         await this.addNewOrder();
       }
@@ -1584,16 +1654,18 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         tempOrder.order_id = resourceState.lastOrderId;
       }
       if (tempOrder.order_id) {
-        const res = await ((_g = this.store.order) == null ? void 0 : _g.getOrderInfoByRemote(tempOrder.order_id));
-        const entryPaxNumber = (_k = (_j = (_i = (_h = res == null ? void 0 : res.data) == null ? void 0 : _h.bookings) == null ? void 0 : _i.find((p) => {
+        const res = await ((_i = this.store.order) == null ? void 0 : _i.getSalesOrderByLookup({
+          lookup: tempOrder.order_id
+        }));
+        const entryPaxNumber = (_m = (_l = (_k = (_j = res == null ? void 0 : res.data) == null ? void 0 : _j.bookings) == null ? void 0 : _k.find((p) => {
           var _a2;
           return (_a2 = p.metadata) == null ? void 0 : _a2.collect_pax;
-        })) == null ? void 0 : _j.metadata) == null ? void 0 : _k.collect_pax;
+        })) == null ? void 0 : _l.metadata) == null ? void 0 : _m.collect_pax;
         if (entryPaxNumber) {
           await this.setEntryPaxNumber(entryPaxNumber);
         }
       }
-      const lastOrderInfo = (_m = (_l = this.store.order) == null ? void 0 : _l.getLastOrderInfo) == null ? void 0 : _m.call(_l);
+      const lastOrderInfo = (_o = (_n = this.store.order) == null ? void 0 : _n.getLastOrderInfo) == null ? void 0 : _o.call(_n);
       const historicalItems = hasOrderId && Array.isArray(lastOrderInfo == null ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce((acc, p) => {
         if (typeof (p == null ? void 0 : p.product_id) !== "number")
           return acc;
@@ -1605,7 +1677,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         return acc;
       }, []) : [];
       await this.setItemRuleRuntimeConfig({
-        serviceType: (_n = this.otherParams) == null ? void 0 : _n.businessCode,
+        serviceType: (_p = this.otherParams) == null ? void 0 : _p.businessCode,
         submissionIndex: hasOrderId ? 1 : 0,
         historicalItems
       });
@@ -1653,18 +1725,24 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   }
   // 获取商品列表
   async getProductList() {
-    var _a, _b, _c;
+    var _a, _b;
     this.logMethodStart("getProductList");
     const menu_list_ids = ((_b = (_a = this.otherParams) == null ? void 0 : _a.dineInConfig) == null ? void 0 : _b["menu.associated_menus"].map((n) => Number(n.value))) || [];
     try {
-      const res = await ((_c = this.store.products) == null ? void 0 : _c.loadProducts({
+      if (!this.store.products)
+        throw new Error("products 模块未初始化");
+      const res = await this.store.products.loadProducts({
         menu_list_ids,
         cacheId: this.cacheId,
         schedule_date: (0, import_dayjs.default)().format("YYYY-MM-DD"),
         schedule_datetime: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
-      }));
+      });
+      const productList = this.assertProductListLoaded("getProductList", res, {
+        menu_list_ids,
+        cacheId: this.cacheId
+      });
       const formattedRes = (0, import_utils.attachItemRuleLimitsToTopLevelProducts)(
-        res,
+        productList,
         this.store.itemRuleQuantityLimits || []
       );
       this.logMethodSuccess("getProductList", {
@@ -1672,7 +1750,12 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       });
       return formattedRes;
     } catch (error) {
-      this.logMethodError("getProductList", error.message);
+      if (!(error == null ? void 0 : error.__scanOrderLogged)) {
+        this.logMethodError("getProductList", error, {
+          menu_list_ids,
+          cacheId: this.cacheId
+        });
+      }
       throw error;
     }
   }

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

@@ -33,13 +33,17 @@ export interface ScanOrderOrderProductIdentity {
     identity_key?: string;
     unique_identification_number?: string;
     /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
-    product_option_item?: any[];
+    product_sku?: ScanOrderProductSku;
     product_bundle?: any[];
 }
+export interface ScanOrderProductSku {
+    option: any[];
+    [key: string]: any;
+}
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
-    product_option_item: any[];
+    product_sku: ScanOrderProductSku;
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`
      *   + Σ((bundle.bundle_selling_price ?? bundle.price) × (bundle.num ?? 1))
@@ -85,9 +89,8 @@ export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `ScanOrderOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ option_group_item_id, option_group_id, num, price, ... }`，
- *   出站保留 `{ option_group_item_id, option_group_id, num }`
- *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
+ * - `product_sku.option[*]`：内部直接维护统一 Sales 协议字段；
+ *   提交时仅规范 `add_price`，保留传入/恢复得到的展示字段。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
  * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名
@@ -112,6 +115,7 @@ export interface ScanOrderSummary {
     shipping_tax_fee: string;
     tax_fee: string;
     surcharge_fee: string;
+    surcharges: any[];
     discount_amount: string;
     deposit_amount: string;
     deposit?: {

package/lib/solution/ScanOrder/utils.d.ts

@@ -88,7 +88,7 @@ export declare function attachItemRuleLimitsToTopLevelProducts<T>(productList: T
 export declare function buildProductLineFingerprint(productOptionItem?: unknown, productBundle?: unknown): string;
 /**
  * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
- * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ * 与显式 `product_sku: { option: [] }` 区分：后者只匹配「无选项」行。
  */
 export declare function isSkuOnlyDeleteIdentity(x: ScanOrderOrderProductIdentity): boolean;
 /**

package/lib/solution/ScanOrder/utils.js

@@ -63,6 +63,7 @@ module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../modules/Order/utils");
+var import_manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
 function createEmptySummary() {
   return {
     product_quantity: 0,
@@ -74,6 +75,7 @@ function createEmptySummary() {
     shipping_tax_fee: "0.00",
     tax_fee: "0.00",
     surcharge_fee: "0.00",
+    surcharges: [],
     discount_amount: "0.00",
     deposit_amount: "0.00",
     expect_amount: "0.00",
@@ -352,7 +354,7 @@ function buildProductLineFingerprint(productOptionItem, productBundle) {
     option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
     option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
     num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-    price: String((item == null ? void 0 : item.price) ?? "")
+    price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : item.price) ?? "")
   })).sort((p, q) => {
     if (p.option_group_item_id !== q.option_group_item_id) {
       return p.option_group_item_id - q.option_group_item_id;
@@ -380,11 +382,11 @@ function buildProductLineFingerprint(productOptionItem, productBundle) {
 function isSkuOnlyDeleteIdentity(x) {
   if (x.unique_identification_number || x.identity_key)
     return false;
-  return !("product_option_item" in x) && !("product_bundle" in x);
+  return !("product_sku" in x) && !("product_bundle" in x);
 }
 function fingerprintForIdentityWithOptionKeys(x) {
   const row = x;
-  const opts = "product_option_item" in row ? Array.isArray(row.product_option_item) ? row.product_option_item : [] : [];
+  const opts = "product_sku" in row ? (0, import_utils.getProductSkuOptions)(row) : [];
   const buds = "product_bundle" in row ? Array.isArray(row.product_bundle) ? row.product_bundle : [] : [];
   return buildProductLineFingerprint(opts, buds);
 }
@@ -406,23 +408,72 @@ function getProductIdentityIndex(products, identity) {
   return products.findIndex((item) => isIdentityMatch(item, identity));
 }
 function normalizeOrderProduct(product) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f, _g;
   const metadata = { ...product.metadata || {} };
   const resolvedIdentityKey = ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? String(product.metadata.unique_identification_number) : product.unique_identification_number && String(product.unique_identification_number).length > 0 ? String(product.unique_identification_number) : product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : (0, import_utils.createUuidV4)();
   metadata.unique_identification_number = resolvedIdentityKey;
-  const normalizedBundle = (product.product_bundle || []).map((item) => ({
-    ...item,
-    bundle_selling_price: item.bundle_selling_price ?? item.price ?? "0.00",
-    price: item.price ?? item.custom_price ?? item.bundle_selling_price ?? "0.00",
-    price_type: item.price_type ?? item.custom_price_type ?? "",
-    price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ""
-  }));
-  const normalizedOptions = product.product_option_item || [];
+  const priceOverride = metadata.price_override;
+  const originOtherBundle = (_d = (_c = (_b = metadata.origin) == null ? void 0 : _b._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.bundle;
+  let bundleInput = product.product_bundle || [];
+  if (priceOverride !== void 0 && priceOverride !== null && priceOverride !== "" && Array.isArray(originOtherBundle) && originOtherBundle.length > 0) {
+    const priceById = /* @__PURE__ */ new Map();
+    originOtherBundle.forEach((item) => {
+      if ((item == null ? void 0 : item.id) == null)
+        return;
+      const unit = item.price ?? item.bundle_selling_price;
+      if (unit === void 0 || unit === null)
+        return;
+      priceById.set(String(item.id), String(unit));
+    });
+    const base = Array.isArray(bundleInput) && bundleInput.length > 0 ? bundleInput : originOtherBundle;
+    bundleInput = base.map((item) => {
+      const unit = priceById.get(String(item == null ? void 0 : item.id));
+      if (unit === void 0)
+        return item;
+      return {
+        ...item,
+        price: unit,
+        bundle_selling_price: unit
+      };
+    });
+  }
+  const normalizedBundle = bundleInput.map((item) => {
+    const magnitudeSource = {
+      ...item,
+      // 计算 markdown 净额时，只把真实毛价交给 helper；若只有 bundle_selling_price，
+      // helper 会按历史净额兜底，避免 option 二次扣减。
+      price: item.price ?? item.custom_price
+    };
+    const normalizedItem = {
+      ...item,
+      bundle_id: item.bundle_id ?? item.id,
+      bundle_product_id: item.bundle_product_id ?? item._bundle_product_id,
+      bundle_group_id: item.bundle_group_id ?? item.group_id,
+      // price 保留毛价（markdown 仍为 5），由 price_type 决定符号。
+      price: item.price ?? item.custom_price ?? item.bundle_selling_price ?? "0.00",
+      price_type: item.price_type ?? item.custom_price_type ?? "",
+      price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ""
+    };
+    normalizedItem.bundle_selling_price = (0, import_utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
+    if (normalizedItem.price_type === "markdown" && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || normalizedItem.price_type_ext === null)) {
+      normalizedItem.custom_price = normalizedItem.custom_price ?? normalizedItem.price;
+      normalizedItem.price = normalizedItem.bundle_selling_price;
+    }
+    if ((normalizedItem.price_type === "markdown" || normalizedItem.price_type === "markup") && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || normalizedItem.price_type_ext === null)) {
+      delete normalizedItem.original_total;
+    }
+    return normalizedItem;
+  });
+  const normalizedOptions = (0, import_utils.normalizeProductSkuOptions)((_e = product.product_sku) == null ? void 0 : _e.option);
   const optionSum = (0, import_utils.sumOptionUnitPrice)(normalizedOptions);
+  const productSku = {
+    ...(0, import_utils.ensureProductSku)(product),
+    option: normalizedOptions
+  };
   const isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === "2";
   const variantId = Number(product.product_variant_id || 0);
-  const variantList = variantId ? (_b = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _b.variant : null;
-  const variantPrice = Array.isArray(variantList) ? (_c = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _c.price : void 0;
+  const variantList = variantId ? (_f = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _f.variant : null;
+  const variantPrice = Array.isArray(variantList) ? (_g = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _g.price : void 0;
   const resolvedSource = (() => {
     var _a2, _b2;
     if (metadata.source_product_price !== void 0) {
@@ -478,17 +529,32 @@ function normalizeOrderProduct(product) {
     bundle: normalizedBundle,
     useOriginalBundle: true
   });
+  const finalOriginalPrice = (0, import_utils.resolveManualOverrideLineOriginalPrice)(
+    { num: product.num, metadata, lineOriginalPrice: product.original_price },
+    composedOriginalPrice
+  );
+  const hasManualProductDiscount = (product.discount_list || []).some(
+    (item) => (item == null ? void 0 : item.type) === "product"
+  );
+  const manualOriginalPrice = hasManualProductDiscount && product.original_price != null ? String(product.original_price) : finalOriginalPrice;
+  const discountList = (0, import_manualProductDiscount.ensureManualProductDiscountList)({
+    discountList: product.discount_list,
+    metadata,
+    originalPrice: manualOriginalPrice,
+    sellingPrice: composedSellingPrice,
+    quantity: getSafeProductNum(product.num)
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
-    product_option_item: normalizedOptions,
+    product_sku: productSku,
     selling_price: composedSellingPrice,
-    original_price: composedOriginalPrice,
+    original_price: manualOriginalPrice,
     tax_fee: product.tax_fee || "0.00",
     is_charge_tax: product.is_charge_tax ?? 0,
-    discount_list: product.discount_list || [],
+    discount_list: discountList,
     product_bundle: normalizedBundle,
     metadata,
     note: product.note != null ? String(product.note) : ""

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

@@ -2,7 +2,7 @@ import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { VenueBookingAddLogParams, VenueBookingSlotConfig, VenueDateSummaryItem, VenueSlotSelection, VenueTimeSlotGrid } from './types';
 import type { ScanOrderOrderProduct, ScanOrderOrderProductIdentity } from '../ScanOrder/types';
-import type { UpdateProductInOrderParams } from '../../modules/Order/types';
+import type { UpdateOrderProductParams } from '../../modules/Order/types';
 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';
@@ -41,6 +41,8 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private loadOpenDataConfigInFlight;
     private static readonly OPEN_DATA_CACHE_TTL;
     private getLoggerContext;
+    private safeStringify;
+    private pickErrorMessage;
     private serializeError;
     private addVenueBookingLog;
     private logMethodStart;
@@ -154,6 +156,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         type: "server" | "clientCalc";
         unavailableReason?: import("../../modules/Rules/types").UnavailableReason | undefined;
         unavailableReasonKey?: string | null | undefined;
+        scannedDiscountList?: import("../../modules/Discount").Discount[] | undefined;
     }>;
     /** 获取当前折扣列表（包装 order.getDiscountList） */
     getDiscountList(): import("../../modules/Discount").Discount[];
@@ -167,7 +170,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     getSummary(): Promise<import("../../modules/Order/types").OrderSummary>;
     submitOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<import("../../modules/Order/types").OrderProduct[]>;
-    updateProductInOrder(params: UpdateProductInOrderParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
     removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<import("../../modules/Order/types").OrderProduct[]>;
     getProductList(): Promise<ProductData[]>;
     private loadOpenDataConfig;