@pisell/pisellos 2.1.126 → 2.1.128

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

@@ -327,7 +327,8 @@ export var ItemRuleAdapter = /*#__PURE__*/function () {
       var scope = config.scope,
         quantityRules = config.quantityRules,
         targetType = config.targetType,
-        targets = config.targets;
+        targets = config.targets,
+        validationMessage = config.validationMessage;
       if (!this.shouldEvaluateForScope(scope, (_businessData$submiss2 = businessData.submissionIndex) !== null && _businessData$submiss2 !== void 0 ? _businessData$submiss2 : 0)) {
         return null;
       }
@@ -374,6 +375,7 @@ export var ItemRuleAdapter = /*#__PURE__*/function () {
         _iterator4.f();
       }
       var remainingMax = this.calculateRemainingMax(scope, requiredMax, targets, businessData);
+      var formattedValidationMessage = this.formatValidationMessage(validationMessage, requiredMin, requiredMax, requiredExact);
       return {
         ruleId: action.id,
         targetType: targetType,
@@ -383,7 +385,9 @@ export var ItemRuleAdapter = /*#__PURE__*/function () {
         remainingMax: remainingMax,
         requiredExact: requiredExact,
         mustInclude: mustInclude,
-        scope: scope
+        scope: scope,
+        validationMessage: formattedValidationMessage,
+        rawValidationMessage: validationMessage
       };
     }
 

package/dist/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/dist/model/strategy/adapter/itemRule/examples.js

@@ -205,7 +205,74 @@ export var HOTPOT_BASE_REQUIRED_STRATEGY = {
 };
 
 // ============================================
-// 示例 4：ItemRuleEvaluator 用法（简洁调用 + 完整 Demo）
+// 示例 4：锅底四选一（Multi-target OR 组至少 1 份）
+// ============================================
+
+/**
+ * 场景：4 款锅底里任选至少 1 款，不自动预填，不限制多选上限
+ *
+ * WHEN: Always active
+ * THEN:
+ *   - Quantity Check: 4 个锅底商品合计数量 >= 1 （OR 组语义）
+ *
+ * 说明：
+ *   - targets 里放多个 product_id 时，ItemRuleAdapter 会把它们视为 OR 组，
+ *     仅校验「合计数量」，不会要求每款各自满足 min。
+ *   - ScanOrder 工具层 buildQuantityLimitIndex 会跳过多目标规则的
+ *     单品索引，避免 UI 把组级 min 误当作每张商品卡的减号下限，
+ *     锁死用户切换锅底的操作。
+ */
+export 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: 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'
+      }
+    }
+  }]
+};
+
+// ============================================
+// 示例 5：ItemRuleEvaluator 用法（简洁调用 + 完整 Demo）
 // ============================================
 
 /**

package/dist/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/dist/model/strategy/adapter/itemRule/index.js

@@ -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/dist/model/strategy/adapter/itemRule/type.d.ts

@@ -198,6 +198,15 @@ export interface QuantityLimitResult {
     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/dist/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/dist/modules/Order/index.js

@@ -25,7 +25,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
-import { generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createEmptySummary, formatDateTime, formatV1Product, isTempOrder } from "./utils";
+import { generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, formatDateTime, formatV1Product, isTempOrder } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
@@ -176,42 +176,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createDefaultRulesHooks",
     value: function createDefaultRulesHooks() {
-      return {
-        getProduct: function getProduct(product) {
-          var _product$_origin, _product$_origin2, _product$_origin3, _product$_origin4;
-          return {
-            id: product.product_id,
-            _id: product.identity_key ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.identity_key) : "".concat(product.product_id, "_").concat(product.product_variant_id),
-            price: product.selling_price,
-            total: new Decimal(product.payment_price || product.selling_price || 0).times(product.num || 1).toNumber(),
-            origin_total: new Decimal(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: ((_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.booking_id) || null,
-            isClient: false,
-            isManualDiscount: ((_product$_origin2 = product._origin) === null || _product$_origin2 === void 0 ? void 0 : _product$_origin2.isManualDiscount) || false,
-            holder_id: (_product$_origin3 = product._origin) === null || _product$_origin3 === void 0 ? void 0 : _product$_origin3.holder_id,
-            startDate: (_product$_origin4 = product._origin) === null || _product$_origin4 === void 0 ? void 0 : _product$_origin4.startDate
-          };
-        },
-        setProduct: function setProduct(product, values) {
-          var _values$discount_list, _values$quantity, _values$bundle;
-          return _objectSpread(_objectSpread({}, product), {}, {
-            selling_price: values.price !== undefined ? String(values.price) : product.selling_price,
-            payment_price: values.total !== undefined ? String(values.total) : product.payment_price,
-            original_price: values.original_price !== undefined ? String(values.original_price) : product.original_price,
-            discount_list: (_values$discount_list = values.discount_list) !== null && _values$discount_list !== void 0 ? _values$discount_list : product.discount_list,
-            num: (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num,
-            product_bundle: (_values$bundle = values.bundle) !== null && _values$bundle !== void 0 ? _values$bundle : product.product_bundle,
-            metadata: _objectSpread(_objectSpread({}, product.metadata || {}), values.main_product_selling_price !== undefined ? {
-              main_product_selling_price: String(values.main_product_selling_price)
-            } : {})
-          });
-        }
-      };
+      return createDefaultOrderRulesHooks();
     }
 
     // ─── Discount: 公共 API ───
@@ -360,9 +325,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyDiscount",
     value: function applyDiscount() {
-      var _tempOrder$products, _this$store$discount6, _tempOrder$holder3, _tempOrder$holder4;
+      var _this$store$discount6, _tempOrder$holder3, _tempOrder$holder4;
       var tempOrder = this.store.tempOrder;
-      if (!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$products = tempOrder.products) !== null && _tempOrder$products !== void 0 && _tempOrder$products.length)) return;
+      // 任意 products CRUD 后都应当重算 discount 状态；即使 products 为空，
+      // 也需要让 Rules.calcDiscount 把 DiscountModule 的 isSelected / isAvailable /
+      // appliedProductDetails / savedAmount 以及 tempOrder.discount_list 复位。
+      if (!tempOrder) return;
       var rulesModule = this.store.rules;
       if (!rulesModule) return;
       var discountList = ((_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 ? void 0 : _this$store$discount6.getDiscountList()) || [];
@@ -1117,7 +1085,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (res.code === 200 && this.store.tempOrder) {
                 this.store.tempOrder.lastOrderInfo = res.data;
               }
-            case 4:
+              return _context15.abrupt("return", res);
+            case 5:
             case "end":
               return _context15.stop();
           }

package/dist/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;
@@ -47,7 +71,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/dist/modules/Order/utils.js

@@ -1,11 +1,6 @@
 var _excluded = ["_origin", "identity_key"],
   _excluded2 = ["created_at", "summary", "surcharges"];
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -15,8 +10,75 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import dayjs from "dayjs";
+import Decimal from 'decimal.js';
 import { createEmptySummary } from "../../solution/ScanOrder/utils";
+/**
+ * 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 function createDefaultOrderRulesHooks() {
+  var toUnitPriceString = function toUnitPriceString(totalLike, num) {
+    var effectiveNum = Number(num) > 0 ? Number(num) : 1;
+    return new Decimal(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
+  };
+  return {
+    getProduct: function getProduct(product) {
+      var _product$_origin, _product$_origin2, _product$_origin3, _product$_origin4;
+      return {
+        id: product.product_id,
+        _id: product.identity_key ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.identity_key) : "".concat(product.product_id, "_").concat(product.product_variant_id),
+        price: product.selling_price,
+        total: new Decimal(product.selling_price || 0).times(product.num || 1).toNumber(),
+        origin_total: new Decimal(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: ((_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.booking_id) || null,
+        isClient: false,
+        isManualDiscount: ((_product$_origin2 = product._origin) === null || _product$_origin2 === void 0 ? void 0 : _product$_origin2.isManualDiscount) || false,
+        holder_id: (_product$_origin3 = product._origin) === null || _product$_origin3 === void 0 ? void 0 : _product$_origin3.holder_id,
+        startDate: (_product$_origin4 = product._origin) === null || _product$_origin4 === void 0 ? void 0 : _product$_origin4.startDate
+      };
+    },
+    setProduct: function setProduct(product, values) {
+      var _ref, _values$quantity, _values$discount_list, _values$quantity2, _values$bundle;
+      var nextNum = Number((_ref = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref !== void 0 ? _ref : 1) || 1;
+      var nextSellingPrice = values.main_product_selling_price !== undefined ? String(values.main_product_selling_price) : values.price !== undefined ? String(values.price) : values.total !== undefined ? toUnitPriceString(values.total, nextNum) : product.selling_price;
+      return _objectSpread(_objectSpread({}, product), {}, {
+        selling_price: nextSellingPrice,
+        original_price: values.original_price !== undefined ? String(values.original_price) : product.original_price,
+        discount_list: (_values$discount_list = values.discount_list) !== null && _values$discount_list !== void 0 ? _values$discount_list : product.discount_list,
+        num: (_values$quantity2 = values.quantity) !== null && _values$quantity2 !== void 0 ? _values$quantity2 : product.num,
+        product_bundle: (_values$bundle = values.bundle) !== null && _values$bundle !== void 0 ? _values$bundle : product.product_bundle,
+        metadata: _objectSpread(_objectSpread({}, product.metadata || {}), values.main_product_selling_price !== undefined ? {
+          main_product_selling_price: String(values.main_product_selling_price)
+        } : {})
+      });
+    }
+  };
+}
 
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
@@ -131,7 +193,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 = ['unique_identification_number', 'collect_pax'];
@@ -170,6 +234,18 @@ function resolveTableOccupancyDuration(tempOrder) {
   }
   return DEFAULT_TABLE_OCCUPANCY_DURATION;
 }
+
+/** 提交用人数：有限且为正则向下取整，否则为 1 */
+export function normalizeSubmitCollectPaxValue(value) {
+  var n = Number(value);
+  return Number.isFinite(n) && n > 0 ? Math.floor(n) : 1;
+}
+
+/** 从临时订单 metadata 解析合成 booking 的 collect_pax */
+export function resolveSubmitCollectPax(tempOrder) {
+  var _tempOrder$metadata;
+  return normalizeSubmitCollectPaxValue((_tempOrder$metadata = tempOrder.metadata) === null || _tempOrder$metadata === void 0 ? void 0 : _tempOrder$metadata.collect_pax);
+}
 export function createDefaultTempOrder(params) {
   var summary = params.summary || createEmptySummary();
   return {
@@ -219,7 +295,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  var _ref, _ref2, _ref3, _tempOrder$is_price_i, _tempOrder$is_deposit;
+  var _ref2, _ref3, _ref4, _tempOrder$is_price_i, _tempOrder$is_deposit;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -246,7 +322,7 @@ export 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,
@@ -266,10 +342,10 @@ export function buildSubmitPayload(params) {
   return _objectSpread(_objectSpread({}, tempOrderRest), {}, {
     platform: normalizeSubmitPlatform(platform !== null && platform !== void 0 ? platform : tempOrder.platform),
     request_unique_idempotency_token: cacheId,
-    type: (_ref = type !== null && type !== void 0 ? type : tempOrder.type) !== null && _ref !== void 0 ? _ref : 'table-order',
-    business_code: (_ref2 = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code) !== null && _ref2 !== void 0 ? _ref2 : 'table-order',
+    type: (_ref2 = type !== null && type !== void 0 ? type : tempOrder.type) !== null && _ref2 !== void 0 ? _ref2 : 'table-order',
+    business_code: (_ref3 = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code) !== null && _ref3 !== void 0 ? _ref3 : 'table-order',
     sales_channel: tempOrder.sales_channel || 'my_pisel',
-    order_sales_channel: (_ref3 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref3 !== void 0 ? _ref3 : 'online_store',
+    order_sales_channel: (_ref4 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref4 !== void 0 ? _ref4 : 'online_store',
     status: tempOrder.status || 'normal',
     payment_status: tempOrder.payment_status || 'payment_processing',
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
@@ -306,7 +382,7 @@ export 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()

package/dist/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/dist/modules/SalesSummary/utils.js

@@ -68,7 +68,7 @@ function getBundleUnitPrice(product) {
 // 单商品总价口径：主商品单价 + option + bundle（随后再乘商品数量）
 function getUnitPaymentTotal(product) {
   var variantPrice = getVariantPrice(product);
-  var basePrice = variantPrice || toDecimal(product.selling_price || product.payment_price);
+  var basePrice = variantPrice || toDecimal(product.selling_price);
   return basePrice.plus(getOptionUnitPrice(product)).plus(getBundleUnitPrice(product));
 }
 function getUnitOriginalTotal(product) {
@@ -254,9 +254,9 @@ function calculateSingleItemTax(params) {
  * 与 Summary/utils.ts 的 getMainProductTotal 逻辑对齐，适配 SalesSummaryProduct 结构。
  */
 function getMainProductPaymentTotal(product) {
-  var _ref2, _product$metadata$mai, _product$metadata4, _product$_origin3, _product$_origin4;
+  var _product$metadata$mai, _product$metadata4, _product$_origin3, _product$_origin4;
   var variantPrice = getVariantPrice(product);
-  var total = variantPrice || toDecimal((_ref2 = (_product$metadata$mai = (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_selling_price) !== null && _product$metadata$mai !== void 0 ? _product$metadata$mai : product.selling_price) !== null && _ref2 !== void 0 ? _ref2 : product.payment_price);
+  var total = variantPrice || toDecimal((_product$metadata$mai = (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_selling_price) !== null && _product$metadata$mai !== void 0 ? _product$metadata$mai : product.selling_price);
   var mainDiscountList = ((_product$_origin3 = product._origin) === null || _product$_origin3 === void 0 || (_product$_origin3 = _product$_origin3.product) === null || _product$_origin3 === void 0 ? void 0 : _product$_origin3.discount_list) || ((_product$_origin4 = product._origin) === null || _product$_origin4 === void 0 ? void 0 : _product$_origin4.discount_list) || [];
   var mainDiscountAmount = getDiscountListAmount(mainDiscountList.filter(function (d) {
     var _d$metadata;
@@ -271,8 +271,8 @@ function getMainProductPaymentTotal(product) {
     for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
       var bundleItem = _step5.value;
       if (isBundleMarkupOrDiscount(bundleItem)) {
-        var _ref3, _bundleItem$bundle_se;
-        total = total.plus(toDecimal((_ref3 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref3 !== void 0 ? _ref3 : 0));
+        var _ref2, _bundleItem$bundle_se;
+        total = total.plus(toDecimal((_ref2 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref2 !== void 0 ? _ref2 : 0));
       }
     }
   } catch (err) {
@@ -340,24 +340,24 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
         _step7;
       try {
         for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var _bundleItem$num, _ref4, _bundleItem$bundle_se2, _ref5, _ref6, _bundleItem$original_, _ref7, _bundleItem$is_charge, _ref8, _bundleItem$is_charge2;
+          var _bundleItem$num, _ref3, _bundleItem$bundle_se2, _ref4, _ref5, _bundleItem$original_, _ref6, _bundleItem$is_charge, _ref7, _bundleItem$is_charge2;
           var bundleItem = _step7.value;
           if (!isBundleOriginalPrice(bundleItem)) continue;
           var bundleQuantity = new Decimal(getSafeNum((_bundleItem$num = bundleItem.num) !== null && _bundleItem$num !== void 0 ? _bundleItem$num : bundleItem.quantity));
-          var bundlePrice = toDecimal((_ref4 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref4 !== void 0 ? _ref4 : 0);
-          var bundleOriginalPrice = toDecimal((_ref5 = (_ref6 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref6 !== void 0 ? _ref6 : bundleItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
+          var bundlePrice = toDecimal((_ref3 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
+          var bundleOriginalPrice = toDecimal((_ref4 = (_ref5 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref5 !== void 0 ? _ref5 : bundleItem.price) !== null && _ref4 !== void 0 ? _ref4 : 0);
           var bundleTaxPrecise = calculateSingleItemTax({
             price: bundlePrice,
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
-            isChargeTax: (_ref7 = (_bundleItem$is_charge = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge !== void 0 ? _bundleItem$is_charge : product.is_charge_tax) !== null && _ref7 !== void 0 ? _ref7 : 0
+            isChargeTax: (_ref6 = (_bundleItem$is_charge = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge !== void 0 ? _bundleItem$is_charge : product.is_charge_tax) !== null && _ref6 !== void 0 ? _ref6 : 0
           });
           var bundleTaxRounded = bundleTaxPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
           var bundleOrigTaxPrecise = calculateSingleItemTax({
             price: bundleOriginalPrice,
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
-            isChargeTax: (_ref8 = (_bundleItem$is_charge2 = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge2 !== void 0 ? _bundleItem$is_charge2 : product.is_charge_tax) !== null && _ref8 !== void 0 ? _ref8 : 0
+            isChargeTax: (_ref7 = (_bundleItem$is_charge2 = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge2 !== void 0 ? _bundleItem$is_charge2 : product.is_charge_tax) !== null && _ref7 !== void 0 ? _ref7 : 0
           });
           var bundleOrigTaxRounded = bundleOrigTaxPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
           bundleItem.tax_fee = bundleTaxRounded.toNumber();

package/dist/solution/BookingByStep/index.d.ts

@@ -310,7 +310,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -357,7 +357,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/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;
 }