@pisell/pisellos 0.0.500 → 0.0.502

package/lib/modules/Order/index.js

@@ -159,41 +159,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.store.rules = rules;
   }
   createDefaultRulesHooks() {
-    return {
-      getProduct: (product) => {
-        var _a, _b, _c, _d;
-        return {
-          id: product.product_id,
-          _id: product.identity_key ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${product.product_variant_id}`,
-          price: product.selling_price,
-          total: new import_decimal.default(product.payment_price || product.selling_price || 0).times(product.num || 1).toNumber(),
-          origin_total: new import_decimal.default(product.original_price || product.selling_price || 0).times(product.num || 1).toNumber(),
-          original_price: product.original_price,
-          quantity: product.num || 1,
-          num: product.num || 1,
-          discount_list: product.discount_list || [],
-          bundle: product.product_bundle || [],
-          booking_id: ((_a = product._origin) == null ? void 0 : _a.booking_id) || null,
-          isClient: false,
-          isManualDiscount: ((_b = product._origin) == null ? void 0 : _b.isManualDiscount) || false,
-          holder_id: (_c = product._origin) == null ? void 0 : _c.holder_id,
-          startDate: (_d = product._origin) == null ? void 0 : _d.startDate
-        };
-      },
-      setProduct: (product, values) => ({
-        ...product,
-        selling_price: values.price !== void 0 ? String(values.price) : product.selling_price,
-        payment_price: values.total !== void 0 ? String(values.total) : product.payment_price,
-        original_price: values.original_price !== void 0 ? String(values.original_price) : product.original_price,
-        discount_list: values.discount_list ?? product.discount_list,
-        num: values.quantity ?? product.num,
-        product_bundle: values.bundle ?? product.product_bundle,
-        metadata: {
-          ...product.metadata || {},
-          ...values.main_product_selling_price !== void 0 ? { main_product_selling_price: String(values.main_product_selling_price) } : {}
-        }
-      })
-    };
+    return (0, import_utils.createDefaultOrderRulesHooks)();
   }
   // ─── Discount: 公共 API ───
   async loadDiscountConfig(params) {
@@ -267,28 +233,28 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     };
   }
   applyDiscount() {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e;
     const tempOrder = this.store.tempOrder;
-    if (!((_a = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _a.length))
+    if (!tempOrder)
       return;
     const rulesModule = this.store.rules;
     if (!rulesModule)
       return;
-    const discountList = ((_b = this.store.discount) == null ? void 0 : _b.getDiscountList()) || [];
-    const holders = ((_c = tempOrder.holder) == null ? void 0 : _c.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+    const discountList = ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
+    const holders = ((_b = tempOrder.holder) == null ? void 0 : _b.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
     const result = rulesModule.calcDiscount({
       productList: tempOrder.products,
       discountList,
       holders,
-      isFormSubject: !!((_d = tempOrder.holder) == null ? void 0 : _d.type) && tempOrder.holder.type === "form",
-      orderTotalAmount: Number(((_e = tempOrder == null ? void 0 : tempOrder.summary) == null ? void 0 : _e.total_amount) || 0)
+      isFormSubject: !!((_c = tempOrder.holder) == null ? void 0 : _c.type) && tempOrder.holder.type === "form",
+      orderTotalAmount: Number(((_d = tempOrder == null ? void 0 : tempOrder.summary) == null ? void 0 : _d.total_amount) || 0)
     });
     if (result == null ? void 0 : result.productList) {
       tempOrder.products = result.productList;
     }
     if (result == null ? void 0 : result.discountList) {
       OrderModule.populateSavedAmounts(result.productList || tempOrder.products, result.discountList);
-      (_f = this.store.discount) == null ? void 0 : _f.setDiscountList(result.discountList);
+      (_e = this.store.discount) == null ? void 0 : _e.setDiscountList(result.discountList);
       tempOrder.discount_list = result.discountList.filter((d) => d.isSelected);
     }
   }
@@ -350,6 +316,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.persistTempOrder();
     return newOrder;
   }
+  restoreOrder() {
+    const freshTempOrder = this.createDefaultTempOrderInstance();
+    this.store.tempOrder = freshTempOrder;
+    this.persistTempOrder();
+    return freshTempOrder;
+  }
   getTempOrder() {
     return this.store.tempOrder;
   }
@@ -410,6 +382,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.persistTempOrder();
     return tempOrder.note;
   }
+  updateTempOrderBuzzer(buzzer) {
+    const tempOrder = this.ensureTempOrder();
+    tempOrder.buzzer = String(buzzer || "");
+    this.persistTempOrder();
+    return tempOrder.buzzer;
+  }
   updateTempOrderContactsInfo(contactsInfo) {
     const tempOrder = this.ensureTempOrder();
     tempOrder.contacts_info = Array.isArray(contactsInfo) ? contactsInfo : [];
@@ -490,7 +468,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const effectiveCacheId = (params == null ? void 0 : params.cacheId) ?? this.cacheId;
     const payload = (0, import_utils.buildSubmitPayload)({
       tempOrder,
-      cacheId: effectiveCacheId
+      cacheId: effectiveCacheId,
+      platform: params == null ? void 0 : params.platform,
+      businessCode: params == null ? void 0 : params.businessCode,
+      channel: params == null ? void 0 : params.channel,
+      type: params == null ? void 0 : params.type,
+      enhance: params == null ? void 0 : params.enhancePayload
     });
     let result;
     if (tempOrder.order_id) {
@@ -733,6 +716,20 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     };
     return this.request.put(fetchUrl, requestBody);
   }
+  // TODO 获取详情的接口
+  async getOrderInfoByRemote(order_id) {
+    const res = await this.request.get(`/order/sales/${order_id}`, {
+      with: ["products", "scheduleEvents"]
+    });
+    if (res.code === 200 && this.store.tempOrder) {
+      this.store.tempOrder.lastOrderInfo = res.data;
+    }
+    return res;
+  }
+  getLastOrderInfo() {
+    var _a, _b;
+    return (_b = (_a = this.store) == null ? void 0 : _a.tempOrder) == null ? void 0 : _b.lastOrderInfo;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -3,6 +3,7 @@ import type { ScanOrderTempOrder, ScanOrderOrderProduct, ScanOrderOrderProductId
 import type { DiscountModule } from '../Discount';
 import type { RulesModule } from '../Rules';
 import type { Discount } from '../Discount/types';
+import type { SubmitPayloadEnhancer } from './utils';
 export declare enum OrderHooks {
     OnOrderCreate = "order:onOrderCreate",
     OnOrderUpdate = "order:onOrderUpdate",
@@ -68,10 +69,12 @@ export interface SubmitScanOrderBooking {
     start_time?: string;
     end_time?: string;
     metadata?: Record<string, any>;
+    resources?: Array<Record<string, any>>;
+    product_uid?: string;
 }
 export interface SubmitScanOrderFormRecord {
     form_id: number | string;
-    form_record_ids: Array<number | string>;
+    form_record_id: number | string;
 }
 export interface SubmitScanOrderParams {
     url?: string;
@@ -107,6 +110,8 @@ export interface SubmitScanOrderParams {
         shop_discount: string;
         surcharge_fee: string;
         note: string;
+        delivery_type?: string;
+        table_number?: Record<string, any>;
         schedule_date: string;
         created_at?: string;
         products: SubmitScanOrderProduct[];
@@ -195,12 +200,14 @@ export interface OrderModuleAPI {
     getTempOrder: () => ScanOrderTempOrder | null;
     ensureTempOrder: () => ScanOrderTempOrder;
     addNewOrder: () => Promise<ScanOrderTempOrder>;
+    restoreOrder: () => ScanOrderTempOrder;
     getOrderProducts: () => ScanOrderOrderProduct[];
     getScanOrderSummary: () => Promise<ScanOrderSummary>;
     recalculateSummary: (options?: {
         createIfMissing?: boolean;
     }) => Promise<ScanOrderSummary | null>;
     updateTempOrderNote: (note: string) => string;
+    updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: any[]) => any[];
     addProductToOrder: (product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity) => Promise<ScanOrderOrderProduct[]>;
     updateProductInOrder: (params: {
@@ -212,6 +219,11 @@ export interface OrderModuleAPI {
     persistTempOrder: () => void;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
+        platform?: string;
+        businessCode?: string;
+        channel?: string;
+        type?: string;
+        enhancePayload?: SubmitPayloadEnhancer;
     }) => Promise<T>;
     loadDiscountConfig: (params: {
         customerId: number;

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

@@ -1,5 +1,25 @@
 import { CartItem } from "../Cart";
 import type { ScanOrderSubmitPayload, ScanOrderSubmitProduct, ScanOrderSummary, ScanOrderTempOrder } from '../../solution/ScanOrder/types';
+import type { RulesParamsHooks } from '../Rules/types';
+/**
+ * OrderModule 默认 Rules 钩子工厂。
+ *
+ * 价格语义约定（订单域）：
+ * - `selling_price`：券后单品单价（实际成交单价）。初次加购 = `original_price`；券应用后由 Rules 引擎更新。
+ * - `original_price`：券前单品单价（店铺售价）。不承载后台划线价语义。
+ * - `payment_price`：已从内部字段移除；只在出站 payload 中由 `selling_price` 派生以兼容后端。
+ *
+ * Rules 钩子契约：
+ * - `getProduct.total` = `selling_price × num`（当前成交总价）
+ * - `getProduct.origin_total` = `original_price × num`（券前总价）
+ * - `setProduct` 写回 `selling_price` 的优先级：
+ *   1. `values.main_product_selling_price`（券应用分支，per-unit 券后主价）
+ *   2. `values.price`（还原分支 `restoredPrice`、good_pass 归零）
+ *   3. `values.total / num`（仅当 Rules 只给出总价时的兜底）
+ *
+ * 导出为纯函数方便单测直接驱动钩子，不依赖 OrderModule 实例。
+ */
+export declare function createDefaultOrderRulesHooks(): RulesParamsHooks;
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
  * @param {CartItem} cartItem
@@ -28,14 +48,29 @@ export declare function formatDateTime(date: Date): string;
 export declare function normalizeSubmitBooking<T extends {
     metadata?: Record<string, any>;
 }>(booking: T): T;
+/** 提交用人数：有限且为正则向下取整，否则为 1 */
+export declare function normalizeSubmitCollectPaxValue(value: unknown): number;
+/** 从临时订单 metadata 解析合成 booking 的 collect_pax */
+export declare function resolveSubmitCollectPax(tempOrder: ScanOrderTempOrder): number;
 export declare function createDefaultTempOrder(params: {
     now: string;
     summary?: ScanOrderSummary;
 }): ScanOrderTempOrder;
+export interface SubmitPayloadEnhancerContext {
+    tempOrder: ScanOrderTempOrder;
+    bookingUuid: string;
+    now: Date;
+}
+export type SubmitPayloadEnhancer = (payload: ScanOrderSubmitPayload, ctx: SubmitPayloadEnhancerContext) => ScanOrderSubmitPayload;
 export declare function buildSubmitPayload(params: {
     tempOrder: ScanOrderTempOrder;
     cacheId?: string;
     now?: Date;
+    platform?: string;
+    businessCode?: string;
+    channel?: string;
+    type?: string;
+    enhance?: SubmitPayloadEnhancer;
 }): ScanOrderSubmitPayload;
 export declare function formatV1Product(products: ScanOrderSubmitProduct[]): {
     bundle: any[];
@@ -43,7 +78,7 @@ export declare function formatV1Product(products: ScanOrderSubmitProduct[]): {
     option: any[];
     product_id: number | null;
     product_variant_id: number;
-    quantity: number;
+    num: number;
     rowKey: number | null;
     session: null;
     unique: string;

package/lib/modules/Order/utils.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   buildSubmitPayload: () => buildSubmitPayload,
+  createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
   createEmptySummary: () => import_utils2.createEmptySummary,
   createUuidV4: () => createUuidV4,
@@ -39,12 +40,59 @@ __export(utils_exports, {
   getAllDiscountList: () => getAllDiscountList,
   isTempOrder: () => isTempOrder,
   mergeRelationForms: () => mergeRelationForms,
-  normalizeSubmitBooking: () => normalizeSubmitBooking
+  normalizeSubmitBooking: () => normalizeSubmitBooking,
+  normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
+  resolveSubmitCollectPax: () => resolveSubmitCollectPax
 });
 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_utils2 = require("../../solution/ScanOrder/utils");
+function createDefaultOrderRulesHooks() {
+  const toUnitPriceString = (totalLike, num) => {
+    const effectiveNum = Number(num) > 0 ? Number(num) : 1;
+    return new import_decimal.default(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
+  };
+  return {
+    getProduct: (product) => {
+      var _a, _b, _c, _d;
+      return {
+        id: product.product_id,
+        _id: product.identity_key ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${product.product_variant_id}`,
+        price: product.selling_price,
+        total: new import_decimal.default(product.selling_price || 0).times(product.num || 1).toNumber(),
+        origin_total: new import_decimal.default(product.original_price || product.selling_price || 0).times(product.num || 1).toNumber(),
+        original_price: product.original_price,
+        quantity: product.num || 1,
+        num: product.num || 1,
+        discount_list: product.discount_list || [],
+        bundle: product.product_bundle || [],
+        booking_id: ((_a = product._origin) == null ? void 0 : _a.booking_id) || null,
+        isClient: false,
+        isManualDiscount: ((_b = product._origin) == null ? void 0 : _b.isManualDiscount) || false,
+        holder_id: (_c = product._origin) == null ? void 0 : _c.holder_id,
+        startDate: (_d = product._origin) == null ? void 0 : _d.startDate
+      };
+    },
+    setProduct: (product, values) => {
+      const nextNum = Number(values.quantity ?? product.num ?? 1) || 1;
+      const nextSellingPrice = values.main_product_selling_price !== void 0 ? String(values.main_product_selling_price) : values.price !== void 0 ? String(values.price) : values.total !== void 0 ? toUnitPriceString(values.total, nextNum) : product.selling_price;
+      return {
+        ...product,
+        selling_price: nextSellingPrice,
+        original_price: values.original_price !== void 0 ? String(values.original_price) : product.original_price,
+        discount_list: values.discount_list ?? product.discount_list,
+        num: values.quantity ?? product.num,
+        product_bundle: values.bundle ?? product.product_bundle,
+        metadata: {
+          ...product.metadata || {},
+          ...values.main_product_selling_price !== void 0 ? { main_product_selling_price: String(values.main_product_selling_price) } : {}
+        }
+      };
+    }
+  };
+}
 var generateDuration = (cartItem) => {
   const startDate = (0, import_dayjs.default)(`${cartItem.start_date} ${cartItem.start_time}`);
   const endDate = (0, import_dayjs.default)(`${cartItem.end_date} ${cartItem.end_time}`);
@@ -124,13 +172,18 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.price_breakdown) {
     cleanMetadata.price_breakdown = rawMetadata.price_breakdown;
   }
