@pisell/pisellos 2.1.126 → 2.1.128

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

@@ -36,9 +36,10 @@ export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
     product_option_item: any[];
+    /** 券后单品单价（= 订单域实际成交单价）。未应用券时等同 original_price。 */
     selling_price: string;
+    /** 券前单品单价（= 店铺售价），不承载后台划线价语义。 */
     original_price: string;
-    payment_price: string;
     tax_fee: string;
     is_charge_tax: number;
     discount_list: any[];
@@ -47,6 +48,11 @@ export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     _origin?: Record<string, any>;
 }
 export interface ScanOrderSubmitProduct extends Omit<ScanOrderOrderProduct, '_origin' | 'identity_key'> {
+    /**
+     * 出站兼容字段：SDK 内部不再消费 payment_price，
+     * 仅在提交后端时由 selling_price 派生，保持原有后端契约。
+     */
+    payment_price: string;
 }
 export interface ScanOrderSummary {
     product_quantity: number;
@@ -133,6 +139,11 @@ export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platfo
     products: ScanOrderSubmitProduct[];
 }
 export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'resource_block' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
+export interface ScanOrderTableFormRecord {
+    policy?: string | null;
+    partyroom_booking?: string | null;
+    [key: string]: any;
+}
 export interface ScanOrderAvailabilityInfo {
     mode: ScanOrderAvailabilityMode;
     order_id?: string;
@@ -140,10 +151,16 @@ export interface ScanOrderAvailabilityInfo {
     table_form_id?: string;
     deskmate_valid?: boolean;
     errorTips?: string;
+    /** `/order/dining/table/config` 返回的 `table_form_record` 原样透出 */
+    table_form_record?: ScanOrderTableFormRecord | null;
     policy?: string | null;
     partyroom_booking?: string | null;
     /** 预约规则关联商品存在 custom 容量时，由 checkResourceAvailable 置为 1 */
     requestEntryPax?: number;
+    /** 首个 `capacity.type === 'custom'` 商品里 `custom[0]` 的 min（人数下限） */
+    requestPaxMin?: number;
+    /** 首个 `capacity.type === 'custom'` 商品里 `custom[0]` 的 max（人数上限） */
+    requestPaxMax?: number;
 }
 export interface ScanOrderTableSnackConfig {
     snack?: boolean | number | string;
@@ -153,9 +170,6 @@ export interface ScanOrderOrderNumberPrefixConfig {
     table_order?: string;
     pos?: string;
 }
-export interface ScanOrderTableFormRecord {
-    policy?: string | null;
-}
 export interface ScanOrderTableConfigApiData {
     table_max_number?: number | string | null;
     order_count?: number | string | null;
@@ -186,7 +200,6 @@ export interface ScanOrderResourceState extends ScanOrderAvailabilityInfo {
     isFull: boolean;
     orderNumberPrefix: ScanOrderOrderNumberPrefixConfig[];
     raw: ScanOrderTableConfigApiData | null;
-    table_form_record?: ScanOrderTableFormRecord | null;
 }
 export interface ScanOrderState {
     entryContext: ScanOrderEntryContext | null;
@@ -204,6 +217,7 @@ export interface ScanOrderState {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
+    entryPaxNumber: number | null;
 }
 export interface ScanOrderLoggerRuntimeConfig {
     provider?: ScanOrderLoggerProviderType;

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

@@ -62,6 +62,12 @@ export declare function aggregateItemRuleLimit(matchedLimits: QuantityLimitResul
     remainingMax: number | undefined;
     exact: number | undefined;
     mustInclude: boolean;
+    validationMessage: string | undefined;
+    rawValidationMessage: string | Record<string, string> | undefined;
+    maxValidationMessage: string | undefined;
+    rawMaxValidationMessage: string | Record<string, string> | undefined;
+    minValidationMessage: string | undefined;
+    rawMinValidationMessage: string | Record<string, string> | undefined;
 } | null;
 export declare function buildItemRuleBusinessData(params: {
     tempOrder: ScanOrderTempOrder;
@@ -103,3 +109,11 @@ export declare function collectLinkProductIdsFromReservationRules(rules: unknown
 export declare function pickFirstDurationMinutesFromProducts(products: ProductData[]): number | undefined;
 /** 是否存在 capacity.type === 'custom' 的商品 */
 export declare function hasCustomCapacityProduct(products: ProductData[]): boolean;
+/**
+ * 在商品列表中找到第一个 `capacity.type === 'custom'` 的商品，取其 `custom` 数组第一项的 min/max。
+ * 仅返回有限数字字段；若均无法解析则返回 `undefined`。
+ */
+export declare function pickFirstCustomCapacityPaxBounds(products: ProductData[]): {
+    min?: number;
+    max?: number;
+} | undefined;

package/lib/solution/ScanOrder/utils.js

@@ -36,6 +36,7 @@ __export(utils_exports, {
   normalizeEnabledItemRuleIds: () => normalizeEnabledItemRuleIds,
   normalizeItemRuleStrategies: () => normalizeItemRuleStrategies,
   normalizeOrderProduct: () => normalizeOrderProduct,
+  pickFirstCustomCapacityPaxBounds: () => pickFirstCustomCapacityPaxBounds,
   pickFirstDurationMinutesFromProducts: () => pickFirstDurationMinutesFromProducts,
   resolveSkuMatchedQuantityLimits: () => resolveSkuMatchedQuantityLimits,
   toBoolean: () => toBoolean,
@@ -163,18 +164,20 @@ function buildQuantityLimitIndex(limits) {
   const exactLimitMap = /* @__PURE__ */ new Map();
   const productLimitMap = /* @__PURE__ */ new Map();
   for (const limit of limits) {
-    for (const target of limit.targets || []) {
-      const productId = Number(target.product_id);
-      if (!Number.isFinite(productId) || productId <= 0)
-        continue;
-      const variantId = Number(target.product_variant_id);
-      const hasVariant = Number.isFinite(variantId) && variantId > 0;
-      if (hasVariant) {
-        const exactKey = buildProductKey(productId, variantId);
-        const existed2 = exactLimitMap.get(exactKey) || [];
-        exactLimitMap.set(exactKey, [...existed2, limit]);
-        continue;
-      }
+    const targets = limit.targets || [];
+    if (targets.length !== 1)
+      continue;
+    const target = targets[0];
+    const productId = Number(target.product_id);
+    if (!Number.isFinite(productId) || productId <= 0)
+      continue;
+    const variantId = Number(target.product_variant_id);
+    const hasVariant = Number.isFinite(variantId) && variantId > 0;
+    if (hasVariant) {
+      const exactKey = buildProductKey(productId, variantId);
+      const existed = exactLimitMap.get(exactKey) || [];
+      exactLimitMap.set(exactKey, [...existed, limit]);
+    } else {
       const existed = productLimitMap.get(productId) || [];
       productLimitMap.set(productId, [...existed, limit]);
     }
@@ -198,31 +201,63 @@ function aggregateItemRuleLimit(matchedLimits) {
   let remainingMax;
   let exact;
   let mustInclude = false;
+  let maxSourceLimit;
+  let remainingMaxSourceLimit;
+  let exactSourceLimit;
+  let minSourceLimit;
+  let firstMessagedLimit;
   for (const limit of matchedLimits) {
     if (typeof limit.requiredMin === "number" && Number.isFinite(limit.requiredMin)) {
-      min = min === void 0 ? limit.requiredMin : Math.max(min, limit.requiredMin);
+      if (min === void 0 || limit.requiredMin > min) {
+        min = limit.requiredMin;
+        minSourceLimit = limit;
+      }
     }
     if (typeof limit.requiredMax === "number" && Number.isFinite(limit.requiredMax)) {
-      max = max === void 0 ? limit.requiredMax : Math.min(max, limit.requiredMax);
+      if (max === void 0 || limit.requiredMax < max) {
+        max = limit.requiredMax;
+        maxSourceLimit = limit;
+      }
     }
     if (typeof limit.remainingMax === "number" && Number.isFinite(limit.remainingMax)) {
-      remainingMax = remainingMax === void 0 ? limit.remainingMax : Math.min(remainingMax, limit.remainingMax);
+      if (remainingMax === void 0 || limit.remainingMax < remainingMax) {
+        remainingMax = limit.remainingMax;
+        remainingMaxSourceLimit = limit;
+      }
     }
     if (typeof limit.requiredExact === "number" && Number.isFinite(limit.requiredExact)) {
       exact = limit.requiredExact;
+      exactSourceLimit = limit;
     }
     mustInclude = mustInclude || Boolean(limit.mustInclude);
+    if (!firstMessagedLimit && limit.validationMessage) {
+      firstMessagedLimit = limit;
+    }
   }
   if (typeof exact === "number" && Number.isFinite(exact)) {
     min = exact;
     max = exact;
   }
+  const maxMessageSource = maxSourceLimit || remainingMaxSourceLimit || exactSourceLimit || firstMessagedLimit;
+  const minMessageSource = minSourceLimit || exactSourceLimit || firstMessagedLimit;
+  const maxValidationMessage = maxMessageSource == null ? void 0 : maxMessageSource.validationMessage;
+  const rawMaxValidationMessage = maxMessageSource == null ? void 0 : maxMessageSource.rawValidationMessage;
+  const minValidationMessage = minMessageSource == null ? void 0 : minMessageSource.validationMessage;
+  const rawMinValidationMessage = minMessageSource == null ? void 0 : minMessageSource.rawValidationMessage;
+  const validationMessage = maxValidationMessage ?? minValidationMessage;
+  const rawValidationMessage = rawMaxValidationMessage ?? rawMinValidationMessage;
   return {
     min,
     max,
     remainingMax,
     exact,
-    mustInclude
+    mustInclude,
+    validationMessage,
+    rawValidationMessage,
+    maxValidationMessage,
+    rawMaxValidationMessage,
+    minValidationMessage,
+    rawMinValidationMessage
   };
 }
 function buildItemRuleBusinessData(params) {
@@ -302,13 +337,13 @@ function getProductIdentityIndex(products, identity) {
   return products.findIndex((item) => isIdentityMatch(item, identity));
 }
 function normalizeOrderProduct(product) {
-  var _a;
+  var _a, _b;
   const metadata = { ...product.metadata || {} };
   if (product.identity_key && !metadata.unique_identification_number) {
     metadata.unique_identification_number = product.identity_key;
   }
-  const resolvedOriginalPrice = product.original_price || "0.00";
   const resolvedSellingPrice = product.selling_price || "0.00";
+  const resolvedOriginalPrice = product.original_price || resolvedSellingPrice;
   if (metadata.main_product_original_price === void 0) {
     metadata.main_product_original_price = resolvedOriginalPrice;
   }
@@ -316,7 +351,7 @@ function normalizeOrderProduct(product) {
     metadata.main_product_selling_price = resolvedSellingPrice;
   }
   if (metadata.source_product_price === void 0) {
-    metadata.source_product_price = ((_a = product._origin) == null ? void 0 : _a.original_price) ?? resolvedOriginalPrice;
+    metadata.source_product_price = ((_a = product._origin) == null ? void 0 : _a.price) ?? ((_b = product._origin) == null ? void 0 : _b.base_price) ?? resolvedSellingPrice;
   }
   const normalizedBundle = (product.product_bundle || []).map((item) => ({
     ...item,
@@ -332,7 +367,6 @@ function normalizeOrderProduct(product) {
     product_option_item: product.product_option_item || [],
     selling_price: resolvedSellingPrice,
     original_price: resolvedOriginalPrice,
-    payment_price: product.payment_price || "0.00",
     tax_fee: product.tax_fee || "0.00",
     is_charge_tax: product.is_charge_tax ?? 0,
     discount_list: product.discount_list || [],
@@ -377,6 +411,33 @@ function hasCustomCapacityProduct(products) {
     return ((_a = p == null ? void 0 : p.capacity) == null ? void 0 : _a.type) === "custom";
   });
 }
+function pickFirstCustomCapacityPaxBounds(products) {
+  for (const p of products) {
+    const cap = p == null ? void 0 : p.capacity;
+    if (!cap || cap.type !== "custom")
+      continue;
+    if (!Array.isArray(cap.custom) || cap.custom.length === 0)
+      continue;
+    const row = cap.custom[0];
+    if (!row || typeof row !== "object")
+      continue;
+    const raw = row;
+    const out = {};
+    if (raw.min !== null && raw.min !== void 0 && raw.min !== "") {
+      const min = Number(raw.min);
+      if (Number.isFinite(min))
+        out.min = min;
+    }
+    if (raw.max !== null && raw.max !== void 0 && raw.max !== "") {
+      const max = Number(raw.max);
+      if (Number.isFinite(max))
+        out.max = max;
+    }
+    if (out.min !== void 0 || out.max !== void 0)
+      return out;
+  }
+  return void 0;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   aggregateItemRuleLimit,
@@ -396,6 +457,7 @@ function hasCustomCapacityProduct(products) {
   normalizeEnabledItemRuleIds,
   normalizeItemRuleStrategies,
   normalizeOrderProduct,
+  pickFirstCustomCapacityPaxBounds,
   pickFirstDurationMinutesFromProducts,
   resolveSkuMatchedQuantityLimits,
   toBoolean,

package/lib/solution/VenueBooking/index.js

@@ -876,7 +876,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
           num: 1,
           selling_price: group.totalPrice,
           original_price: group.totalPrice,
-          payment_price: group.totalPrice,
           is_charge_tax: (venueProduct == null ? void 0 : venueProduct.is_charge_tax) ?? 0,
           metadata: {
             venue_booking: true,
@@ -1052,7 +1051,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         const merged = (0, import_slotMerge.mergeConsecutiveSlots)(updatedSlots);
         if (merged.length === 1) {
           product.selling_price = merged[0].totalPrice;
-          product.payment_price = merged[0].totalPrice;
+          product.original_price = merged[0].totalPrice;
           product.metadata.price_breakdown = (0, import_slotMerge.buildPriceBreakdown)({
             group: merged[0],
             productId: mapping.productId,
@@ -1067,7 +1066,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         });
         if (quotationPrice !== null) {
           product.selling_price = quotationPrice;
-          product.payment_price = quotationPrice;
+          product.original_price = quotationPrice;
         }
       }
     }
@@ -1162,15 +1161,14 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
           return rid != null && selectedResourceIds.has(rid);
         });
         if (product.discount_list.length < before) {
-          const totalDiscountAmount = product.discount_list.reduce(
+          const totalPerUnitDiscount = product.discount_list.reduce(
             (sum, pd) => sum + (pd.amount || 0),
             0
           );
-          const newPaymentPrice = new import_decimal.default(product.selling_price || 0).minus(totalDiscountAmount).toNumber();
-          const paymentStr = (0, import_utils.toPriceString)(newPaymentPrice);
-          product.payment_price = paymentStr;
+          const newSellingPrice = new import_decimal.default(product.original_price || product.selling_price || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+          product.selling_price = newSellingPrice;
           if (product.metadata) {
-            product.metadata.main_product_selling_price = paymentStr;
+            product.metadata.main_product_selling_price = newSellingPrice;
           }
         }
       }
@@ -1267,10 +1265,9 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         });
         if (quotationPrice !== null) {
           product.selling_price = quotationPrice;
-          if (product.original_price == null) {
-            product.original_price = quotationPrice;
-          }
-          product.payment_price = quotationPrice;
+          product.original_price = quotationPrice;
+        } else if (product.selling_price != null) {
+          product.original_price = product.selling_price;
         }
       }
       const products = await this.store.order.addProductToOrder(product);
@@ -1515,16 +1512,13 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       });
       if (productIndex === -1) {
         const sellingPrice = (0, import_utils.toPriceString)((sourceItem == null ? void 0 : sourceItem.price) ?? (sourceItem == null ? void 0 : sourceItem.selling_price), "0.00");
-        const originalPrice = (0, import_utils.toPriceString)((sourceItem == null ? void 0 : sourceItem.original_price) ?? (sourceItem == null ? void 0 : sourceItem.price) ?? sellingPrice, sellingPrice);
-        const paymentPrice = (0, import_utils.toPriceString)((sourceItem == null ? void 0 : sourceItem.payment_price) ?? (sourceItem == null ? void 0 : sourceItem.price) ?? sellingPrice, sellingPrice);
         tempOrder.products.push(
           (0, import_utils.normalizeOrderProduct)({
             product_id: productId,
             product_variant_id: productVariantId,
             num: targetQuantity,
             selling_price: sellingPrice,
-            original_price: originalPrice,
-            payment_price: paymentPrice,
+            original_price: sellingPrice,
             metadata: { item_rule_prefill: true, item_rule_id: prefillItem.ruleId },
             _origin: { ...sourceItem || {}, item_rule_prefill: true, item_rule_id: prefillItem.ruleId }
           })
@@ -1547,6 +1541,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       }
     }
     if (hasChanges) {
+      this.store.order.applyDiscount();
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.1.126",
+  "version": "2.1.128",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",