@pisell/pisellos 0.0.330 → 0.0.332

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

@@ -329,13 +329,20 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 参考 addProductToCart 方法的实现
      */
     private convertProductToCartItem;
-    checkMaxDurationCapacityForDetailNums(currentProduct: ProductData): {
+    checkMaxDurationCapacityForDetailNums({ product, date, account, }: {
+        product: ProductData;
+        date?: {
+            startTime: string;
+            endTime: string;
+        } | null;
+        account?: Account | null;
+    }): {
         success: boolean;
         minAvailableCount: number;
     };
     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/BookingByStep/index.js

@@ -30,7 +30,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../../modules/BaseModule";
 import { createModule } from "./types";
-import { formatProductToCartItem, createCartItemOrigin, getUniqueId, handleVariantProduct } from "../../modules/Cart/utils";
+import { formatProductToCartItem, createCartItemOrigin, getUniqueId, handleVariantProduct, formatDateToCartItem, formatAccountToCartItem } from "../../modules/Cart/utils";
 import { getAvailableProductResources } from "./utils/products";
 import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, sortCombinedResources, filterResourcesByFormItem, checkTwoResourcesIntersection, isConflict } from "./utils/resources";
 import dayjs from 'dayjs';
@@ -1195,7 +1195,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       this.addProductCheck({
         date: date
       });
-      this.store.cart.addItem(addItemParams);
+      // 如果 quantity 大于 1，则进入购物车拆散成多条数据
+      if (addItemParams.quantity > 1) {
+        for (var i = 0; i < addItemParams.quantity; i++) {
+          var newAddItemParams = cloneDeep(addItemParams);
+          newAddItemParams.quantity = 1;
+          this.store.cart.addItem(newAddItemParams);
+        }
+      } else {
+        this.store.cart.addItem(addItemParams);
+      }
       return {
         success: true
       };
@@ -3048,7 +3057,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           });
 
           // 按资源类型分组检查容量