+  if (rawMetadata.is_rule !== void 0) {
+    cleanMetadata.is_rule = rawMetadata.is_rule;
+  }
   return {
     ...submitProduct,
     ...bookingUid ? { booking_uid: bookingUid } : {},
     product_option_item: submitProduct.product_option_item || [],
     discount_list: submitProduct.discount_list || [],
     product_bundle: submitProduct.product_bundle || [],
-    metadata: cleanMetadata
+    metadata: cleanMetadata,
+    // 出站兼容：后端仍消费 payment_price 字段，从 selling_price（券后单价）派生。
+    payment_price: submitProduct.selling_price
   };
 }
 var SUBMIT_BOOKING_METADATA_WHITELIST = [
@@ -172,6 +225,14 @@ function resolveTableOccupancyDuration(tempOrder) {
   }
   return DEFAULT_TABLE_OCCUPANCY_DURATION;
 }
+function normalizeSubmitCollectPaxValue(value) {
+  const n = Number(value);
+  return Number.isFinite(n) && n > 0 ? Math.floor(n) : 1;
+}
+function resolveSubmitCollectPax(tempOrder) {
+  var _a;
+  return normalizeSubmitCollectPaxValue((_a = tempOrder.metadata) == null ? void 0 : _a.collect_pax);
+}
 function createDefaultTempOrder(params) {
   const summary = params.summary || (0, import_utils.createEmptySummary)();
   return {
@@ -221,7 +282,16 @@ function createDefaultTempOrder(params) {
   };
 }
 function buildSubmitPayload(params) {
-  const { tempOrder, cacheId, now = /* @__PURE__ */ new Date() } = params;
+  const {
+    tempOrder,
+    cacheId,
+    now = /* @__PURE__ */ new Date(),
+    platform,
+    businessCode,
+    channel,
+    type,
+    enhance
+  } = params;
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   const summary = tempOrder.summary || (0, import_utils.createEmptySummary)();
   const relationId = tempOrder.relation_id;
@@ -231,8 +301,8 @@ function buildSubmitPayload(params) {
   const bookingDuration = resolveTableOccupancyDuration(tempOrder);
   const bookingEnd = bookingStart.add(bookingDuration, "minute");
   const bookings = relationId && tableFormId ? [{
-    relation_id: relationId,
-    form_id: tableFormId,
+    relation_id: 0,
+    form_id: 0,
     start_time: bookingStart.format("HH:mm"),
     start_date: bookingStart.format("YYYY-MM-DD"),
     end_time: bookingEnd.format("HH:mm"),
@@ -240,28 +310,28 @@ function buildSubmitPayload(params) {
     duration: bookingDuration,
     metadata: {
       unique_identification_number: bookingUuid,
-      collect_pax: 1
+      collect_pax: resolveSubmitCollectPax(tempOrder)
     },
     select_date: bookingStart.format("YYYY-MM-DD"),
     is_all: false,
-    "like_status": "common",
-    "schedule_id": 0,
-    "relation_type": "form",
-    "number": 1
+    like_status: "common",
+    schedule_id: 0,
+    relation_type: "",
+    number: 1
   }] : tempOrder.bookings || [];
   const formRecordIds = relationId && tableFormId ? [{
     form_id: tableFormId,
-    form_record_ids: [relationId]
+    form_record_id: relationId
   }] : void 0;
   const { created_at: _createdAt, summary: _summary, surcharges: _surcharges, ...tempOrderRest } = tempOrder;
-  return {
+  const payload = {
     ...tempOrderRest,
-    platform: normalizeSubmitPlatform(tempOrder.platform),
+    platform: normalizeSubmitPlatform(platform ?? tempOrder.platform),
     request_unique_idempotency_token: cacheId,
-    type: tempOrder.type || "table-order",
-    business_code: tempOrder.business_code || "table-order",
+    type: type ?? tempOrder.type ?? "table-order",
+    business_code: businessCode ?? tempOrder.business_code ?? "table-order",
     sales_channel: tempOrder.sales_channel || "my_pisel",
-    order_sales_channel: tempOrder.order_sales_channel || "online_store",
+    order_sales_channel: channel ?? tempOrder.order_sales_channel ?? "online_store",
     status: tempOrder.status || "normal",
     payment_status: tempOrder.payment_status || "payment_processing",
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
@@ -282,13 +352,19 @@ function buildSubmitPayload(params) {
     contacts_info: tempOrder.contacts_info || [],
     // holder: tempOrder.holder || null,
     // summary,
-    metadata: {
-      ...tempOrder.metadata
-    },
+    metadata: (() => {
+      const {
+        collect_pax: _collectPax,
+        table_occupancy_duration: _tableOccupancyDuration,
+        ...rest
+      } = tempOrder.metadata || {};
+      return { ...rest };
+    })(),
     products: (tempOrder.products || []).map(
       (product) => normalizeSubmitProduct(product)
     )
   };
+  return enhance ? enhance(payload, { tempOrder, bookingUuid, now }) : payload;
 }
 function formatV1Product(products) {
   return products.map((product) => {
@@ -298,7 +374,7 @@ function formatV1Product(products) {
       option: product.product_option_item,
       product_id: product.product_id,
       product_variant_id: product.product_variant_id,
-      quantity: product.num,
+      num: product.num,
       rowKey: product.product_id,
       session: null,
       unique: createUuidV4()
@@ -308,6 +384,7 @@ function formatV1Product(products) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildSubmitPayload,
+  createDefaultOrderRulesHooks,
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
@@ -317,5 +394,7 @@ function formatV1Product(products) {
   getAllDiscountList,
   isTempOrder,
   mergeRelationForms,
-  normalizeSubmitBooking
+  normalizeSubmitBooking,
+  normalizeSubmitCollectPaxValue,
+  resolveSubmitCollectPax
 });

package/lib/modules/ProductList/index.js

@@ -61,7 +61,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
     cacheId,
     with_schedule
   }, options) {
-    var _a, _b;
+    var _a;
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
     try {
@@ -97,7 +97,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
         schedule_date,
         with_schedule,
         schedule_datetime,
-        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
+        // application_code: this.otherParams?.channel,
+        application_code: "online-store",
         is_eject: 1
       },
       { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId, useCache: true, customToast: () => {

package/lib/modules/Quotation/index.js

@@ -43,6 +43,9 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     const query = {};
     if (params == null ? void 0 : params.channel)
       query.channel = params.channel;
+    if ((params == null ? void 0 : params.channel) === "online_store") {
+      query.channel = "online-store";
+    }
     const res = await this.request.get(
       "/quotation/available",
       query,

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

@@ -2,9 +2,10 @@ export interface SalesSummaryProduct {
     product_id: number | null;
     product_variant_id: number;
     num: number;
+    /** 券后单品单价（订单域成交单价），由 OrderModule 维护。 */
     selling_price: string;
+    /** 券前单品单价（店铺售价）。 */
     original_price: string;
-    payment_price: string;
     tax_fee: string;
     is_charge_tax?: number;
     product_option_item?: any[];

package/lib/modules/SalesSummary/utils.js

@@ -82,7 +82,7 @@ function getBundleUnitPrice(product, useOriginal = false) {
 }
 function getUnitPaymentTotal(product) {
   const variantPrice = getVariantPrice(product);
-  const basePrice = variantPrice || toDecimal(product.selling_price || product.payment_price);
+  const basePrice = variantPrice || toDecimal(product.selling_price);
   return basePrice.plus(getOptionUnitPrice(product)).plus(getBundleUnitPrice(product));
 }
 function getUnitOriginalTotal(product) {
@@ -231,7 +231,7 @@ function calculateSingleItemTax(params) {
 function getMainProductPaymentTotal(product) {
   var _a, _b, _c, _d;
   const variantPrice = getVariantPrice(product);
-  let total = variantPrice || toDecimal(((_a = product.metadata) == null ? void 0 : _a.main_product_selling_price) ?? product.selling_price ?? product.payment_price);
+  let total = variantPrice || toDecimal(((_a = product.metadata) == null ? void 0 : _a.main_product_selling_price) ?? product.selling_price);
   const mainDiscountList = ((_c = (_b = product._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_d = product._origin) == null ? void 0 : _d.discount_list) || [];
   const mainDiscountAmount = getDiscountListAmount(
     mainDiscountList.filter((d) => {

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

@@ -46,7 +46,7 @@ export declare const formatScheduleResult: (schedule: ScheduleItem) => {
 };
 export declare const calcScheduleDateRange: (schedule: ScheduleItem) => any[];
 export declare const calcCalendarDataBySchedules: (schedules: ScheduleItem[]) => unknown[];
-export declare const calcMinTimeMaxTimeBySchedules: (schedules: ScheduleItem[], scheduleAllMap?: ScheduleAllMap, selectDate?: string) => {};
+export declare const calcMinTimeMaxTimeBySchedules: (schedules: ScheduleItem[], scheduleAllMap?: ScheduleAllMap, selectDate?: string) => ScheduleAllMap;
 /**
  * @title: 格式化日程数据
  * @description:

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

@@ -27,6 +27,8 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private itemRuleConfigsPromise;
     private itemRulePrefillApplied;
     private itemRuleRuntimeConfig;
+    /** 最近一次 checkResourceAvailable 从预约规则 link 拉取的商品快照 */
+    private enabledReservationRuleProducts;
     private getScanOrderLoggerContext;
     private serializeError;
     private addScanOrderLog;
@@ -50,10 +52,17 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     };
     getTempOrder(): import("./types").ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): string;
+    setPickupReferenceMode(mode: 'counter_pickup' | 'table_service'): {
+        service_type: 'dine_in';
+        pickup_reference_mode: 'counter_pickup' | 'table_service';
+    };
+    setPickupRef(buzzer: string): string;
     private ensureTempOrder;
     addNewOrder(): Promise<import("./types").ScanOrderTempOrder>;
+    restoreOrder(): Promise<import("./types").ScanOrderTempOrder>;
     getOrderProducts(): ScanOrderOrderProduct[];
     getSummary(): Promise<import("./types").ScanOrderSummary>;
+    private buildReservationRuleEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
     updateProductInOrder(params: {
@@ -87,4 +96,17 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     }>;
     getProductList(): Promise<any>;
     getOtherParams(): Record<string, any>;
+    setOtherParams(params: Record<string, any>, { cover }?: {
+        cover?: boolean;
+    }): Promise<void>;
+    setEntryPaxNumber(number: number): Promise<void>;
+    getEntryPaxNumber(): number | null;
+    getFulfillmentModes(): {
+        enablePickup: boolean;
+        enableTableService: boolean;
+    };
+    checkManualPickupRef(): {
+        enabled: boolean;
+        manualInputType?: string;
+    };
 }