@pisell/pisellos 2.1.125 → 2.1.127

package/lib/solution/ScanOrder/index.js

@@ -38,6 +38,7 @@ var import_types = require("./types");
 var import_utils = require("./utils");
 var import_types2 = require("../BookingByStep/types");
 var import_ProductList = require("../../modules/ProductList");
+var import_utils2 = require("../../modules/Order/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var import_itemRule = require("../../model/strategy/adapter/itemRule");
 __reExport(ScanOrder_exports, require("./types"), module.exports);
@@ -60,7 +61,8 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       cartValidation: {
         passed: null,
         failures: []
-      }
+      },
+      entryPaxNumber: 1
     };
     this.otherParams = {};
     this.itemRuleEvaluator = new import_itemRule.ItemRuleEvaluator();
@@ -420,6 +422,11 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       if (!this.store.order) {
         throw new Error("scanOrder解决方案需要 order 模块支持");
       }
+      const pax = (0, import_utils2.normalizeSubmitCollectPaxValue)(this.store.entryPaxNumber);
+      this.store.entryPaxNumber = pax;
+      const tempOrderForSubmit = this.store.order.ensureTempOrder();
+      tempOrderForSubmit.metadata = { ...tempOrderForSubmit.metadata, collect_pax: pax };
+      this.store.order.persistTempOrder();
       const result = await this.store.order.submitTempOrder({
         cacheId: this.cacheId,
         platform: (_a = this.otherParams) == null ? void 0 : _a.platform,
@@ -698,22 +705,13 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
           (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
@@ -765,6 +763,10 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
     });
   }
   async applyItemRulePrefill() {
+    var _a, _b;
+    if ((_b = (_a = this.store.order) == null ? void 0 : _a.getLastOrderInfo) == null ? void 0 : _b.call(_a)) {
+      return;
+    }
     this.logMethodStart("applyItemRulePrefill");
     await this.applyPrefillByItemRule();
     await this.refreshItemRuleQuantityLimits();
@@ -926,7 +928,8 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       isExclusive,
       isFull,
       orderNumberPrefix,
-      raw: config
+      raw: config,
+      table_form_record: (config == null ? void 0 : config.table_form_record) ?? null
     };
   }
   async fetchTableConfigByResourceId(resourceId) {
@@ -950,7 +953,7 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
   // 通过 resource_id + 店铺配置
   // hasOrderId 表示 url 上是否有 orderid，如果是的话，后续的流程会走加单
   async checkResourceAvailable(resourceId, hasOrderId) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     this.logMethodStart("checkResourceAvailable", {
       resourceId
     });
@@ -988,6 +991,7 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
         relation_id: resourceState.relationId,
         table_form_id: resourceState.tableFormId,
         deskmate_valid: resourceState.deskmate_valid,
+        table_form_record: resourceState.table_form_record,
         policy: (_c = config == null ? void 0 : config.table_form_record) == null ? void 0 : _c.policy,
         partyroom_booking: (_d = config == null ? void 0 : config.table_form_record) == null ? void 0 : _d.partyroom_booking
       };
