@pisell/pisellos 2.1.125 → 2.1.126

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

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

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

@@ -180,8 +180,18 @@ export interface QuantityLimitResult {
     targets: TargetItem[];
     /** 要求的最小数量 */
     requiredMin?: number;
-    /** 要求的最大数量 */
+    /** 要求的最大数量（规则配置的原始上限，用于 UI 文案展示） */
     requiredMax?: number;
+    /**
+     * 当前提交剩余可选的最大数量。
+     *
+     * 仅在 scope='cumulative' 且存在 requiredMax 时计算：
+     *   remainingMax = max(0, requiredMax - historicalItems 中目标商品累计数量)
+     *
+     * 非 cumulative 场景不设置此字段；调用方用于限制加购上限时，
+     * 应优先读取本字段，未定义时回退到 requiredMax。
+     */
+    remainingMax?: number;
     /** 要求的精确数量 */
     requiredExact?: number;
     /** 是否必须包含 */

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

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

package/lib/modules/Order/index.js

@@ -737,8 +737,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const res = await this.request.get(`/order/sales/${order_id}`, {
       with: ["products", "scheduleEvents"]
     });
-    if (res.data.code === 200 && this.store.tempOrder) {
-      this.store.tempOrder.lastOrderInfo = res.data.data;
+    if (res.code === 200 && this.store.tempOrder) {
+      this.store.tempOrder.lastOrderInfo = res.data;
     }
   }
   getLastOrderInfo() {

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

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

package/lib/solution/ScanOrder/index.js

@@ -765,6 +765,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();
@@ -950,7 +954,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;
     this.logMethodStart("checkResourceAvailable", {
       resourceId
     });
@@ -1063,8 +1067,23 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       if (tempOrder.order_id) {
         await ((_g = this.store.order) == null ? void 0 : _g.getOrderInfoByRemote(tempOrder.order_id));
       }
-      await this.refreshItemRuleQuantityLimits();
-      await this.refreshCartValidationPassed();
+      const lastOrderInfo = (_i = (_h = this.store.order) == null ? void 0 : _h.getLastOrderInfo) == null ? void 0 : _i.call(_h);
+      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({
+        pax: { total: 2, adult: 2, child: 0 },
+        serviceType: "dine-in",
+        submissionIndex: hasOrderId ? 1 : 0,
+        historicalItems
+      });
       this.logMethodSuccess("checkResourceAvailable", {
         resourceId,
         mode: availabilityInfo.mode,

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

@@ -59,6 +59,7 @@ 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;
 } | null;

package/lib/solution/ScanOrder/utils.js

@@ -195,6 +195,7 @@ function aggregateItemRuleLimit(matchedLimits) {
     return null;
   let min;
   let max;
+  let remainingMax;
   let exact;
   let mustInclude = false;
   for (const limit of matchedLimits) {
@@ -204,6 +205,9 @@ function aggregateItemRuleLimit(matchedLimits) {
     if (typeof limit.requiredMax === "number" && Number.isFinite(limit.requiredMax)) {
       max = max === void 0 ? limit.requiredMax : Math.min(max, limit.requiredMax);
     }
+    if (typeof limit.remainingMax === "number" && Number.isFinite(limit.remainingMax)) {
+      remainingMax = remainingMax === void 0 ? limit.remainingMax : Math.min(remainingMax, limit.remainingMax);
+    }
     if (typeof limit.requiredExact === "number" && Number.isFinite(limit.requiredExact)) {
       exact = limit.requiredExact;
     }
@@ -216,6 +220,7 @@ function aggregateItemRuleLimit(matchedLimits) {
   return {
     min,
     max,
+    remainingMax,
     exact,
     mustInclude
   };

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;

package/lib/solution/VenueBooking/index.js

@@ -40,6 +40,7 @@ var import_types2 = require("../BookingByStep/types");
 var import_ProductList = require("../../modules/ProductList");
 var import_Date = require("../../modules/Date");
 var import_Schedule = require("../../modules/Schedule");
+var import_utils2 = require("../../modules/Schedule/utils");
 var import_Quotation = require("../../modules/Quotation");
 var import_OpenData = require("../../modules/OpenData");
 var import_types3 = require("../../modules/Account/types");
@@ -49,7 +50,7 @@ var import_resource = require("./utils/resource");
 var import_timeSlot = require("./utils/timeSlot");
 var import_dateSummary = require("./utils/dateSummary");
 var import_slotMerge = require("./utils/slotMerge");
-var import_utils2 = require("../../modules/Order/utils");
+var import_utils3 = require("../../modules/Order/utils");
 var import_Order = require("../../modules/Order");
 var import_types4 = require("../RegisterAndLogin/types");
 var import_decimal = __toESM(require("decimal.js"));
@@ -96,6 +97,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       }
     };
     this.otherParams = {};
+    this.baseSlotConfig = { ...import_types.DEFAULT_SLOT_CONFIG };
     this.itemRuleEvaluator = new import_itemRule.ItemRuleEvaluator();
     this.itemRuleConfigs = [];
     this.itemRuleConfigsPromise = null;
@@ -301,10 +303,11 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     this.store.status = "initializing";
     this.store.error = null;
     this.store.rawResourceData = [];
-    this.store.slotConfig = {
+    this.baseSlotConfig = {
       ...import_types.DEFAULT_SLOT_CONFIG,
       ...((_b = options.otherParams) == null ? void 0 : _b.slotConfig) || {}
     };
+    this.store.slotConfig = { ...this.baseSlotConfig };
     this.otherParams = options.otherParams || {};
     this.cacheId = (_c = this.otherParams) == null ? void 0 : _c.cacheId;
     this.itemRuleRuntimeConfig = ((_d = this.otherParams) == null ? void 0 : _d.venueBookingItemRule) || ((_e = this.otherParams) == null ? void 0 : _e.itemRule) || {};
@@ -645,27 +648,87 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
   }
   // ─── 日期概览 & 时间槽矩阵（纯计算，不发请求） ───
+  getOperatingHoursScheduleIds() {
+    var _a, _b;
+    const openData = this.otherParams.openData || ((_b = (_a = this.store.openData) == null ? void 0 : _a.getOpenData) == null ? void 0 : _b.call(_a)) || null;
+    const rawIds = openData == null ? void 0 : openData["availability.operating_hours"];
+    if (!Array.isArray(rawIds))
+      return [];
+    return [...new Set(
+      rawIds.map((id) => Number(id)).filter((id) => Number.isFinite(id) && id > 0).map((id) => Math.floor(id))
+    )];
+  }
+  resolveSlotConfigForDate(date) {
+    var _a;
+    const nextSlotConfig = { ...this.baseSlotConfig };
+    if (!date || !this.store.schedule)
+      return nextSlotConfig;
+    const operatingHoursScheduleIds = this.getOperatingHoursScheduleIds();
+    if (!operatingHoursScheduleIds.length)
+      return nextSlotConfig;
+    const scheduleList = this.store.schedule.getScheduleListByIds(
+      operatingHoursScheduleIds
+    );
+    if (!scheduleList.length)
+      return nextSlotConfig;
+    const timeRangeMap = (0, import_utils2.calcMinTimeMaxTimeBySchedules)(
+      scheduleList,
+      void 0,
+      date
+    );
+    let earliestStart = null;
+    let latestEnd = null;
+    for (const schedule of scheduleList) {
+      const dateRangeList = ((_a = timeRangeMap == null ? void 0 : timeRangeMap[schedule.id]) == null ? void 0 : _a.dateRangeFormat) || [];
+      for (const range of dateRangeList) {
+        const start = (0, import_dayjs.default)(range == null ? void 0 : range.start);
+        const end = (0, import_dayjs.default)(range == null ? void 0 : range.end);
+        if (!start.isValid() || !end.isValid())
+          continue;
+        if (!earliestStart || start.isBefore(earliestStart)) {
+          earliestStart = start;
+        }
+        if (!latestEnd || end.isAfter(latestEnd)) {
+          latestEnd = end;
+        }
+      }
+    }
+    if (!earliestStart || !latestEnd)
+      return nextSlotConfig;
+    return {
+      ...nextSlotConfig,
+      businessStartTime: earliestStart.format("HH:mm"),
+      businessEndTime: latestEnd.format("HH:mm")
+    };
+  }
+  syncOperatingHoursToSlotConfig(date) {
+    const resolvedSlotConfig = this.resolveSlotConfigForDate(date);
+    this.store.slotConfig = resolvedSlotConfig;
+    return resolvedSlotConfig;
+  }
   getDateRangeSummary(params) {
     return (0, import_dateSummary.buildDateRangeSummary)({
       startDate: params.startDate,
       endDate: params.endDate,
-      config: this.store.slotConfig,
+      config: this.baseSlotConfig,
       rawResources: this.store.rawResourceData,
       resourceProductMap: this.resourceProductMap,
-      quotationModule: this.store.quotation
+      quotationModule: this.store.quotation,
+      resolveConfig: (date) => this.resolveSlotConfigForDate(date)
     });
   }
   getTimeSlotGrid(date) {
+    const resolvedSlotConfig = this.syncOperatingHoursToSlotConfig(date);
     let quotationPriceMap;
     if (this.store.quotation) {
       const productIds = [...new Set([...this.resourceProductMap.values()].map((m) => m.productId))];
-      const timeLabels = (0, import_timeSlot.generateTimeLabels)(this.store.slotConfig);
+      const timeLabels = (0, import_timeSlot.generateTimeLabels)(resolvedSlotConfig);
       const timePoints = timeLabels.map((label) => `${date} ${label}`);
       quotationPriceMap = this.store.quotation.buildProductPriceMap({ productIds, timePoints });
     }
     return (0, import_timeSlot.buildTimeSlotGrid)({
       date,
-      config: this.store.slotConfig,
+      config: resolvedSlotConfig,
       rawResources: this.store.rawResourceData,
       resourceProductMap: this.resourceProductMap,
       quotationPriceMap
@@ -800,7 +863,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     for (let i = 0; i < merged.length; i++) {
       const group = merged[i];
       const identityKey = (0, import_slotMerge.buildVenueIdentityKey)(resourceId, i);
-      const bookingUuid = (0, import_utils2.createUuidV4)();
+      const bookingUuid = (0, import_utils3.createUuidV4)();
       const startMoment = (0, import_dayjs.default)(group.startTime, "YYYY-MM-DD HH:mm");
       const endMoment = (0, import_dayjs.default)(group.endTime, "YYYY-MM-DD HH:mm");
       const duration = endMoment.diff(startMoment, "minute");
@@ -892,10 +955,13 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
   }
   // ─── 配置 ───
   setSlotConfig(config) {
-    this.store.slotConfig = {
-      ...this.store.slotConfig,
+    this.baseSlotConfig = {
+      ...this.baseSlotConfig,
       ...config
     };
+    this.store.slotConfig = {
+      ...this.baseSlotConfig
+    };
   }
   getSlotConfig() {
     return { ...this.store.slotConfig };

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

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

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

@@ -35,22 +35,31 @@ module.exports = __toCommonJS(dateSummary_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_timeSlot = require("./timeSlot");
 function buildDateRangeSummary(params) {
-  const { startDate, endDate, config, rawResources, resourceProductMap, quotationModule } = params;
+  const {
+    startDate,
+    endDate,
+    config,
+    rawResources,
+    resourceProductMap,
+    quotationModule,
+    resolveConfig
+  } = params;
   const result = [];
   const productIds = quotationModule ? [...new Set([...resourceProductMap.values()].map((m) => m.productId))] : [];
   let cursor = (0, import_dayjs.default)(startDate);
   const end = (0, import_dayjs.default)(endDate);
   while (!cursor.isAfter(end)) {
     const date = cursor.format("YYYY-MM-DD");
+    const effectiveConfig = (resolveConfig == null ? void 0 : resolveConfig(date)) || config;
     let quotationPriceMap;
     if (quotationModule && productIds.length) {
-      const timeLabels = (0, import_timeSlot.generateTimeLabels)(config);
+      const timeLabels = (0, import_timeSlot.generateTimeLabels)(effectiveConfig);
       const timePoints = timeLabels.map((label) => `${date} ${label}`);
       quotationPriceMap = quotationModule.buildProductPriceMap({ productIds, timePoints });
     }
     const grid = (0, import_timeSlot.buildTimeSlotGrid)({
       date,
-      config,
+      config: effectiveConfig,
       rawResources,
       resourceProductMap,
       quotationPriceMap
@@ -79,7 +88,7 @@ function buildDateRangeSummary(params) {
       status = "unavailable";
     } else if (availableSlots === 0) {
       status = "sold_out";
-    } else if ((totalSlots - availableSlots) / totalSlots >= config.fewLeftThreshold) {
+    } else if ((totalSlots - availableSlots) / totalSlots >= effectiveConfig.fewLeftThreshold) {
       status = "few_left";
     } else {
       status = "available";

package/package.json

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