@pisell/pisellos 0.0.425 → 0.0.427

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

@@ -358,7 +358,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     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

@@ -4259,12 +4259,28 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                           // 总量=每个资源在每个时间片内资源总量之和
                           var isAllResourceTypesUseable = true;
                           openResources.forEach(function (resource) {
+                            var _resource$renderList;
                             // if (!isAllResourceTypesUseable) return;
 
                             // 获取当前资源类型的资源列表
                             var currentResourcesList = allProductResources.filter(function (n) {
                               return n.form_id === resource.resource_type_id;
                             });
+                            // 如果resource.renderList里含有 onlyComputed 的数据，需要把 currentResourcesList 的数据也修正回来
+                            (_resource$renderList = resource.renderList) === null || _resource$renderList === void 0 || _resource$renderList.forEach(function (item) {
+                              if (item.onlyComputed) {
+                                var targetIndex = currentResourcesList.findIndex(function (n) {
+                                  return n.id === item.id;
+                                });
+                                if (targetIndex && targetIndex !== -1) {
+                                  currentResourcesList[targetIndex].onlyComputed = true;
+                                }
+                              }
+                            });
+                            // currentResourcesList 排序，onlyComputed 的资源排在前面先计算
+                            currentResourcesList.sort(function (a, b) {
+                              return a.onlyComputed ? -1 : 1;
+                            });
                             var isAnyResourceUseableInType = false;
                             currentResourcesList === null || currentResourcesList === void 0 || currentResourcesList.forEach(function (m) {
                               // 遍历所有资源的上工时间片
@@ -4278,10 +4294,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_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;
+                                }
                               }
                               var isAnyTimeSliceUseable = false;
                               mTimes.forEach(function (childTiem) {

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

@@ -33,9 +33,14 @@ export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref) {
         window.sendWarningLog({
           title: '未找到套餐 capacity 配置',
           content: [{
-            product_id: id,
-            variant_id: variantId,
-            package: JSON.stringify((capacity === null || capacity === void 0 ? void 0 : capacity.package) || [])
+            key: 'product_id',
+            value: id
+          }, {
+            key: 'variant_id',
+            value: variantId
+          }, {
+            key: 'package',
+            value: JSON.stringify((capacity === null || capacity === void 0 ? void 0 : capacity.package) || [])
           }]
         });
       }

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

@@ -444,6 +444,10 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
     // 解析开始和结束时间
     var startTime = dayjs("".concat(time.start_at));
     var endTime = dayjs("".concat(time.end_at));
+    // 结束时间要做修复，如果time.end_at 是超过了 currentDate 的那一天，则把 end_at 设置为 currentDate 那一天的 23:59:59
+    if (endTime.isAfter(dayjs(currentDate).endOf('day'))) {
+      endTime = dayjs(currentDate).endOf('day');
+    }
 
     // 当前切片的开始时间
     var currentStart = startTime;

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

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

package/dist/solution/ShopDiscount/utils.js

@@ -485,7 +485,6 @@ export var filterDiscountListByBookingTime = function filterDiscountListByBookin
     }
   });
 };
-
 /**
  * 判断是否是订单级别的固定金额折扣卡
  * @param discount 折扣

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

@@ -358,7 +358,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     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

@@ -2983,9 +2983,21 @@ 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.sort((a, b) => {
+              return a.onlyComputed ? -1 : 1;
+            });
             let isAnyResourceUseableInType = false;
             currentResourcesList == null ? void 0 : currentResourcesList.forEach((m) => {
               const mTimes = m.times.filter((n) => {
@@ -2993,10 +3005,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/BookingByStep/utils/capacity.js

@@ -54,7 +54,20 @@ var formatDefaultCapacitys = ({
       if (!item && (window == null ? void 0 : window.sendWarningLog)) {
         window.sendWarningLog({
           title: "未找到套餐 capacity 配置",
-          content: [{ product_id: id, variant_id: variantId, package: JSON.stringify((capacity == null ? void 0 : capacity.package) || []) }]
+          content: [
+            {
+              key: "product_id",
+              value: id
+            },
+            {
+              key: "variant_id",
+              value: variantId
+            },
+            {
+              key: "package",
+              value: JSON.stringify((capacity == null ? void 0 : capacity.package) || [])
+            }
+          ]
         });
       }
       return {

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

@@ -353,7 +353,10 @@ var getTimeSlicesByResource = ({
   });
   times.forEach((time) => {
     const startTime = (0, import_dayjs.default)(`${time.start_at}`);
-    const endTime = (0, import_dayjs.default)(`${time.end_at}`);
+    let endTime = (0, import_dayjs.default)(`${time.end_at}`);
+    if (endTime.isAfter((0, import_dayjs.default)(currentDate).endOf("day"))) {
+      endTime = (0, import_dayjs.default)(currentDate).endOf("day");
+    }
     let currentStart = startTime;
     while (true) {
       const currentEnd = currentStart.add(duration, "minute");

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

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

package/package.json

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