@pisell/pisellos 2.1.125 → 2.1.127

package/dist/solution/VenueBooking/utils/dateSummary.d.ts

@@ -7,4 +7,5 @@ export declare function buildDateRangeSummary(params: {
     rawResources: VenueResourceRawData[];
     resourceProductMap: Map<number | string, ResourceProductMapping>;
     quotationModule?: QuotationModule;
+    resolveConfig?: (date: string) => VenueBookingSlotConfig;
 }): VenueDateSummaryItem[];

package/dist/solution/VenueBooking/utils/dateSummary.js

@@ -13,7 +13,8 @@ export function buildDateRangeSummary(params) {
     config = params.config,
     rawResources = params.rawResources,
     resourceProductMap = params.resourceProductMap,
-    quotationModule = params.quotationModule;
+    quotationModule = params.quotationModule,
+    resolveConfig = params.resolveConfig;
   var result = [];
   var productIds = quotationModule ? _toConsumableArray(new Set(_toConsumableArray(resourceProductMap.values()).map(function (m) {
     return m.productId;
@@ -22,9 +23,10 @@ export function buildDateRangeSummary(params) {
   var end = dayjs(endDate);
   var _loop = function _loop() {
     var date = cursor.format('YYYY-MM-DD');
+    var effectiveConfig = (resolveConfig === null || resolveConfig === void 0 ? void 0 : resolveConfig(date)) || config;
     var quotationPriceMap;
     if (quotationModule && productIds.length) {
-      var timeLabels = generateTimeLabels(config);
+      var timeLabels = generateTimeLabels(effectiveConfig);
       var timePoints = timeLabels.map(function (label) {
         return "".concat(date, " ").concat(label);
       });
@@ -35,7 +37,7 @@ export function buildDateRangeSummary(params) {
     }
     var grid = buildTimeSlotGrid({
       date: date,
-      config: config,
+      config: effectiveConfig,
       rawResources: rawResources,
       resourceProductMap: resourceProductMap,
       quotationPriceMap: quotationPriceMap
@@ -81,7 +83,7 @@ export function buildDateRangeSummary(params) {
       status = 'unavailable';
     } else if (availableSlots === 0) {
       status = 'sold_out';
-    } else if ((totalSlots - availableSlots) / totalSlots >= config.fewLeftThreshold) {
+    } else if ((totalSlots - availableSlots) / totalSlots >= effectiveConfig.fewLeftThreshold) {
       status = 'few_left';
     } else {
       status = 'available';

package/lib/model/strategy/adapter/itemRule/adapter.d.ts

@@ -50,6 +50,14 @@ export declare class ItemRuleAdapter implements BusinessAdapter {
      * 不适用或无配置时返回 null。
      */
     extractQuantityLimits(action: ActionEffect, businessData: ItemRuleBusinessData): QuantityLimitResult | null;
+    /**
+     * 计算当前提交剩余可选的最大数量。
+     *
+     * 仅在 scope='cumulative' 且存在 requiredMax 时生效：
+     * 用 requiredMax 减去 historicalItems 中目标商品的累计数量，保底 0。
+     * 其余场景返回 undefined，保持向后兼容。
+     */
+    private calculateRemainingMax;
     private processPrefillCart;
     /**
      * 根据 quantityFrom 计算预填数量

package/lib/model/strategy/adapter/itemRule/adapter.js

@@ -250,7 +250,7 @@ var ItemRuleAdapter = class {
     const config = action.config;
     if (!config)
       return null;
-    const { scope, quantityRules, targetType, targets } = config;
+    const { scope, quantityRules, targetType, targets, validationMessage } = config;
     if (!this.shouldEvaluateForScope(scope, businessData.submissionIndex ?? 0)) {
       return null;
     }
@@ -283,17 +283,56 @@ var ItemRuleAdapter = class {
         }
       }
     }
+    const remainingMax = this.calculateRemainingMax(
+      scope,
+      requiredMax,
+      targets,
+      businessData
+    );
+    const formattedValidationMessage = this.formatValidationMessage(
+      validationMessage,
+      requiredMin,
+      requiredMax,
+      requiredExact
+    );
     return {
       ruleId: action.id,
       targetType,
       targets,
       requiredMin,
       requiredMax,
+      remainingMax,
       requiredExact,
       mustInclude,
-      scope
+      scope,
+      validationMessage: formattedValidationMessage,
+      rawValidationMessage: validationMessage
     };
   }
+  /**
+   * 计算当前提交剩余可选的最大数量。
+   *
+   * 仅在 scope='cumulative' 且存在 requiredMax 时生效：
+   * 用 requiredMax 减去 historicalItems 中目标商品的累计数量，保底 0。
+   * 其余场景返回 undefined，保持向后兼容。
+   */
+  calculateRemainingMax(scope, requiredMax, targets, businessData) {
+    if (scope !== "cumulative" || typeof requiredMax !== "number") {
+      return void 0;
+    }
+    const historicalItems = businessData.historicalItems;
+    if (!(historicalItems == null ? void 0 : historicalItems.length)) {
+      return Math.max(0, requiredMax);
+    }
+    const targetIds = new Set(targets.map((t) => t.product_id));
+    let historicalQty = 0;
+    for (const item of historicalItems) {
+      if (targetIds.has(item.product_id)) {
+        historicalQty += item.quantity;
+      }
+    }
+    return Math.max(0, requiredMax - historicalQty);
+  }
   // ============================================
   // Prefill Cart 处理
   // ============================================

package/lib/model/strategy/adapter/itemRule/examples.d.ts

@@ -25,6 +25,21 @@ export declare const MAX_BUNS_PER_TABLE_STRATEGY: StrategyConfig;
  *   - Prefill Cart: 自动添加默认锅底 x 1
  */
 export declare const HOTPOT_BASE_REQUIRED_STRATEGY: StrategyConfig;
+/**
+ * 场景：4 款锅底里任选至少 1 款，不自动预填，不限制多选上限
+ *
+ * WHEN: Always active
+ * THEN:
+ *   - Quantity Check: 4 个锅底商品合计数量 >= 1 （OR 组语义）
+ *
+ * 说明：
+ *   - targets 里放多个 product_id 时，ItemRuleAdapter 会把它们视为 OR 组，
+ *     仅校验「合计数量」，不会要求每款各自满足 min。
+ *   - ScanOrder 工具层 buildQuantityLimitIndex 会跳过多目标规则的
+ *     单品索引，避免 UI 把组级 min 误当作每张商品卡的减号下限，
+ *     锁死用户切换锅底的操作。
+ */
+export declare const HOTPOT_BASE_PICK_ONE_STRATEGY: StrategyConfig;
 /**
  * ItemRuleEvaluator 简洁调用示例
  *

package/lib/model/strategy/adapter/itemRule/examples.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/model/strategy/adapter/itemRule/examples.ts
 var examples_exports = {};
 __export(examples_exports, {
+  HOTPOT_BASE_PICK_ONE_STRATEGY: () => HOTPOT_BASE_PICK_ONE_STRATEGY,
   HOTPOT_BASE_REQUIRED_STRATEGY: () => HOTPOT_BASE_REQUIRED_STRATEGY,
   MAX_BUNS_PER_TABLE_STRATEGY: () => MAX_BUNS_PER_TABLE_STRATEGY,
   MIN_CONDIMENT_PER_PERSON_STRATEGY: () => MIN_CONDIMENT_PER_PERSON_STRATEGY,
@@ -190,6 +191,51 @@ var HOTPOT_BASE_REQUIRED_STRATEGY = {
     }
   ]
 };
+var HOTPOT_BASE_PICK_ONE_STRATEGY = {
+  metadata: {
+    id: "RULE_HOTPOT_BASE_PICK_ONE",
+    name: {
+      "zh-CN": "锅底必选（四选一）",
+      en: "Hotpot base required (pick any)"
+    },
+    type: "item_rule",
+    description: {
+      "zh-CN": "4 款锅底任选至少 1 份",
+      en: "Pick at least 1 hotpot base from the available options"
+    }
+  },
+  conditions: {
+    operator: "and",
+    rules: [],
+    actionIds: ["quantity_check_hotpot_base_group"]
+  },
+  actions: [
+    {
+      id: "quantity_check_hotpot_base_group",
+      type: import_type.ITEM_RULE_ACTION_TYPES.QUANTITY_CHECK,
+      value: null,
+      target: "cart",
+      priority: 10,
+      config: {
+        targetType: "product",
+        targets: [
+          { product_id: 30001 },
+          { product_id: 30002 },
+          { product_id: 30003 },
+          { product_id: 30004 }
+        ],
+        quantityRules: [
+          { comparison: "minimum", source: "fixed", value: 1 }
+        ],
+        scope: "first_submission_only",
+        validationMessage: {
+          "zh-CN": "请至少选择 {min} 款锅底",
+          en: "Please select at least {min} hotpot base"
+        }
+      }
+    }
+  ]
+};
 function quickUseItemRuleEvaluator() {
   const evaluator = new import_evaluator.ItemRuleEvaluator();
   evaluator.setStrategyConfigs([
@@ -261,6 +307,7 @@ function runItemRuleEvaluatorDemo() {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  HOTPOT_BASE_PICK_ONE_STRATEGY,
   HOTPOT_BASE_REQUIRED_STRATEGY,
   MAX_BUNS_PER_TABLE_STRATEGY,
   MIN_CONDIMENT_PER_PERSON_STRATEGY,

package/lib/model/strategy/adapter/itemRule/index.d.ts

@@ -1,5 +1,5 @@
 export { ItemRuleEvaluator } from './evaluator';
 export { ItemRuleAdapter } from './adapter';
 export { default } from './adapter';
-export { MIN_CONDIMENT_PER_PERSON_STRATEGY, MAX_BUNS_PER_TABLE_STRATEGY, HOTPOT_BASE_REQUIRED_STRATEGY, quickUseItemRuleEvaluator, runItemRuleEvaluatorDemo, } from './examples';
+export { MIN_CONDIMENT_PER_PERSON_STRATEGY, MAX_BUNS_PER_TABLE_STRATEGY, HOTPOT_BASE_REQUIRED_STRATEGY, HOTPOT_BASE_PICK_ONE_STRATEGY, quickUseItemRuleEvaluator, runItemRuleEvaluatorDemo, } from './examples';
 export * from './type';

package/lib/model/strategy/adapter/itemRule/index.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/model/strategy/adapter/itemRule/index.ts
 var itemRule_exports = {};
 __export(itemRule_exports, {
+  HOTPOT_BASE_PICK_ONE_STRATEGY: () => import_examples.HOTPOT_BASE_PICK_ONE_STRATEGY,
   HOTPOT_BASE_REQUIRED_STRATEGY: () => import_examples.HOTPOT_BASE_REQUIRED_STRATEGY,
   ItemRuleAdapter: () => import_adapter.ItemRuleAdapter,
   ItemRuleEvaluator: () => import_evaluator.ItemRuleEvaluator,
@@ -47,6 +48,7 @@ var import_examples = require("./examples");
 __reExport(itemRule_exports, require("./type"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  HOTPOT_BASE_PICK_ONE_STRATEGY,
   HOTPOT_BASE_REQUIRED_STRATEGY,
   ItemRuleAdapter,
   ItemRuleEvaluator,

package/lib/model/strategy/adapter/itemRule/type.d.ts

@@ -180,14 +180,33 @@ export interface QuantityLimitResult {
     targets: TargetItem[];
     /** 要求的最小数量 */
     requiredMin?: number;
-    /** 要求的最大数量 */
+    /** 要求的最大数量（规则配置的原始上限，用于 UI 文案展示） */
     requiredMax?: number;
+    /**
+     * 当前提交剩余可选的最大数量。
+     *
+     * 仅在 scope='cumulative' 且存在 requiredMax 时计算：
+     *   remainingMax = max(0, requiredMax - historicalItems 中目标商品累计数量)
+     *
+     * 非 cumulative 场景不设置此字段；调用方用于限制加购上限时，
+     * 应优先读取本字段，未定义时回退到 requiredMax。
+     */
+    remainingMax?: number;
     /** 要求的精确数量 */
     requiredExact?: number;
     /** 是否必须包含 */
     mustInclude?: boolean;
     /** 作用范围 */
     scope: RuleScope;
+    /**
+     * 校验失败时的提示语（已做 {min}/{max}/{exact} 占位符替换）。
+     * 当 rawValidationMessage 为多语言对象时，后端不做 locale 选择，
+     * 默认按 en → Object.values()[0] 的顺序兜底，前端可再根据自身 locale
+     * 读取 rawValidationMessage 做精确匹配。
+     */
+    validationMessage?: string;
+    /** 原始多语言模板，前端可根据自身 locale 做二次选择 */
+    rawValidationMessage?: string | Record<string, string>;
 }
 /**
  * ItemRule 评估器的完整输出结果

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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

@@ -112,6 +112,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     createOrderByCheckout(params: CheckoutOrderParams): Promise<any>;
     submitScanOrder<T = any>(params: SubmitScanOrderParams): Promise<T>;
     scanOrderMore<T = any>(params: ScanOrderMoreParams): Promise<T>;
-    getOrderInfoByRemote(order_id: number): Promise<void>;
+    getOrderInfoByRemote(order_id: number): Promise<any>;
     getLastOrderInfo(): Record<string, any> | undefined;
 }

package/lib/modules/Order/index.js

@@ -158,41 +158,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) {
@@ -737,9 +703,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const res = await this.request.get(`/order/sales/${order_id}`, {
       with: ["products", "scheduleEvents"]
     });
-    if (res.data.code === 200 && this.store.tempOrder) {
-      this.store.tempOrder.lastOrderInfo = res.data.data;
+    if (res.code === 200 && this.store.tempOrder) {
+      this.store.tempOrder.lastOrderInfo = res.data;
     }
+    return res;
   }
   getLastOrderInfo() {
     var _a, _b;

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,6 +48,10 @@ 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;

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}`);
@@ -130,7 +178,9 @@ function normalizeSubmitProduct(product) {
     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 +222,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 {
@@ -248,7 +306,7 @@ 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,
@@ -316,6 +374,7 @@ function formatV1Product(products) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildSubmitPayload,
+  createDefaultOrderRulesHooks,
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
@@ -325,5 +384,7 @@ function formatV1Product(products) {
   getAllDiscountList,
   isTempOrder,
   mergeRelationForms,
-  normalizeSubmitBooking
+  normalizeSubmitBooking,
+  normalizeSubmitCollectPaxValue,
+  resolveSubmitCollectPax
 });

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

@@ -89,4 +89,9 @@ 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;
 }