-          if (!checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot)) {
+          var _checkTimeSlotCapacit = checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot),
+            success = _checkTimeSlotCapacit.success,
+            required = _checkTimeSlotCapacit.required,
+            available = _checkTimeSlotCapacit.available;
+          if (!success) {
             // 如果有可用数量记录，返回最小值；否则返回 0
             var _minAvailableCount = availableCountsByResourceType.length > 0 ? Math.min.apply(Math, availableCountsByResourceType) : 0;
             return {
@@ -3080,14 +3093,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
      */
   }, {
     key: "convertProductToCartItem",
-    value: function convertProductToCartItem(product) {
-      var _ref11 = product || {},
-        bundle = _ref11.bundle,
-        options = _ref11.options,
-        origin = _ref11.origin,
-        product_variant_id = _ref11.product_variant_id,
-        _ref11$quantity = _ref11.quantity,
-        quantity = _ref11$quantity === void 0 ? 1 : _ref11$quantity;
+    value: function convertProductToCartItem(_ref11) {
+      var product = _ref11.product,
+        date = _ref11.date,
+        account = _ref11.account;
+      var _ref12 = product || {},
+        bundle = _ref12.bundle,
+        options = _ref12.options,
+        origin = _ref12.origin,
+        product_variant_id = _ref12.product_variant_id,
+        _ref12$quantity = _ref12.quantity,
+        quantity = _ref12$quantity === void 0 ? 1 : _ref12$quantity;
 
       // 处理商品数据，类似 addProductToCart 中的逻辑
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
@@ -3097,6 +3113,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 处理组合商品
       var processedProduct = handleVariantProduct(productData);
 
+      // 如果没有传入账户，获取当前活跃账户
+      if (!account) {
+        var activeAccount = this.getActiveAccount();
+        if (activeAccount) {
+          account = activeAccount;
+        }
+      }
+
       // 创建基础的 CartItem
       var cartItem = {
         _id: getUniqueId('temp_'),
@@ -3105,9 +3129,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         _productInit: product
       };
 
-      // 获取当前活跃账户
-      var activeAccount = this.getActiveAccount();
-
       // 使用格式化函数填充 CartItem 数据
       formatProductToCartItem({
         cartItem: cartItem,
@@ -3117,16 +3138,39 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         product_variant_id: product_variant_id,
         quantity: quantity
       });
+
+      // 如果有日期信息，格式化日期到购物车
+      if (date) {
+        formatDateToCartItem({
+          cartItem: cartItem,
+          date: date
+        });
+      }
+
+      // 如果有账户信息，格式化账户到购物车
+      if (account) {
+        formatAccountToCartItem({
+          cartItem: cartItem,
+          account: account
+        });
+      }
       return cartItem;
     }
   }, {
     key: "checkMaxDurationCapacityForDetailNums",
-    value: function checkMaxDurationCapacityForDetailNums(currentProduct) {
+    value: function checkMaxDurationCapacityForDetailNums(_ref13) {
       var _this16 = this;
+      var product = _ref13.product,
+        date = _ref13.date,
+        account = _ref13.account;
       var cartItems = cloneDeep(this.store.cart.getItems());
 
       // 将 ProductData 转换为 CartItem 但不真正添加到购物车
-      var currentCartItem = this.convertProductToCartItem(currentProduct);
+      var currentCartItem = this.convertProductToCartItem({
+        product: product,
+        date: date,
+        account: account
+      });
       cartItems.push(currentCartItem);
       if (cartItems.length === 0) return {
         success: true,
@@ -3423,7 +3467,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var resourcesIdSet = new Set();
 
           // 获取资源数据
-          var dateRange = _this16.store.date.getDateRange();
+          // const dateRange = this.store.date.getDateRange();
           var resourcesDates = _this16.store.date.getDateList();
           var targetResourceDate = resourcesDates.find(function (n) {
             return n.date === startDate;
@@ -3444,13 +3488,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           });
 
           // 按资源类型分组检查容量
-          if (!checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot)) {
+          var _checkTimeSlotCapacit2 = checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot),
+            success = _checkTimeSlotCapacit2.success,
+            required = _checkTimeSlotCapacit2.required,
+            available = _checkTimeSlotCapacit2.available;
+          if (!success) {
             // 如果有可用数量记录，返回最小值；否则返回 0
-            var _minAvailableCount2 = availableCountsByResourceType.length > 0 ? Math.min.apply(Math, availableCountsByResourceType) : 0;
+            // const minAvailableCount = availableCountsByResourceType.length > 0 ? Math.min(...availableCountsByResourceType) : 0;
             return {
               v: {
                 success: false,
-                minAvailableCount: _minAvailableCount2
+                minAvailableCount: available
               }
             };
           }
@@ -3644,12 +3692,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeslotsScheduleByDateRange",
     value: (function () {
-      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(_ref12) {
+      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(_ref14) {
         var startDate, endDate, scheduleIds, resources, dates, currentDate, end, results, _i5, _dates, date;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              startDate = _ref12.startDate, endDate = _ref12.endDate, scheduleIds = _ref12.scheduleIds, resources = _ref12.resources;
+              startDate = _ref14.startDate, endDate = _ref14.endDate, scheduleIds = _ref14.scheduleIds, resources = _ref14.resources;
               console.log('appoimentBooking-session-date-getTimeslotsScheduleByDateRange', {
                 startDate: startDate,
                 endDate: endDate,

package/dist/solution/BookingByStep/utils/capacity.d.ts

@@ -68,4 +68,8 @@ export declare function getResourcesIdsByProduct(product: any): number[];
 /**
  * 检查特定时间段的容量是否足够
  */
-export declare function checkTimeSlotCapacity(timeSlotStart: string, timeSlotEnd: string, cartItems: CartItem[], allResources: ResourceItem[]): boolean;
+export declare function checkTimeSlotCapacity(timeSlotStart: string, timeSlotEnd: string, cartItems: CartItem[], allResources: ResourceItem[]): {
+    success: boolean;
+    required: number;
+    available: number;
+};

package/dist/solution/BookingByStep/utils/capacity.js

@@ -87,14 +87,14 @@ export var getSumCapacity = function getSumCapacity(_ref2) {
  * @return {*} 
  */
 export function getCapacityInfoByCartItem(targetCartItem) {
-  var _targetCartItem$_prod, _targetCartItem$_orig;
+  var _targetCartItem$_prod;
   var formatCapacity = formatDefaultCapacitys({
     capacity: (_targetCartItem$_prod = targetCartItem._productOrigin) === null || _targetCartItem$_prod === void 0 ? void 0 : _targetCartItem$_prod.capacity,
     product_bundle: targetCartItem._origin.product.product_bundle
   });
   var currentCapacity = getSumCapacity({
     capacity: formatCapacity,
-    num: (targetCartItem === null || targetCartItem === void 0 || (_targetCartItem$_orig = targetCartItem._origin) === null || _targetCartItem$_orig === void 0 || (_targetCartItem$_orig = _targetCartItem$_orig.product) === null || _targetCartItem$_orig === void 0 ? void 0 : _targetCartItem$_orig.quantity) || 1
+    num: (targetCartItem === null || targetCartItem === void 0 ? void 0 : targetCartItem.num) || 1
   });
   return {
     formatCapacity: formatCapacity,
@@ -265,7 +265,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
       if (needsThisResourceType) {
         // 需要判断是单个预约还是多个预约，如果是单个预约，不用加 capacity，只用+1
         if (selectType === 'single') {
-          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + 1;
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + ((cartItem === null || cartItem === void 0 ? void 0 : cartItem.num) || 1);
         } else {
           requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
         }
@@ -330,7 +330,11 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         if (totalAvailableCapacity < requiredCapacity) {
           console.log("\u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u5BB9\u91CF\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredCapacity, ", \u53EF\u7528 ").concat(totalAvailableCapacity));
           return {
-            v: false
+            v: {
+              success: false,
+              required: requiredCapacity,
+              available: totalAvailableCapacity
+            }
           };
         }
       } else {
@@ -349,7 +353,11 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         if (availableResourceCount < requiredCapacity) {
           console.log("\u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u6570\u91CF\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredCapacity, ", \u53EF\u7528 ").concat(availableResourceCount));
           return {
-            v: false
+            v: {
+              success: false,
+              required: requiredCapacity,
+              available: availableResourceCount
+            }
           };
         }
       }
@@ -360,5 +368,9 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
     if (_ret === 0) continue;
     if (_ret) return _ret.v;
   }
-  return true;
+  return {
+    success: true,
+    required: 0,
+    available: 0
+  };
 }

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

@@ -329,13 +329,20 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 参考 addProductToCart 方法的实现
      */
     private convertProductToCartItem;
-    checkMaxDurationCapacityForDetailNums(currentProduct: ProductData): {
+    checkMaxDurationCapacityForDetailNums({ product, date, account, }: {
+        product: ProductData;
+        date?: {
+            startTime: string;
+            endTime: string;
+        } | null;
+        account?: Account | null;
+    }): {
         success: boolean;
         minAvailableCount: number;
     };
     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/BookingByStep/index.js

@@ -636,7 +636,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       addItemParams.account = account;
     }
     this.addProductCheck({ date });
-    this.store.cart.addItem(addItemParams);
+    if (addItemParams.quantity > 1) {
+      for (let i = 0; i < addItemParams.quantity; i++) {
+        const newAddItemParams = (0, import_lodash_es.cloneDeep)(addItemParams);
+        newAddItemParams.quantity = 1;
+        this.store.cart.addItem(newAddItemParams);
+      }
+    } else {
+      this.store.cart.addItem(addItemParams);
+    }
     return { success: true };
   }
   /**
@@ -2110,7 +2118,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
         });
       });
-      if (!(0, import_capacity.checkTimeSlotCapacity)(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot)) {
+      const { success, required, available } = (0, import_capacity.checkTimeSlotCapacity)(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot);
+      if (!success) {
         const minAvailableCount2 = availableCountsByResourceType.length > 0 ? Math.min(...availableCountsByResourceType) : 0;
         return { success: false, minAvailableCount: minAvailableCount2 };
       }
@@ -2122,7 +2131,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
    * 将 ProductData 转换为 CartItem，但不添加到购物车
    * 参考 addProductToCart 方法的实现
    */
-  convertProductToCartItem(product) {
+  convertProductToCartItem({
+    product,
+    date,
+    account
+  }) {
     const {
       bundle,
       options,
@@ -2132,13 +2145,18 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     } = product || {};
     const productData = { ...origin, product_variant_id };
     const processedProduct = (0, import_utils.handleVariantProduct)(productData);
+    if (!account) {
+      const activeAccount = this.getActiveAccount();
+      if (activeAccount) {
+        account = activeAccount;
+      }
+    }
     const cartItem = {
       _id: (0, import_utils.getUniqueId)("temp_"),
       _origin: (0, import_utils.createCartItemOrigin)(),
       _productOrigin: processedProduct,
       _productInit: product
     };
-    const activeAccount = this.getActiveAccount();
     (0, import_utils.formatProductToCartItem)({
       cartItem,
       product: processedProduct,
@@ -2147,12 +2165,28 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       product_variant_id,
       quantity
     });
+    if (date) {
+      (0, import_utils.formatDateToCartItem)({
+        cartItem,
+        date
+      });
+    }
+    if (account) {
+      (0, import_utils.formatAccountToCartItem)({
+        cartItem,
+        account
+      });
+    }
     return cartItem;
   }
-  checkMaxDurationCapacityForDetailNums(currentProduct) {
+  checkMaxDurationCapacityForDetailNums({
+    product,
+    date,
+    account
+  }) {
     var _a, _b;
     const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
-    const currentCartItem = this.convertProductToCartItem(currentProduct);
+    const currentCartItem = this.convertProductToCartItem({ product, date, account });
     cartItems.push(currentCartItem);
     if (cartItems.length === 0)
       return { success: true, minAvailableCount: 0 };
@@ -2331,7 +2365,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       const timeSlotEnd = `${endDate} ${endTime}`;
       const allResourcesForTimeSlot = [];
       const resourcesIdSet = /* @__PURE__ */ new Set();
-      const dateRange = this.store.date.getDateRange();
       const resourcesDates = this.store.date.getDateList();
       const targetResourceDate = resourcesDates.find((n) => n.date === startDate);
       if (!targetResourceDate)
@@ -2348,9 +2381,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
         });
       });
-      if (!(0, import_capacity.checkTimeSlotCapacity)(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot)) {
-        const minAvailableCount2 = availableCountsByResourceType.length > 0 ? Math.min(...availableCountsByResourceType) : 0;
-        return { success: false, minAvailableCount: minAvailableCount2 };
+      const { success, required, available } = (0, import_capacity.checkTimeSlotCapacity)(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot);
+      if (!success) {
+        return { success: false, minAvailableCount: available };
       }
     }
     const minAvailableCount = availableCountsByResourceType.length > 0 ? Math.min(...availableCountsByResourceType) : 0;

package/lib/solution/BookingByStep/utils/capacity.d.ts

@@ -68,4 +68,8 @@ export declare function getResourcesIdsByProduct(product: any): number[];
 /**
  * 检查特定时间段的容量是否足够
  */
-export declare function checkTimeSlotCapacity(timeSlotStart: string, timeSlotEnd: string, cartItems: CartItem[], allResources: ResourceItem[]): boolean;
+export declare function checkTimeSlotCapacity(timeSlotStart: string, timeSlotEnd: string, cartItems: CartItem[], allResources: ResourceItem[]): {
+    success: boolean;
+    required: number;
+    available: number;
+};

package/lib/solution/BookingByStep/utils/capacity.js

@@ -76,12 +76,12 @@ var getSumCapacity = ({ capacity, num = 1 }) => {
   return sum * num;
 };
 function getCapacityInfoByCartItem(targetCartItem) {
-  var _a, _b, _c;
+  var _a;
   const formatCapacity = formatDefaultCapacitys({
     capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
     product_bundle: targetCartItem._origin.product.product_bundle
   });
-  const currentCapacity = getSumCapacity({ capacity: formatCapacity, num: ((_c = (_b = targetCartItem == null ? void 0 : targetCartItem._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.quantity) || 1 });
+  const currentCapacity = getSumCapacity({ capacity: formatCapacity, num: (targetCartItem == null ? void 0 : targetCartItem.num) || 1 });
   return {
     formatCapacity,
     currentCapacity
@@ -194,7 +194,7 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       );
       if (needsThisResourceType) {
         if (selectType === "single") {
-          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + 1;
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + ((cartItem == null ? void 0 : cartItem.num) || 1);
         } else {
           requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
         }
@@ -238,7 +238,11 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       console.log(`capacity.ts - 资源类型 ${formId} 多个预约检查: 总容量 ${totalAvailableCapacity}, 需求 ${requiredCapacity}`);
       if (totalAvailableCapacity < requiredCapacity) {
         console.log(`资源类型 ${formId} 容量不足: 需要 ${requiredCapacity}, 可用 ${totalAvailableCapacity}`);
-        return false;
+        return {
+          success: false,
+          required: requiredCapacity,
+          available: totalAvailableCapacity
+        };
       }
     } else {
       let availableResourceCount = 0;
@@ -253,11 +257,19 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       console.log(`capacity.ts - 资源类型 ${formId} 单个预约检查: 可用资源数 ${availableResourceCount}, 需求 ${requiredCapacity}`);
       if (availableResourceCount < requiredCapacity) {
         console.log(`资源类型 ${formId} 数量不足: 需要 ${requiredCapacity}, 可用 ${availableResourceCount}`);
-        return false;
+        return {
+          success: false,
+          required: requiredCapacity,
+          available: availableResourceCount
+        };
       }
     }
   }
-  return true;
+  return {
+    success: true,
+    required: 0,
+    available: 0
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

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