@pisell/pisellos 2.1.146 → 2.1.147

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

package/dist/solution/ScanOrder/index.js

@@ -1349,7 +1349,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       var resourceState = this.store.resource;
       var resourceSelectType = resourceState === null || resourceState === void 0 ? void 0 : resourceState.resourceSelectType;
 
-      // single 预约独占整张桌台，capacity 取 form_record.capacity；其他情况（multiple / capacity / undefined）占 1 个容量位
+      // 无 collect_pax 时的资源占用兜底：single 独占整张桌台，其余模式占 1 个容量位。
       var resolveResourceCapacity = function resolveResourceCapacity() {
         if (resourceSelectType === 'single') {
           var _resourceState$table_;
@@ -1361,10 +1361,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         return 1;
       };
       return function (payload, _ref3) {
-        var _tempOrder$resource_i, _ref4, _pickOriginal, _resourceState$table_2, _resourceState$relati, _tempOrder$metadata, _pickFirstCustomCapac;
+        var _tempOrder$resource_i, _tempOrder$metadata, _ref4, _pickOriginal, _resourceState$table_2, _resourceState$relati, _pickFirstCustomCapac;
         var bookingUuid = _ref3.bookingUuid,
           tempOrder = _ref3.tempOrder;
         var resourceId = (_tempOrder$resource_i = tempOrder.resource_id) !== null && _tempOrder$resource_i !== void 0 ? _tempOrder$resource_i : resourceState === null || resourceState === void 0 ? void 0 : resourceState.relationId;
+        var rawCollectPax = (_tempOrder$metadata = tempOrder.metadata) === null || _tempOrder$metadata === void 0 ? void 0 : _tempOrder$metadata.collect_pax;
+        var hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== undefined && rawCollectPax !== '';
+        var resourceCapacityValue = hasCollectPaxForCapacity ? normalizeSubmitCollectPaxValue(rawCollectPax) : resolveResourceCapacity();
         var pickOriginal = function pickOriginal(value) {
           if (value && _typeof(value) === 'object' && !Array.isArray(value)) {
             var original = value.original;
@@ -1380,17 +1383,15 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           main_field: mainField,
           form_id: resourceState.tableFormId,
           relation_id: (_resourceState$relati = resourceState.relationId) !== null && _resourceState$relati !== void 0 ? _resourceState$relati : resourceId,
-          capacity: resolveResourceCapacity(),
+          capacity: resourceCapacityValue,
           metadata: _this5.buildScanOrderResourceMetadata({
             resourceState: resourceState,
             resourceName: mainField
           })
         } : undefined;
         var ruleProductUid = ruleProduct ? createUuidV4() : undefined;
-        // 默认 resolveResourceCapacity（single 为桌台容量，其余多为 1）；有 collect_pax 时 value 优先用人数
-        var rawCollectPax = (_tempOrder$metadata = tempOrder.metadata) === null || _tempOrder$metadata === void 0 ? void 0 : _tempOrder$metadata.collect_pax;
-        var hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== undefined && rawCollectPax !== '';
-        var bookingCapacityValue = hasCollectPaxForCapacity ? normalizeSubmitCollectPaxValue(rawCollectPax) : resolveResourceCapacity();
+        // 有 collect_pax 时 booking/resource capacity 都代表本次 pax；否则使用资源占用兜底值。
+        var bookingCapacityValue = resourceCapacityValue;
         var bookingCapacityDimensionId = (_pickFirstCustomCapac = pickFirstCustomCapacityDimensionId(_this5.enabledReservationRuleProducts)) !== null && _pickFirstCustomCapac !== void 0 ? _pickFirstCustomCapac : 0;
         var nextBookings = (payload.bookings || []).map(function (booking, idx) {
           return _objectSpread(_objectSpread(_objectSpread({}, booking), {}, {

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

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

package/lib/solution/ScanOrder/index.js

@@ -838,6 +838,9 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     return (payload, { bookingUuid, tempOrder }) => {
       var _a, _b;
       const resourceId = tempOrder.resource_id ?? (resourceState == null ? void 0 : resourceState.relationId);
+      const rawCollectPax = (_a = tempOrder.metadata) == null ? void 0 : _a.collect_pax;
+      const hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== void 0 && rawCollectPax !== "";
+      const resourceCapacityValue = hasCollectPaxForCapacity ? (0, import_utils2.normalizeSubmitCollectPaxValue)(rawCollectPax) : resolveResourceCapacity();
       const pickOriginal = (value) => {
         if (value && typeof value === "object" && !Array.isArray(value)) {
           const original = value.original;
@@ -845,7 +848,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         }
         return void 0;
       };
-      const mainField = pickOriginal(tempOrder.table_number) ?? pickOriginal((_a = resourceState == null ? void 0 : resourceState.table_form_record) == null ? void 0 : _a.name) ?? "";
+      const mainField = pickOriginal(tempOrder.table_number) ?? pickOriginal((_b = resourceState == null ? void 0 : resourceState.table_form_record) == null ? void 0 : _b.name) ?? "";
       const resourceEntry = resourceState && resourceId ? {
         relation_type: "form",
         like_status: "common",
@@ -853,16 +856,14 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         main_field: mainField,
         form_id: resourceState.tableFormId,
         relation_id: resourceState.relationId ?? resourceId,
-        capacity: resolveResourceCapacity(),
+        capacity: resourceCapacityValue,
         metadata: this.buildScanOrderResourceMetadata({
           resourceState,
           resourceName: mainField
         })
       } : void 0;
       const ruleProductUid = ruleProduct ? (0, import_utils2.createUuidV4)() : void 0;
-      const rawCollectPax = (_b = tempOrder.metadata) == null ? void 0 : _b.collect_pax;
-      const hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== void 0 && rawCollectPax !== "";
-      const bookingCapacityValue = hasCollectPaxForCapacity ? (0, import_utils2.normalizeSubmitCollectPaxValue)(rawCollectPax) : resolveResourceCapacity();
+      const bookingCapacityValue = resourceCapacityValue;
       const bookingCapacityDimensionId = (0, import_utils.pickFirstCustomCapacityDimensionId)(this.enabledReservationRuleProducts) ?? 0;
       const nextBookings = (payload.bookings || []).map((booking, idx) => ({
         ...booking,

package/package.json

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