@pisell/pisellos 2.1.124 → 2.1.126

package/dist/model/strategy/adapter/itemRule/adapter.d.ts

@@ -50,6 +50,14 @@ export declare class ItemRuleAdapter implements BusinessAdapter {
      * 不适用或无配置时返回 null。
      */
     extractQuantityLimits(action: ActionEffect, businessData: ItemRuleBusinessData): QuantityLimitResult | null;
+    /**
+     * 计算当前提交剩余可选的最大数量。
+     *
+     * 仅在 scope='cumulative' 且存在 requiredMax 时生效：
+     * 用 requiredMax 减去 historicalItems 中目标商品的累计数量，保底 0。
+     * 其余场景返回 undefined，保持向后兼容。
+     */
+    private calculateRemainingMax;
     private processPrefillCart;
     /**
      * 根据 quantityFrom 计算预填数量

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

@@ -373,18 +373,58 @@ export var ItemRuleAdapter = /*#__PURE__*/function () {
       } finally {
         _iterator4.f();
       }
+      var remainingMax = this.calculateRemainingMax(scope, requiredMax, targets, businessData);
       return {
         ruleId: action.id,
         targetType: targetType,
         targets: targets,
         requiredMin: requiredMin,
         requiredMax: requiredMax,
+        remainingMax: remainingMax,
         requiredExact: requiredExact,
         mustInclude: mustInclude,
         scope: scope
       };
     }
 
+    /**
+     * 计算当前提交剩余可选的最大数量。
+     *
+     * 仅在 scope='cumulative' 且存在 requiredMax 时生效：
+     * 用 requiredMax 减去 historicalItems 中目标商品的累计数量，保底 0。
+     * 其余场景返回 undefined，保持向后兼容。
+     */
+  }, {
+    key: "calculateRemainingMax",
+    value: function calculateRemainingMax(scope, requiredMax, targets, businessData) {
+      if (scope !== 'cumulative' || typeof requiredMax !== 'number') {
+        return undefined;
+      }
+      var historicalItems = businessData.historicalItems;
+      if (!(historicalItems !== null && historicalItems !== void 0 && historicalItems.length)) {
+        return Math.max(0, requiredMax);
+      }
+      var targetIds = new Set(targets.map(function (t) {
+        return t.product_id;
+      }));
+      var historicalQty = 0;
+      var _iterator5 = _createForOfIteratorHelper(historicalItems),
+        _step5;
+      try {
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var item = _step5.value;
+          if (targetIds.has(item.product_id)) {
+            historicalQty += item.quantity;
+          }
+        }
+      } catch (err) {
+        _iterator5.e(err);
+      } finally {
+        _iterator5.f();
+      }
+      return Math.max(0, requiredMax - historicalQty);
+    }
+
     // ============================================
     // Prefill Cart 处理
     // ============================================
@@ -394,11 +434,11 @@ export var ItemRuleAdapter = /*#__PURE__*/function () {
       var config = action.config;
       if (!(config !== null && config !== void 0 && config.products)) return [];
       var results = [];
-      var _iterator5 = _createForOfIteratorHelper(config.products),
-        _step5;
+      var _iterator6 = _createForOfIteratorHelper(config.products),
+        _step6;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var prefillProduct = _step5.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var prefillProduct = _step6.value;
           var quantity = this.resolvePrefillQuantity(prefillProduct.quantityFrom, prefillProduct.quantity, businessData);
           if (quantity <= 0) continue;
           results.push({
@@ -409,9 +449,9 @@ export var ItemRuleAdapter = /*#__PURE__*/function () {
           });
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator5.f();
+        _iterator6.f();
       }
       return results;
     }

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

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

package/dist/modules/Order/index.js

@@ -1114,8 +1114,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 2:
               res = _context15.sent;
-              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;
               }
             case 4:
             case "end":

package/dist/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/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 | 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/dist/solution/ScanOrder/index.js

@@ -1327,19 +1327,26 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "applyItemRulePrefill",
     value: function () {
       var _applyItemRulePrefill = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+        var _this$store$order4, _this$store$order4$ge;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
+              if (!((_this$store$order4 = this.store.order) !== null && _this$store$order4 !== void 0 && (_this$store$order4$ge = _this$store$order4.getLastOrderInfo) !== null && _this$store$order4$ge !== void 0 && _this$store$order4$ge.call(_this$store$order4))) {
+                _context21.next = 2;
+                break;
+              }
+              return _context21.abrupt("return");
+            case 2:
               this.logMethodStart('applyItemRulePrefill');
-              _context21.next = 3;
-              return this.applyPrefillByItemRule();
-            case 3:
               _context21.next = 5;
-              return this.refreshItemRuleQuantityLimits();
+              return this.applyPrefillByItemRule();
             case 5:
               _context21.next = 7;
-              return this.refreshCartValidationPassed();
+              return this.refreshItemRuleQuantityLimits();
             case 7:
+              _context21.next = 9;
+              return this.refreshCartValidationPassed();
+            case 9:
             case "end":
               return _context21.stop();
           }
