@pisell/pisellos 0.0.278 → 0.0.280

package/dist/modules/Date/index.js

@@ -267,6 +267,10 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
         if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
           return resource;
         }
+        // 如果resource.advanced 为 null 或者 resource.advanced.unit 为 0，则不进行修正
+        if (!resource.advanced || resource.advanced.unit === 0) {
+          return resource;
+        }
         var resourceStartTime = dayjs(resource.start_time);
 
         // 过滤和修正时间段

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/BookingByStep/index.js

@@ -2783,6 +2783,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var hasCapacityIssue = false;
         var resourceCapacityInfo = [];
 
+        // 用于跟踪已处理的商品，避免重复添加
+        var processedCartItemIds = new Set();
+
         // 先检查所有资源类型，收集可用数量信息
         var _loop3 = function _loop3() {
             var _resourceTypeConfig;
@@ -2912,17 +2915,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               };
             }
 
-            // 使用第一个公共可用时间段
+            // 使用第一个公共可用时间段，但只处理未处理过的商品
             var firstCommonSlot = commonTimeSlots[0];
             console.log("\u4F7F\u7528\u516C\u5171\u65F6\u95F4\u6BB5: ".concat(firstCommonSlot.startTime, " - ").concat(firstCommonSlot.endTime));
             items.forEach(function (cartItem) {
-              var processedItem = _objectSpread(_objectSpread({}, cartItem), {}, {
-                start_date: dateRange[0].date,
-                start_time: firstCommonSlot.startTime,
-                end_time: firstCommonSlot.endTime,
-                end_date: dateRange[0].date
-              });
-              processedItemsWithoutTime.push(processedItem);
+              // 只处理未处理过的商品，避免重复添加
+              if (!processedCartItemIds.has(cartItem._id)) {
+                processedCartItemIds.add(cartItem._id);
+                var processedItem = _objectSpread(_objectSpread({}, cartItem), {}, {
+                  start_date: dateRange[0].date,
+                  start_time: firstCommonSlot.startTime,
+                  end_time: firstCommonSlot.endTime,
+                  end_date: dateRange[0].date
+                });
+                processedItemsWithoutTime.push(processedItem);
+              }
             });
           },
           _ret3;
@@ -2970,7 +2977,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         }
         cartItemsByTimeSlot[timeSlotKey].push(cartItem);
       });
-
       // 检查每个时间段是否有足够的资源容量
       var _loop4 = function _loop4() {
           var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),

package/lib/modules/Date/index.js

@@ -178,6 +178,9 @@ var DateModule = class extends import_BaseModule.BaseModule {
       if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
         return resource;
       }
+      if (!resource.advanced || resource.advanced.unit === 0) {
+        return resource;
+      }
       const resourceStartTime = (0, import_dayjs.default)(resource.start_time);
       const correctedTimes = resource.times.map((timeSlot) => {
         if (!timeSlot.start_at || !timeSlot.end_at) {

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/BookingByStep/index.js

@@ -1950,6 +1950,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
       let hasCapacityIssue = false;
       const resourceCapacityInfo = [];
+      const processedCartItemIds = /* @__PURE__ */ new Set();
       for (const [resourceCode, items] of Object.entries(itemsByResourceType)) {
         const targetFormId = resourceCodeToFormIdMap[resourceCode];
         if (!targetFormId) {
@@ -2028,14 +2029,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         const firstCommonSlot = commonTimeSlots[0];
         console.log(`使用公共时间段: ${firstCommonSlot.startTime} - ${firstCommonSlot.endTime}`);
         items.forEach((cartItem) => {
-          const processedItem = {
-            ...cartItem,
-            start_date: dateRange[0].date,
-            start_time: firstCommonSlot.startTime,
-            end_time: firstCommonSlot.endTime,
-            end_date: dateRange[0].date
-          };
-          processedItemsWithoutTime.push(processedItem);
+          if (!processedCartItemIds.has(cartItem._id)) {
+            processedCartItemIds.add(cartItem._id);
+            const processedItem = {
+              ...cartItem,
+              start_date: dateRange[0].date,
+              start_time: firstCommonSlot.startTime,
+              end_time: firstCommonSlot.endTime,
+              end_date: dateRange[0].date
+            };
+            processedItemsWithoutTime.push(processedItem);
+          }
         });
       }
       if (hasCapacityIssue) {

package/package.json

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