@pisell/pisellos 1.0.70 → 1.0.71

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

@@ -15,8 +15,9 @@ export declare const formatDefaultCapacitys: ({ capacity, product_bundle, }: any
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getSumCapacity: ({ capacity }: {
+export declare const getSumCapacity: ({ capacity, num }: {
     capacity: CapacityItem[];
+    num: number;
 }) => number;
 /**
  * 给定购物车数据，返回对应的 capacity 信息和套餐 capacity
@@ -67,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

@@ -60,7 +60,9 @@ export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref) {
  * @Author: zhiwei.Wang
  */
 export var getSumCapacity = function getSumCapacity(_ref2) {
-  var capacity = _ref2.capacity;
+  var capacity = _ref2.capacity,
+    _ref2$num = _ref2.num,
+    num = _ref2$num === void 0 ? 1 : _ref2$num;
   var sum = 0;
   var _iterator = _createForOfIteratorHelper(capacity || []),
     _step;
@@ -74,7 +76,7 @@ export var getSumCapacity = function getSumCapacity(_ref2) {
   } finally {
     _iterator.f();
   }
-  return sum;
+  return sum * num;
 };
 
 /**
@@ -91,7 +93,8 @@ export function getCapacityInfoByCartItem(targetCartItem) {
     product_bundle: targetCartItem._origin.product.product_bundle
   });
   var currentCapacity = getSumCapacity({
-    capacity: formatCapacity
+    capacity: formatCapacity,
+    num: (targetCartItem === null || targetCartItem === void 0 ? void 0 : targetCartItem.num) || 1
   });
   return {
     formatCapacity: formatCapacity,
@@ -245,17 +248,28 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
     var _getCapacityInfoByCar2 = getCapacityInfoByCartItem(cartItem),
       currentCapacity = _getCapacityInfoByCar2.currentCapacity;
     Object.keys(resourceTypeMap).forEach(function (formId) {
+      var _cartItem$_productOri;
       var resourcesInType = resourceTypeMap[formId];
       var resourceIdsInType = resourcesInType.map(function (r) {
         return r.id;
       });
+      var selectType = (_cartItem$_productOri = cartItem._productOrigin) === null || _cartItem$_productOri === void 0 || (_cartItem$_productOri = _cartItem$_productOri.product_resource) === null || _cartItem$_productOri === void 0 || (_cartItem$_productOri = _cartItem$_productOri.resources) === null || _cartItem$_productOri === void 0 || (_cartItem$_productOri = _cartItem$_productOri.find(function (r) {
+        var _r$id;
+        return ((_r$id = r.id) === null || _r$id === void 0 ? void 0 : _r$id.toString()) === formId;
+      })) === null || _cartItem$_productOri === void 0 ? void 0 : _cartItem$_productOri.type;
 
       // 检查该商品是否需要这种类型的资源
       var needsThisResourceType = productResourceIds.some(function (id) {
         return resourceIdsInType.includes(id);
       });
       if (needsThisResourceType) {
-        requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
+        // 需要判断是单个预约还是多个预约，如果是单个预约，不用加 capacity，只用+1
+        if (selectType === 'single') {
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + ((cartItem === null || cartItem === void 0 ? void 0 : cartItem.num) || 1);
+        } else {
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
+        }
+        // requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
       }
     });
   });
@@ -275,12 +289,12 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var _cartItem$_productOri;
+          var _cartItem$_productOri2;
           var cartItem = _step2.value;
-          if ((_cartItem$_productOri = cartItem._productOrigin) !== null && _cartItem$_productOri !== void 0 && (_cartItem$_productOri = _cartItem$_productOri.product_resource) !== null && _cartItem$_productOri !== void 0 && _cartItem$_productOri.resources) {
+          if ((_cartItem$_productOri2 = cartItem._productOrigin) !== null && _cartItem$_productOri2 !== void 0 && (_cartItem$_productOri2 = _cartItem$_productOri2.product_resource) !== null && _cartItem$_productOri2 !== void 0 && _cartItem$_productOri2.resources) {
             resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(function (r) {
-              var _r$id;
-              return ((_r$id = r.id) === null || _r$id === void 0 ? void 0 : _r$id.toString()) === formId && r.status === 1;
+              var _r$id2;
+              return ((_r$id2 = r.id) === null || _r$id2 === void 0 ? void 0 : _r$id2.toString()) === formId && r.status === 1;
             });
             if (resourceTypeConfig) break;
           }
@@ -316,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 {
@@ -325,7 +343,8 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         resourcesInType.forEach(function (resource) {
           // 过滤出在时间段内的资源时间片
           var availableTimes = resource.times.filter(function (time) {
-            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute');
+            var _time$event_list;
+            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute') && ((_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.length) === 0;
           });
           if (availableTimes.length > 0) {
             availableResourceCount++;
@@ -335,7 +354,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
+            }
           };
         }
       }
@@ -346,5 +369,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/dist/solution/BookingByStep/utils/resources.d.ts

@@ -20,6 +20,21 @@ export interface ResourceItem {
 interface BookingItem {
     [key: string]: any;
 }
+/**
+ * @title: 判断两个时间段是否有重叠
+ * @description:
+ * @param {object} event
+ * @param {object} current
+ * @return {*}
+ * @Author: zhiwei.Wang
+ */
+export declare const isConflict: (event: {
+    start_at: DateType;
+    end_at: DateType;
+}, current: {
+    start_at: DateType;
+    end_at?: DateType;
+}) => boolean;
 /**
  * @title: 获取时间切片是否可用
  * @description: 根据时间切片、资源、当前预约量判断时间切片是否可用

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

@@ -42,7 +42,7 @@ var getUseableEventCount = function getUseableEventCount(eventList, current) {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-var isConflict = function isConflict(event, current) {
+export var isConflict = function isConflict(event, current) {
   var eventStart = dayjs(event.start_at);
   var eventEnd = dayjs(event.end_at);
   var currentStart = dayjs(current.start_at);

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/lib/modules/ProductList/index.js

@@ -97,7 +97,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
         schedule_date,
         with_schedule,
         schedule_datetime,
-        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel
+        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
+        is_eject: 1
       },
       { useCache: true }
     );

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

@@ -324,6 +324,22 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         success: boolean;
         minAvailableCount: number;
     };
+    /**
+     * 将 ProductData 转换为 CartItem，但不添加到购物车
+     * 参考 addProductToCart 方法的实现
+     */
+    private convertProductToCartItem;
+    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">;