@pisell/pisellos 3.0.78 → 3.0.79

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

@@ -147,6 +147,9 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         taxTitle?: string | undefined;
         totalTaxFee?: string | number | undefined;
         isPriceIncludeTax?: 0 | 1 | undefined;
+        surchargeAmount?: string | number | undefined;
+        surcharge?: any[] | undefined;
+        taxRate?: string | number | undefined;
         deposit?: {
             total?: string | number | undefined;
             policies?: import("../../modules/Summary/types").IProtocol[] | undefined;
@@ -326,7 +329,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: keyof TimeStatusMap;
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段
@@ -391,9 +394,3 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     */
     getContactInfo(params: any): Promise<any>;
 }
-interface TimeStatusMap {
-    lots_of_space: true;
-    filling_up_fast: true;
-    sold_out: true;
-}
-export {};

package/lib/solution/BookingByStep/index.js

@@ -862,7 +862,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         resources.push(...dateResources || []);
       } else {
         const dateList = this.store.date.getDateList();
-        dateList.forEach((n) => {
+        dateList == null ? void 0 : dateList.forEach((n) => {
           if (n.resource)
             resources.push(...n.resource);
         });
@@ -1447,6 +1447,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     }
+    if (resources.length === 0) {
+      resources.push(...this.store.date.getResourcesListByDate(dateRange[0].date) || []);
+    }
     const resourcesMap = (0, import_utils2.getResourcesMap)(resources);
     let duration = 0;
     const accountList = this.store.accountList.getAccounts();
@@ -1749,6 +1752,28 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         newResources.forEach((resource) => {
           var _a3, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k;
           if (((_b2 = (_a3 = item._productOrigin) == null ? void 0 : _a3.duration) == null ? void 0 : _b2.type) === "flexible") {
+            let getEarliestBlockedStartTime = function({
+              currentStartTime: currentStartTime2,
+              times
+            }) {
+              const currentStart = (0, import_dayjs.default)(currentStartTime2);
+              let earliestBlockStart;
+              for (const time of times || []) {
+                for (const event of time.event_list || []) {
+                  const eventStart = (0, import_dayjs.default)(event.start_at);
+                  const eventEnd = (0, import_dayjs.default)(event.end_at);
+                  if (eventStart.isBefore(currentStart) && eventEnd.isAfter(currentStart)) {
+                    return currentStart.format("YYYY-MM-DD HH:mm");
+                  }
+                  if (eventStart.isAfter(currentStart)) {
+                    if (!earliestBlockStart || eventStart.isBefore(earliestBlockStart)) {
+                      earliestBlockStart = eventStart;
+                    }
+                  }
+                }
+              }
+              return earliestBlockStart == null ? void 0 : earliestBlockStart.format("YYYY-MM-DD HH:mm");
+            };
             item.duration = {
               type: "minutes",
               value: 10
@@ -1763,13 +1788,22 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               },
               targetResourceTimes[0]
             );
+            const earliestBlockedStartTime = getEarliestBlockedStartTime({
+              currentStartTime,
+              times: targetResourceTimes
+            });
             const resourceDate = (0, import_dayjs.default)(resourcesEndTime.end_at).format(
               "YYYY-MM-DD"
             );
             const operatingBoundaryDateTime = `${resourceDate} ${operating_day_boundary.type === "start_time" ? "23:59" : operating_day_boundary.time}`;
-            const endTime = (0, import_dayjs.default)(resourcesEndTime.end_at).isBefore(
-              (0, import_dayjs.default)(operatingBoundaryDateTime)
-            ) ? resourcesEndTime.end_at : operatingBoundaryDateTime;
+            const endTimeCandidates = [
+              resourcesEndTime.end_at,
+              operatingBoundaryDateTime,
+              ...earliestBlockedStartTime ? [earliestBlockedStartTime] : []
+            ];
+            const endTime = endTimeCandidates.reduce((earliest, value) => {
+              return (0, import_dayjs.default)(value).isBefore((0, import_dayjs.default)(earliest)) ? value : earliest;
+            }, endTimeCandidates[0]);
             let formattedEndTime;
             if (typeof endTime === "string" && endTime.includes(":") && !endTime.includes(" ") && !endTime.includes("T")) {
               const currentDate = timeSlots.start_at.format("YYYY-MM-DD");
@@ -1864,7 +1898,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     resources,
     product
   }) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d;
     const targetProduct = this.store.currentProduct;
     const targetProductData = product || targetProduct;
     let targetSchedules = [];
@@ -1907,29 +1941,48 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return -1;
       return 0;
     });
-    const firstEnabledResourceId = (_e = (_d = (_c = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.find(
+    const enabledResourceTypeConfigs = ((_d = (_c = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.filter(
       (n) => n.status === 1
-    )) == null ? void 0 : _e.id;
-    const firstEnabledResourceConfig = (_g = (_f = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _f.resources) == null ? void 0 : _g.find(
-      (n) => n.status === 1 && n.id === firstEnabledResourceId
+    )) || [];
+    const resourceTypeConfigById = new Map(
+      enabledResourceTypeConfigs.map((n) => [n.id, n])
     );
-    const isMultipleBooking = (firstEnabledResourceConfig == null ? void 0 : firstEnabledResourceConfig.type) === "multiple";
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
       const resourcesUseableMap = {};
-      let count = 0;
-      let bookingLeft = 0;
-      let summaryCount = 0;
-      let summaryConfigCount = 0;
+      const statsByResourceType = {};
+      enabledResourceTypeConfigs.forEach((cfg) => {
+        statsByResourceType[cfg.id] = {
+          count: 0,
+          left: 0,
+          summaryCount: 0,
+          summaryConfigCount: 0
+        };
+      });
       allProductResources == null ? void 0 : allProductResources.forEach((m) => {
-        let currentResourcesCount = 0;
-        let currentResourcesSummaryCount = 0;
-        const currentResourcesTimeSlotCanUsedArr = [];
+        const currentResourceTypeConfig = resourceTypeConfigById.get(m.form_id);
+        if (!currentResourceTypeConfig)
+          return;
+        let currentResourceMaxRemainingCapacity = 0;
+        let isAllTimeSlicesUsable = true;
         const mTimes = m.times.filter((n) => {
           return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || m.onlyComputed && (0, import_dayjs.default)(n.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
         });
         if (mTimes.length === 0) {
           return;
         }
+        if (!m.onlyComputed) {
+          const currentStats2 = statsByResourceType[m.form_id] || {
+            count: 0,
+            left: 0,
+            summaryCount: 0,
+            summaryConfigCount: 0
+          };
+          if (currentResourceTypeConfig.type === "multiple")
+            currentStats2.summaryConfigCount += m.capacity;
+          else
+            currentStats2.summaryConfigCount += 1;
+          statsByResourceType[m.form_id] = currentStats2;
+        }
         mTimes.forEach((childTiem) => {
           const res = (0, import_resources.getIsUsableByTimeItem)({
             timeSlice: {
@@ -1947,52 +2000,61 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
             resourcesUseableMap[m.id] = res.usable;
           }
-          if (res.usable && res.remainingCapacity >= count && !m.onlyComputed) {
-            currentResourcesCount = res.remainingCapacity;
-          }
-          if (res.usable && !m.onlyComputed && res.remainingCapacity >= currentResourcesSummaryCount) {
-            currentResourcesSummaryCount = res.remainingCapacity;
+          if (!res.usable)
+            isAllTimeSlicesUsable = false;
+          if (res.usable && !m.onlyComputed) {
+            if (res.remainingCapacity > currentResourceMaxRemainingCapacity)
+              currentResourceMaxRemainingCapacity = res.remainingCapacity;
           }
-          currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
-        if (m.form_id === firstEnabledResourceId) {
-          if (isMultipleBooking) {
-            summaryConfigCount += m.capacity;
-          } else {
-            summaryConfigCount += 1;
-          }
-        }
-        if (!currentResourcesTimeSlotCanUsedArr.some(
-          (n) => n === false
-        ) && // 只统计第一种资源的容量和 left
-        m.form_id === firstEnabledResourceId) {
-          if (currentResourcesCount >= count) {
-            count = currentResourcesCount;
-          }
-          if (!m.onlyComputed) {
-            bookingLeft += 1;
-            summaryCount += currentResourcesSummaryCount;
-          }
+        if (!isAllTimeSlicesUsable)
+          return;
+        if (m.onlyComputed)
+          return;
+        const currentStats = statsByResourceType[m.form_id] || {
+          count: 0,
+          left: 0,
+          summaryCount: 0,
+          summaryConfigCount: 0
+        };
+        currentStats.left += 1;
+        if (currentResourceTypeConfig.type === "multiple") {
+          currentStats.summaryCount += currentResourceMaxRemainingCapacity;
+          if (currentResourceMaxRemainingCapacity > currentStats.count)
+            currentStats.count = currentResourceMaxRemainingCapacity;
+        } else {
+          currentStats.summaryCount += 1;
+          if (currentStats.count < 1)
+            currentStats.count = 1;
         }
+        statsByResourceType[m.form_id] = currentStats;
       });
       const cartItems2 = this.store.cart.getItems();
       productResources.forEach((n) => {
+        const currentResourceTypeConfig = resourceTypeConfigById.get(n.id);
+        if (!currentResourceTypeConfig)
+          return;
+        const currentStats = statsByResourceType[n.id] || {
+          count: 0,
+          left: 0,
+          summaryCount: 0
+        };
         if (n.type === "single") {
           const currentResourcesSet = /* @__PURE__ */ new Set([...n.optional_resource, ...n.default_resource]);
           const sameCartItems = cartItems2.filter((m) => {
             var _a2, _b2, _c2;
             return ((_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.id) == null ? void 0 : _b2.toString()) === ((_c2 = targetProductData == null ? void 0 : targetProductData.id) == null ? void 0 : _c2.toString()) && `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${m.end_time}` === item.end;
           });
-          if (sameCartItems.length > 0 && sameCartItems.length >= currentResourcesSet.size || sameCartItems.length > bookingLeft) {
-            bookingLeft = 0;
-            count = 0;
-            summaryCount = 0;
+          if (sameCartItems.length > 0 && sameCartItems.length >= currentResourcesSet.size || sameCartItems.length > currentStats.left) {
+            currentStats.left = 0;
+            currentStats.count = 0;
+            currentStats.summaryCount = 0;
           }
           let otherCartItems = cartItems2.filter(
             (m) => {
-              var _a2, _b2, _c2, _d2, _e2, _f2;
+              var _a2, _b2, _c2, _d2, _e, _f;
               const isTimeMatch = ((_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.id) == null ? void 0 : _b2.toString()) !== ((_c2 = targetProductData == null ? void 0 : targetProductData.id) == null ? void 0 : _c2.toString()) && `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${m.end_time}` === item.end;
-              const isResourceMatch = (_f2 = (_e2 = (_d2 = m._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f2.find((m2) => m2.type === n.type && m2.status === 1);
+              const isResourceMatch = (_f = (_e = (_d2 = m._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e.resources) == null ? void 0 : _f.find((m2) => m2.type === n.type && m2.status === 1);
               return isTimeMatch && isResourceMatch;
             }
           );
@@ -2014,9 +2076,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             }
           });
           if (currentResourcesSet.size > 0 && otherCartItems.length + sameCartItems.length >= currentResourcesSet.size) {
-            bookingLeft = 0;
-            count = 0;
-            summaryCount = 0;
+            currentStats.left = 0;
+            currentStats.count = 0;
+            currentStats.summaryCount = 0;
           }
         } else {
           const sameCartItems = cartItems2.filter((m) => {
@@ -2026,9 +2088,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const sameCartNeedCapacity = sameCartItems.reduce((acc, curr) => acc + (0, import_capacity.getCapacityInfoByCartItem)(curr).currentCapacity, 0);
           const currentProductResourcesCapacity = n.renderList.reduce((acc, curr) => !curr.onlyComputed ? acc + curr.capacity || 0 : acc, 0);
           if (sameCartNeedCapacity >= currentProductResourcesCapacity) {
-            bookingLeft = 0;
-            count = 0;
-            summaryCount = 0;
+            currentStats.left = 0;
+            currentStats.count = 0;
+            currentStats.summaryCount = 0;
           }
           const otherSameTimesCartItems = cartItems2.filter((m) => `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${m.end_time}` === item.end);
           const otherCartNeedCapacity = otherSameTimesCartItems.reduce((acc, curr) => acc + (0, import_capacity.getCapacityInfoByCartItem)(curr).currentCapacity, 0);
@@ -2071,51 +2133,68 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             return acc;
           }, 0);
           if (otherCartNeedCapacity + usedCapacity >= currentTypeResourcesCapacity) {
-            bookingLeft = 0;
-            count = 0;
-            summaryCount = 0;
+            currentStats.left = 0;
+            currentStats.count = 0;
+            currentStats.summaryCount = 0;
           }
         }
+        statsByResourceType[n.id] = currentStats;
       });
       const startDayJs = (0, import_dayjs.default)(item.start);
       const endDayJs = (0, import_dayjs.default)(item.end);
-      let timeStatus = "sold_out";
-      if (bookingLeft === 0)
-        timeStatus = "sold_out";
-      else if (isMultipleBooking) {
-        if (summaryConfigCount === 0)
-          timeStatus = "sold_out";
-        else {
-          const usageRatio = summaryCount / summaryConfigCount;
-          if (usageRatio > 0.5)
-            timeStatus = "lots_of_space";
-          else if (summaryCount > 0)
-            timeStatus = "filling_up_fast";
-          else
-            timeStatus = "sold_out";
+      let bottleneckResourceTypeId;
+      let bottleneckValue = Infinity;
+      enabledResourceTypeConfigs.forEach((cfg) => {
+        const stats = statsByResourceType[cfg.id] || {
+          count: 0,
+          left: 0,
+          summaryCount: 0,
+          summaryConfigCount: 0
+        };
+        const value = cfg.type === "multiple" ? stats.summaryCount : stats.left;
+        if (value < bottleneckValue) {
+          bottleneckValue = value;
+          bottleneckResourceTypeId = cfg.id;
         }
+      });
+      const bottleneckStats = bottleneckResourceTypeId !== void 0 ? statsByResourceType[bottleneckResourceTypeId] || {
+        count: 0,
+        left: 0,
+        summaryCount: 0,
+        summaryConfigCount: 0
+      } : { count: 0, left: 0, summaryCount: 0, summaryConfigCount: 0 };
+      const bottleneckConfig = bottleneckResourceTypeId !== void 0 ? resourceTypeConfigById.get(bottleneckResourceTypeId) : void 0;
+      let status = "sold_out";
+      if (bottleneckStats.left === 0)
+        status = "sold_out";
+      else if (!bottleneckConfig || bottleneckStats.summaryConfigCount === 0)
+        status = "sold_out";
+      else if (bottleneckConfig.type === "multiple") {
+        const usageRatio = bottleneckStats.summaryCount / bottleneckStats.summaryConfigCount;
+        if (usageRatio > 0.5)
+          status = "lots_of_space";
+        else if (bottleneckStats.summaryCount > 0)
+          status = "filling_up_fast";
+        else
+          status = "sold_out";
       } else {
-        if (summaryConfigCount === 0)
-          timeStatus = "sold_out";
-        else {
-          const usageRatio = bookingLeft / summaryConfigCount;
-          if (usageRatio > 0.5)
-            timeStatus = "lots_of_space";
-          else if (count > 0)
-            timeStatus = "filling_up_fast";
-          else
-            timeStatus = "sold_out";
-        }
+        const usageRatio = bottleneckStats.left / bottleneckStats.summaryConfigCount;
+        if (usageRatio > 0.5)
+          status = "lots_of_space";
+        else if (bottleneckStats.count > 0)
+          status = "filling_up_fast";
+        else
+          status = "sold_out";
       }
       return {
         start_time: startDayJs.format("HH:mm"),
         end_time: endDayJs.format("HH:mm"),
         start_at: startDayJs,
         end_at: endDayJs,
-        count,
-        left: bookingLeft,
-        summaryCount,
-        status: timeStatus
+        count: bottleneckStats.count,
+        left: bottleneckStats.left,
+        summaryCount: bottleneckStats.summaryCount,
+        status
       };
     });
     return formatScheduleTimeSlots;
@@ -2873,7 +2952,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const openResources = ((_d = (_c = tempProducts == null ? void 0 : tempProducts.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.filter(
       (m) => m.status === 1
     )) || [];
-    const allProductResources = (0, import_resources.sortCombinedResources)(res.data);
+    const allProductResources = (0, import_lodash_es.cloneDeep)((0, import_resources.sortCombinedResources)(res.data) || []);
     allProductResources.forEach((m) => {
       var _a2, _b2;
       const resource = (_b2 = (_a2 = tempProducts == null ? void 0 : tempProducts.product_resource) == null ? void 0 : _a2.resources) == null ? void 0 : _b2.find(
@@ -2920,9 +2999,27 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const resourcesUseableMap = {};
           let isAllResourceTypesUseable = true;
           openResources.forEach((resource) => {
+            var _a2;
             const currentResourcesList = allProductResources.filter(
               (n) => n.form_id === resource.resource_type_id
             );
+            (_a2 = resource.renderList) == null ? void 0 : _a2.forEach((item2) => {
+              if (item2.onlyComputed) {
+                const targetIndex = currentResourcesList.findIndex((n) => n.id === item2.id);
+                if (targetIndex && targetIndex !== -1) {
+                  currentResourcesList[targetIndex].onlyComputed = true;
+                }
+              }
+            });
+            currentResourcesList.forEach((item2) => {
+              var _a3, _b2;
+              if (!((_a3 = resource.optional_resource) == null ? void 0 : _a3.includes(item2.id)) && !((_b2 = resource.default_resource) == null ? void 0 : _b2.includes(item2.id))) {
+                item2.onlyComputed = true;
+              }
+            });
+            currentResourcesList.sort((a, b) => {
+              return a.onlyComputed ? -1 : 1;
+            });
             let isAnyResourceUseableInType = false;
             currentResourcesList == null ? void 0 : currentResourcesList.forEach((m) => {
               const mTimes = m.times.filter((n) => {
@@ -2930,10 +3027,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               });
               if (mTimes.length === 0)
                 return;
-              if (resource.type === "multiple") {
-                summaryCount += m.capacity;
-              } else {
-                summaryCount += 1;
+              if (!m.onlyComputed) {
+                if (resource.type === "multiple") {
+                  summaryCount += m.capacity;
+                } else {
+                  summaryCount += 1;
+                }
               }
               let isAnyTimeSliceUseable = false;
               mTimes.forEach((childTiem) => {

package/lib/solution/ShopDiscount/index.js

@@ -469,7 +469,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         action: "create",
         with_good_pass: 1,
         with_discount_card: 1,
-        with_wallet_pass_holder: 1
+        with_wallet_pass_holder: 1,
+        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan

package/package.json

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