@@ -1000,8 +1004,11 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       );
       if (reservationLinkIds.length === 0) {
         this.enabledReservationRuleProducts = [];
-        if (this.store.resource)
+        if (this.store.resource) {
           delete this.store.resource.requestEntryPax;
+          delete this.store.resource.requestPaxMin;
+          delete this.store.resource.requestPaxMax;
+        }
       } else {
         tempOrder.metadata = { ...tempOrder.metadata || {} };
         delete tempOrder.metadata.table_occupancy_duration;
@@ -1036,13 +1043,35 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
             availabilityInfo.requestEntryPax = 1;
             if (this.store.resource)
               this.store.resource.requestEntryPax = 1;
+            delete availabilityInfo.requestPaxMin;
+            delete availabilityInfo.requestPaxMax;
+            if (this.store.resource) {
+              delete this.store.resource.requestPaxMin;
+              delete this.store.resource.requestPaxMax;
+            }
+            const paxBounds = (0, import_utils.pickFirstCustomCapacityPaxBounds)(loaded);
+            if ((paxBounds == null ? void 0 : paxBounds.min) !== void 0) {
+              availabilityInfo.requestPaxMin = paxBounds.min;
+              if (this.store.resource)
+                this.store.resource.requestPaxMin = paxBounds.min;
+            }
+            if ((paxBounds == null ? void 0 : paxBounds.max) !== void 0) {
+              availabilityInfo.requestPaxMax = paxBounds.max;
+              if (this.store.resource)
+                this.store.resource.requestPaxMax = paxBounds.max;
+            }
           } else if (this.store.resource) {
             delete this.store.resource.requestEntryPax;
+            delete this.store.resource.requestPaxMin;
+            delete this.store.resource.requestPaxMax;
           }
         } else {
           this.enabledReservationRuleProducts = [];
-          if (this.store.resource)
+          if (this.store.resource) {
             delete this.store.resource.requestEntryPax;
+            delete this.store.resource.requestPaxMin;
+            delete this.store.resource.requestPaxMax;
+          }
           void this.addScanOrderLog({
             level: "error",
             title: "[ScanOrder] enabled_reservation_rules product query failed",
@@ -1061,10 +1090,31 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
         tempOrder.order_id = resourceState.lastOrderId;
       }
       if (tempOrder.order_id) {
-        await ((_g = this.store.order) == null ? void 0 : _g.getOrderInfoByRemote(tempOrder.order_id));
+        const res = await ((_g = this.store.order) == null ? void 0 : _g.getOrderInfoByRemote(tempOrder.order_id));
+        const entryPaxNumber = (_k = (_j = (_i = (_h = res == null ? void 0 : res.data) == null ? void 0 : _h.bookings) == null ? void 0 : _i.find((p) => {
+          var _a2;
+          return (_a2 = p.metadata) == null ? void 0 : _a2.collect_pax;
+        })) == null ? void 0 : _j.metadata) == null ? void 0 : _k.collect_pax;
+        if (entryPaxNumber) {
+          await this.setEntryPaxNumber(entryPaxNumber);
+        }
       }
-      await this.refreshItemRuleQuantityLimits();
-      await this.refreshCartValidationPassed();
+      const lastOrderInfo = (_m = (_l = this.store.order) == null ? void 0 : _l.getLastOrderInfo) == null ? void 0 : _m.call(_l);
+      const historicalItems = hasOrderId && Array.isArray(lastOrderInfo == null ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce((acc, p) => {
+        if (typeof (p == null ? void 0 : p.product_id) !== "number")
+          return acc;
+        acc.push({
+          product_id: p.product_id,
+          quantity: Number(p.product_quantity) || 0,
+          ...typeof p.product_variant_id === "number" ? { product_variant_id: p.product_variant_id } : {}
+        });
+        return acc;
+      }, []) : [];
+      await this.setItemRuleRuntimeConfig({
+        serviceType: (_n = this.otherParams) == null ? void 0 : _n.businessCode,
+        submissionIndex: hasOrderId ? 1 : 0,
+        historicalItems
+      });
       this.logMethodSuccess("checkResourceAvailable", {
         resourceId,
         mode: availabilityInfo.mode,
@@ -1131,6 +1181,32 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
   getOtherParams() {
     return this.otherParams;
   }
+  async setOtherParams(params, { cover = false } = {}) {
+    if (cover) {
+      this.otherParams = params;
+    } else {
+      this.otherParams = { ...this.otherParams, ...params };
+    }
+  }
+  async setEntryPaxNumber(number) {
+    const pax = (0, import_utils2.normalizeSubmitCollectPaxValue)(number);
+    this.store.entryPaxNumber = pax;
+    if (this.store.order) {
+      const t = this.store.order.ensureTempOrder();
+      t.metadata = { ...t.metadata, collect_pax: pax };
+      this.store.order.persistTempOrder();
+    }
+    this.itemRuleRuntimeConfig = {
+      ...this.itemRuleRuntimeConfig,
+      pax: { total: pax, adult: 0, child: 0 }
+    };
+    this.itemRulePrefillApplied = false;
+    await this.refreshItemRuleQuantityLimits();
+    await this.refreshCartValidationPassed();
+  }
+  getEntryPaxNumber() {
+    return this.store.entryPaxNumber;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -59,8 +59,15 @@ export declare function resolveSkuMatchedQuantityLimits(params: {
 export declare function aggregateItemRuleLimit(matchedLimits: QuantityLimitResult[]): {
     min: number | undefined;
     max: number | undefined;
+    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;
@@ -102,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]);
     }
@@ -195,29 +198,66 @@ function aggregateItemRuleLimit(matchedLimits) {
     return null;
   let min;
   let max;
+  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)) {
+      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) {
@@ -297,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;
   }
@@ -311,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,
@@ -327,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 || [],
@@ -372,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,
@@ -391,6 +457,7 @@ function hasCustomCapacityProduct(products) {
   normalizeEnabledItemRuleIds,
   normalizeItemRuleStrategies,
   normalizeOrderProduct,
+  pickFirstCustomCapacityPaxBounds,
   pickFirstDurationMinutesFromProducts,
   resolveSkuMatchedQuantityLimits,
   toBoolean,

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

@@ -25,6 +25,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private cacheId;
     private window;
     private request;
+    private baseSlotConfig;
     private itemRuleEvaluator;
     private itemRuleConfigs;
     private itemRuleConfigsPromise;
@@ -80,6 +81,9 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         startDate: string;
         endDate: string;
     }): Promise<void>;
+    private getOperatingHoursScheduleIds;
+    private resolveSlotConfigForDate;
+    private syncOperatingHoursToSlotConfig;
     getDateRangeSummary(params: {
         startDate: string;
         endDate: string;