@pisell/pisellos 2.2.307 → 2.2.308

package/dist/modules/ResourcePlanner/planner.js

@@ -436,7 +436,7 @@ function normalizeOccupancy(occupancy, coverage, timezoneName, fixedOffsetMinute
 }
 function normalizeRequirementGroup(product, requirementGroup) {
   var _requirementGroup$for;
-  var resourceType = 'single';
+  var resourceType = requirementGroup.resourceType === 'multiple' || requirementGroup.resourceType === 'capacity' ? requirementGroup.resourceType : 'single';
   var required = requirementGroup.required !== false;
   var min = required ? 1 : 0;
   return _objectSpread(_objectSpread({}, requirementGroup), {}, {
@@ -482,7 +482,7 @@ function normalizeProducts(products) {
 function normalizeResources(resources) {
   return resources.map(function (resource) {
     return _objectSpread(_objectSpread({}, resource), {}, {
-      resourceType: 'single',
+      resourceType: resource.resourceType === 'multiple' || resource.resourceType === 'capacity' ? resource.resourceType : 'single',
       capacity: Math.max(1, Number(resource.capacity || 1) || 1),
       windows: (resource.windows || []).map(function (window) {
         return _objectSpread({}, window);
@@ -637,7 +637,8 @@ function buildCells(projection) {
           var usedCapacity = segmentOccupancies.reduce(function (sum, occupancy) {
             return sum + Math.max(1, Number(occupancy.pax || 1) || 1);
           }, 0);
-          var remainingCapacity = Math.max(0, resource.capacity - usedCapacity);
+          // 预约模式来自商品资源组；v2 资源记录可能不包含 type。
+          var remainingCapacity = requirementGroup.resourceType === 'single' && segmentOccupancies.length > 0 ? 0 : Math.max(0, resource.capacity - usedCapacity);
           var requiredCapacity = resolveRequiredCapacity(requirementGroup, product);
           var reasonCodes = Array.from(new Set(segmentOccupancies.flatMap(function (occupancy) {
             var source = occupancy.source || 'remote';
@@ -671,7 +672,7 @@ function buildCells(projection) {
             requirementFormId: requirementGroup.formId,
             resourceId: resource.id,
             resourceName: resource.name,
-            resourceType: resource.resourceType,
+            resourceType: requirementGroup.resourceType,
             startAt: formatDateTime(start, timezoneName, fixedOffsetMinutes),
             endAt: formatDateTime(end, timezoneName, fixedOffsetMinutes),
             date: formatDate(start, timezoneName),
@@ -679,7 +680,7 @@ function buildCells(projection) {
             endTime: formatTime(end, timezoneName),
             timezone: projection.meta.timezone,
             status: status,
-            // 资源组当前统一单选；具体资源仍用 capacity 表达可承载的预约数量。
+            // capacity 表示人数；single 被占用时不再贡献可用容量。
             remainingCapacity: remainingCapacity,
             maxCapacity: resource.capacity,
             reasonCodes: Array.from(new Set(reasonCodes)),
@@ -1739,7 +1740,7 @@ function evaluateCandidate(projection, candidate, request) {
           resourceName: resource.name,
           resourceFormId: resource.formId,
           policyId: (_resource$raw = resource.raw) === null || _resource$raw === void 0 ? void 0 : _resource$raw.policy_id,
-          resourceType: resource.resourceType,
+          resourceType: requirementGroup.resourceType,
           status: _isPast ? 'past' : 'unavailable',
           maxPartySize: 0,
           reasonCodes: _isPast ? ['past'] : [].concat(_toConsumableArray(isExcludedScheduleDate ? ['schedule_excluded_date'] : []), ['outside_resource_window'])
@@ -1763,7 +1764,7 @@ function evaluateCandidate(projection, candidate, request) {
         resourceName: resource.name,
         resourceFormId: resource.formId,
         policyId: (_resource$raw2 = resource.raw) === null || _resource$raw2 === void 0 ? void 0 : _resource$raw2.policy_id,
-        resourceType: resource.resourceType,
+        resourceType: requirementGroup.resourceType,
         status: status,
         remainingCapacity: remainingCapacity,
         maxCapacity: maxCapacity,
@@ -2330,7 +2331,8 @@ export function validateAvailabilitySelection(projection, params) {
       var remainingCapacity = matchedCell === null || matchedCell === void 0 ? void 0 : matchedCell.remainingCapacity;
       if (option && (option.status === 'available' || option.status === 'limited') && remainingCapacity !== undefined) {
         var capacityPerBooking = normalizedPartySize !== null && normalizedPartySize !== void 0 ? normalizedPartySize : 1;
-        var availableQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        var capacityQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        var availableQuantity = matchedGroup.resourceType === 'single' ? Math.min(1, capacityQuantity) : capacityQuantity;
         if (normalizedBookingCount > availableQuantity) {
           conflicts.push({
             code: 'resource_capacity_exceeded',

package/dist/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.d.ts

@@ -339,7 +339,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/UnifiedBookingSales/index.js

@@ -304,10 +304,9 @@ function assertAvailabilityCatalogProductIds(productIds, context) {
     });
   }
 }
-function normalizeResourceType(_value) {
-  // 当前业务只支持每个资源组选择一个具体资源。
-  // 保留公共联合类型以兼容已有调用方，但暂不启用 multiple/capacity 分支。
-  return 'single';
+function normalizeResourceType(value) {
+  // 预约是否独占与每组选择几个资源是两个独立配置。
+  return value === 'multiple' || value === 'capacity' ? value : 'single';
 }
 function resolveProductKind(product) {
   var _product$cartDetailVa, _product$_extend;

package/lib/modules/ResourcePlanner/planner.js

@@ -412,7 +412,7 @@ function normalizeOccupancy(occupancy, coverage, timezoneName, fixedOffsetMinute
   };
 }
 function normalizeRequirementGroup(product, requirementGroup) {
-  const resourceType = 'single';
+  const resourceType = requirementGroup.resourceType === 'multiple' || requirementGroup.resourceType === 'capacity' ? requirementGroup.resourceType : 'single';
   const required = requirementGroup.required !== false;
   const min = required ? 1 : 0;
   return {
@@ -457,7 +457,7 @@ function normalizeProducts(products) {
 function normalizeResources(resources) {
   return resources.map(resource => ({
     ...resource,
-    resourceType: 'single',
+    resourceType: resource.resourceType === 'multiple' || resource.resourceType === 'capacity' ? resource.resourceType : 'single',
     capacity: Math.max(1, Number(resource.capacity || 1) || 1),
     windows: (resource.windows || []).map(window => ({
       ...window
@@ -573,7 +573,8 @@ function buildCells(projection) {
             occupancy
           }) => occupancy) : [];
           const usedCapacity = segmentOccupancies.reduce((sum, occupancy) => sum + Math.max(1, Number(occupancy.pax || 1) || 1), 0);
-          const remainingCapacity = Math.max(0, resource.capacity - usedCapacity);
+          // 预约模式来自商品资源组；v2 资源记录可能不包含 type。
+          const remainingCapacity = requirementGroup.resourceType === 'single' && segmentOccupancies.length > 0 ? 0 : Math.max(0, resource.capacity - usedCapacity);
           const requiredCapacity = resolveRequiredCapacity(requirementGroup, product);
           const reasonCodes = Array.from(new Set(segmentOccupancies.flatMap(occupancy => {
             const source = occupancy.source || 'remote';
@@ -607,7 +608,7 @@ function buildCells(projection) {
             requirementFormId: requirementGroup.formId,
             resourceId: resource.id,
             resourceName: resource.name,
-            resourceType: resource.resourceType,
+            resourceType: requirementGroup.resourceType,
             startAt: formatDateTime(start, timezoneName, fixedOffsetMinutes),
             endAt: formatDateTime(end, timezoneName, fixedOffsetMinutes),
             date: formatDate(start, timezoneName),
@@ -615,7 +616,7 @@ function buildCells(projection) {
             endTime: formatTime(end, timezoneName),
             timezone: projection.meta.timezone,
             status,
-            // 资源组当前统一单选；具体资源仍用 capacity 表达可承载的预约数量。
+            // capacity 表示人数；single 被占用时不再贡献可用容量。
             remainingCapacity,
             maxCapacity: resource.capacity,
             reasonCodes: Array.from(new Set(reasonCodes)),
@@ -1500,7 +1501,7 @@ function evaluateCandidate(projection, candidate, request) {
           resourceName: resource.name,
           resourceFormId: resource.formId,
           policyId: resource.raw?.policy_id,
-          resourceType: resource.resourceType,
+          resourceType: requirementGroup.resourceType,
           status: isPast ? 'past' : 'unavailable',
           maxPartySize: 0,
           reasonCodes: isPast ? ['past'] : [...(isExcludedScheduleDate ? ['schedule_excluded_date'] : []), 'outside_resource_window']
@@ -1524,7 +1525,7 @@ function evaluateCandidate(projection, candidate, request) {
         resourceName: resource.name,
         resourceFormId: resource.formId,
         policyId: resource.raw?.policy_id,
-        resourceType: resource.resourceType,
+        resourceType: requirementGroup.resourceType,
         status,
         remainingCapacity,
         maxCapacity,
@@ -2008,7 +2009,8 @@ function validateAvailabilitySelection(projection, params, runtimeOptions = {})
       const remainingCapacity = matchedCell?.remainingCapacity;
       if (option && (option.status === 'available' || option.status === 'limited') && remainingCapacity !== undefined) {
         const capacityPerBooking = normalizedPartySize ?? 1;
-        const availableQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        const capacityQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        const availableQuantity = matchedGroup.resourceType === 'single' ? Math.min(1, capacityQuantity) : capacityQuantity;
         if (normalizedBookingCount > availableQuantity) {
           conflicts.push({
             code: 'resource_capacity_exceeded',

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -339,7 +339,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/UnifiedBookingSales/index.js

@@ -283,10 +283,9 @@ function assertAvailabilityCatalogProductIds(productIds, context) {
     });
   }
 }
-function normalizeResourceType(_value) {
-  // 当前业务只支持每个资源组选择一个具体资源。
-  // 保留公共联合类型以兼容已有调用方，但暂不启用 multiple/capacity 分支。
-  return 'single';
+function normalizeResourceType(value) {
+  // 预约是否独占与每组选择几个资源是两个独立配置。
+  return value === 'multiple' || value === 'capacity' ? value : 'single';
 }
 function resolveProductKind(product) {
   if (product.duration || product.service_duration) return 'duration';

package/package.json

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