@@ -1654,7 +1661,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "checkResourceAvailable",
     value: function () {
       var _checkResourceAvailable = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(resourceId, hasOrderId) {
-        var _this$otherParams9, _this$otherParams9$ge, _config$table_form_re, _config$table_form_re2, _this$otherParams10, _this$store$order4, openData, dineInConfig, shopClosedInfo, config, resourceState, availabilityInfo, tempOrder, reservationLinkIds, reservationProductList, scheduleDate, scheduleDatetime, loaded, occupancyMinutes, _this$store$order5;
+        var _this$otherParams9, _this$otherParams9$ge, _config$table_form_re, _config$table_form_re2, _this$otherParams10, _this$store$order5, _this$store$order7, _this$store$order7$ge, openData, dineInConfig, shopClosedInfo, config, resourceState, availabilityInfo, tempOrder, reservationLinkIds, reservationProductList, scheduleDate, scheduleDatetime, loaded, occupancyMinutes, _this$store$order6, lastOrderInfo, historicalItems;
         return _regeneratorRuntime().wrap(function _callee27$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
             case 0:
@@ -1782,7 +1789,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 });
               }
             case 42:
-              (_this$store$order4 = this.store.order) === null || _this$store$order4 === void 0 || _this$store$order4.persistTempOrder();
+              (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 || _this$store$order5.persistTempOrder();
 
               // 空闲状态下自动准备本地临时订单，供后续“购物车式”商品操作使用
               if (!(availabilityInfo.mode === 'idle')) {
@@ -1801,13 +1808,30 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               _context27.next = 50;
-              return (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 ? void 0 : _this$store$order5.getOrderInfoByRemote(tempOrder.order_id);
+              return (_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getOrderInfoByRemote(tempOrder.order_id);
             case 50:
-              _context27.next = 52;
-              return this.refreshItemRuleQuantityLimits();
-            case 52:
+              lastOrderInfo = (_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 || (_this$store$order7$ge = _this$store$order7.getLastOrderInfo) === null || _this$store$order7$ge === void 0 ? void 0 : _this$store$order7$ge.call(_this$store$order7);
+              historicalItems = hasOrderId && Array.isArray(lastOrderInfo === null || lastOrderInfo === void 0 ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce(function (acc, p) {
+                if (typeof (p === null || p === void 0 ? void 0 : p.product_id) !== 'number') return acc;
+                acc.push(_objectSpread({
+                  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;
+              }, []) : [];
               _context27.next = 54;
-              return this.refreshCartValidationPassed();
+              return this.setItemRuleRuntimeConfig({
+                pax: {
+                  total: 2,
+                  adult: 2,
+                  child: 0
+                },
+                serviceType: 'dine-in',
+                submissionIndex: hasOrderId ? 1 : 0,
+                historicalItems: historicalItems
+              });
             case 54:
               this.logMethodSuccess('checkResourceAvailable', {
                 resourceId: resourceId,

package/dist/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/dist/solution/ScanOrder/utils.js

@@ -216,6 +216,7 @@ export function aggregateItemRuleLimit(matchedLimits) {
   if (!matchedLimits.length) return null;
   var min;
   var max;
+  var remainingMax;
   var exact;
   var mustInclude = false;
   var _iterator4 = _createForOfIteratorHelper(matchedLimits),
@@ -229,6 +230,9 @@ export function aggregateItemRuleLimit(matchedLimits) {
       if (typeof limit.requiredMax === 'number' && Number.isFinite(limit.requiredMax)) {
         max = max === undefined ? limit.requiredMax : Math.min(max, limit.requiredMax);
       }
+      if (typeof limit.remainingMax === 'number' && Number.isFinite(limit.remainingMax)) {
+        remainingMax = remainingMax === undefined ? limit.remainingMax : Math.min(remainingMax, limit.remainingMax);
+      }
       if (typeof limit.requiredExact === 'number' && Number.isFinite(limit.requiredExact)) {
         exact = limit.requiredExact;
       }
@@ -246,6 +250,7 @@ export function aggregateItemRuleLimit(matchedLimits) {
   return {
     min: min,
     max: max,
+    remainingMax: remainingMax,
     exact: exact,
     mustInclude: mustInclude
   };

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