@pisell/pisellos 0.0.432 → 0.0.434

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -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

@@ -2217,12 +2217,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var _item$_resourceOrigin;
           return ((_item$_resourceOrigin = item._resourceOrigin) === null || _item$_resourceOrigin === void 0 ? void 0 : _item$_resourceOrigin[0].id) === firstResource;
         }).length;
-        if (sameResourceLength !== items.length) {
+        if (sameResourceLength === items.length) {
           return 1;
         }
-        return items.reduce(function (total, item) {
-          return total + (getCapacityInfoByCartItem(item).currentCapacity || 0);
-        }, 0);
+        // 找出单个购物车里最大的需求 capacity 即可
+        return Math.max.apply(Math, _toConsumableArray(items.map(function (item) {
+          return getCapacityInfoByCartItem(item).currentCapacity || 1;
+        })));
+        // return items.reduce((total, item) => {
+        //   return total + (getCapacityInfoByCartItem(item).currentCapacity || 0);
+        // }, 0);
       };
 
       // 如果是多个人预约，去要求出几个 holder 下最大的商品需求容量capacity
@@ -2390,9 +2394,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 if (sameResourceLength !== items.length) {
                   return 1;
                 }
-                return items.reduce(function (total, item) {
-                  return total + (getCapacityInfoByCartItem(item).currentCapacity || 0);
-                }, 0);
+                // 找出单个购物车里最大的需求 capacity 即可
+                return Math.max.apply(Math, _toConsumableArray(items.map(function (item) {
+                  return getCapacityInfoByCartItem(item).currentCapacity || 1;
+                })));
               }; // 如果是多个预约，去要求出几个 holder 下最大的需求容量capacity
               maxCapacity = 1;
               if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
@@ -3155,6 +3160,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 itemsByResourceType[resourceCode] = [];
               }
               // 避免重复添加同一个商品
+              // 如果之前添加过的依赖相同资源的跟我现在是同一个 holder，也不需要重复添加
+              if (itemsByResourceType[resourceCode].find(function (item) {
+                return item.holder_id === cartItem.holder_id;
+              })) {
+                return;
+              }
               if (!itemsByResourceType[resourceCode].find(function (item) {
                 return item._id === cartItem._id;
               })) {
@@ -4277,6 +4288,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                                 }
                               }
                             });
+                            // 可能存在 renderList 没有的情况，则需要判断 resource.optional_resource 和 resource.default_resource 是否存在那个资源，如果不存在也打上 onlyComputed 的标记
+                            currentResourcesList.forEach(function (item) {
+                              var _resource$optional_re, _resource$default_res;
+                              if (!((_resource$optional_re = resource.optional_resource) !== null && _resource$optional_re !== void 0 && _resource$optional_re.includes(item.id)) && !((_resource$default_res = resource.default_resource) !== null && _resource$default_res !== void 0 && _resource$default_res.includes(item.id))) {
+                                item.onlyComputed = true;
+                              }
+                            });
                             // currentResourcesList 排序，onlyComputed 的资源排在前面先计算
                             currentResourcesList.sort(function (a, b) {
                               return a.onlyComputed ? -1 : 1;

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, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -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

@@ -1538,12 +1538,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         var _a3;
         return ((_a3 = item._resourceOrigin) == null ? void 0 : _a3[0].id) === firstResource;
       }).length;
-      if (sameResourceLength !== items.length) {
+      if (sameResourceLength === items.length) {
         return 1;
       }
-      return items.reduce((total, item) => {
-        return total + ((0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 0);
-      }, 0);
+      return Math.max(...items.map((item) => (0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 1));
     };
     let maxCapacity = 1;
     if (cartItems == null ? void 0 : cartItems[0].holder_id) {
@@ -1676,9 +1674,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       if (sameResourceLength !== items.length) {
         return 1;
       }
-      return items.reduce((total, item) => {
-        return total + ((0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 0);
-      }, 0);
+      return Math.max(...items.map((item) => (0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 1));
     };
     let maxCapacity = 1;
     if (cartItems == null ? void 0 : cartItems[0].holder_id) {
@@ -2267,6 +2263,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             if (!itemsByResourceType[resourceCode]) {
               itemsByResourceType[resourceCode] = [];
             }
+            if (itemsByResourceType[resourceCode].find((item) => item.holder_id === cartItem.holder_id)) {
+              return;
+            }
             if (!itemsByResourceType[resourceCode].find((item) => item._id === cartItem._id)) {
               itemsByResourceType[resourceCode].push(cartItem);
             }
@@ -2995,6 +2994,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 }
               }
             });
+            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;
             });

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, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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