@pisell/pisellos 0.0.500 → 0.0.501

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/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -330,7 +330,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -27,6 +27,8 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private itemRuleConfigsPromise;
     private itemRulePrefillApplied;
     private itemRuleRuntimeConfig;
+    /** 最近一次 checkResourceAvailable 从预约规则 link 拉取的商品快照 */
+    private enabledReservationRuleProducts;
     private getScanOrderLoggerContext;
     private serializeError;
     private addScanOrderLog;
@@ -87,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;
 }

package/lib/solution/ScanOrder/index.js

@@ -37,6 +37,8 @@ var import_BaseModule = require("../../modules/BaseModule");
 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);
@@ -59,7 +61,8 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       cartValidation: {
         passed: null,
         failures: []
-      }
+      },
+      entryPaxNumber: 1
     };
     this.otherParams = {};
     this.itemRuleEvaluator = new import_itemRule.ItemRuleEvaluator();
@@ -67,6 +70,8 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
     this.itemRuleConfigsPromise = null;
     this.itemRulePrefillApplied = false;
     this.itemRuleRuntimeConfig = {};
+    /** 最近一次 checkResourceAvailable 从预约规则 link 拉取的商品快照 */
+    this.enabledReservationRuleProducts = [];
   }
   getScanOrderLoggerContext() {
     return {
@@ -410,19 +415,28 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async submitScanOrder() {
-    var _a;
+    var _a, _b, _c, _d, _e;
     this.logMethodStart("submitScanOrder");
     try {
       await this.validateBeforeSubmitByItemRule();
       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
+        cacheId: this.cacheId,
+        platform: (_a = this.otherParams) == null ? void 0 : _a.platform,
+        businessCode: (_b = this.otherParams) == null ? void 0 : _b.businessCode,
+        channel: (_c = this.otherParams) == null ? void 0 : _c.channel,
+        type: (_d = this.otherParams) == null ? void 0 : _d.type
       });
       const tempOrder = this.store.order.getTempOrder();
       this.logMethodSuccess("submitScanOrder", {
-        productCount: ((_a = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _a.length) || 0
+        productCount: ((_e = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _e.length) || 0
       });
       return result;
     } catch (error) {
@@ -691,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
@@ -758,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();
@@ -919,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) {
@@ -943,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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     this.logMethodStart("checkResourceAvailable", {
       resourceId
     });
@@ -981,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
       };
@@ -988,6 +999,89 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       tempOrder.relation_id = resourceId || ((_e = this.otherParams) == null ? void 0 : _e.relation_id);
       tempOrder.table_form_id = resourceState.tableFormId;
       tempOrder.resource_id = resourceId;
+      const reservationLinkIds = (0, import_utils.collectLinkProductIdsFromReservationRules)(
+        dineInConfig["reservation.enabled_reservation_rules"]
+      );
+      if (reservationLinkIds.length === 0) {
+        this.enabledReservationRuleProducts = [];
+        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;
+        const reservationProductList = new import_ProductList.ProductList(
+          `${this.name}_reservationEnabledRules`,
+          this.defaultVersion
+        );
+        await reservationProductList.initialize(this.core, {
+          store: { list: [], selectProducts: [] },
+          otherParams: {
+            ...this.otherParams,
+            fatherModule: this.name,
+            openCache: Boolean(this.cacheId),
+            cacheId: this.cacheId
+          }
+        });
+        const scheduleDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
+        const scheduleDatetime = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+        const loaded = await reservationProductList.loadProducts({
+          product_ids: reservationLinkIds,
+          schedule_date: scheduleDate,
+          schedule_datetime: scheduleDatetime,
+          cacheId: this.cacheId
+        });
+        if (Array.isArray(loaded)) {
+          this.enabledReservationRuleProducts = loaded;
+          const occupancyMinutes = (0, import_utils.pickFirstDurationMinutesFromProducts)(loaded);
+          if (occupancyMinutes !== void 0) {
+            tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
+          }
+          if ((0, import_utils.hasCustomCapacityProduct)(loaded)) {
+            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) {
+            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",
+            payload: {
+              linkIds: reservationLinkIds,
+              error: this.serializeError(loaded)
+            }
+          });
+        }
+      }
       (_f = this.store.order) == null ? void 0 : _f.persistTempOrder();
       if (availabilityInfo.mode === "idle") {
         await this.addNewOrder();
@@ -995,8 +1089,32 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       if (availabilityInfo.mode === "additional_order" || availabilityInfo.mode === "additional_order_with_code") {
         tempOrder.order_id = resourceState.lastOrderId;
       }
-      await this.refreshItemRuleQuantityLimits();
-      await this.refreshCartValidationPassed();
+      if (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);
+        }
+      }
+      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,
@@ -1063,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;
@@ -121,6 +127,7 @@ export interface ScanOrderTempOrder {
     holder: Record<string, any> | null;
     summary: ScanOrderSummary;
     metadata: Record<string, any>;
+    lastOrderInfo?: Record<string, any>;
 }
 export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platform' | 'products' | 'created_at' | 'summary' | 'surcharges'> {
     platform: 'H5' | 'PC';
@@ -132,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;
@@ -139,8 +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;
@@ -150,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;
@@ -183,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;
@@ -201,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

@@ -1,6 +1,7 @@
 import { ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderSummary, ScanOrderTempOrder } from './types';
 import type { CartItemSummary, ItemRuleBusinessData, PaxInfo, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
+import type { ProductData } from '../../modules/Product/types';
 /**
  * 构建金额全为 0 的空 summary。
  * 作为尚未计算金额时的兜底默认值，避免下游因 undefined 报错。
@@ -58,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;
@@ -91,3 +99,21 @@ export declare function getProductIdentityIndex(products: ScanOrderOrderProduct[
  * - 保留 _origin 供后续业务流程（如促销规则）使用
  */
 export declare function normalizeOrderProduct(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): ScanOrderOrderProduct;
+/**
+ * 从 reservation.enabled_reservation_rules 中收集 type=link 的商品 id。
+ */
+export declare function collectLinkProductIdsFromReservationRules(rules: unknown): number[];
+/**
+ * 返回列表中第一个带有效 duration.value（分钟）的商品时长。
+ */
+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;