@pisell/pisellos 0.0.433 → 0.0.435

package/dist/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(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/modules/Summary/utils.js

@@ -336,7 +336,6 @@ var processItemsTax = function processItemsTax(items, _ref2, options) {
       var bundlePreciseTax = new Decimal(0);
       var bundleRoundedOriginTax = new Decimal(0);
       var bundleRoundedTax = new Decimal(0);
-      debugger;
       if (Array.isArray(item === null || item === void 0 ? void 0 : item.bundle)) {
         var _iterator3 = _createForOfIteratorHelper(item === null || item === void 0 ? void 0 : item.bundle),
           _step3;
@@ -678,9 +677,9 @@ var getDiscountAmount = function getDiscountAmount(discounts) {
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
  */
 var getMainProductTotal = function getMainProductTotal(item) {
-  var _ref7, _ref8, _item$main_product_se, _item$metadata, _item$_origin3, _item$_originData$pro;
+  var _ref7, _ref8, _item$main_product_se, _item$metadata, _item$_origin3, _item$_originData;
   var total = new Decimal((_ref7 = (_ref8 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref8 !== void 0 ? _ref8 : item.price) !== null && _ref7 !== void 0 ? _ref7 : 0);
-  var mainProductDiscountAmount = getDiscountAmount((item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.discount_list) || (item === null || item === void 0 || (_item$_originData$pro = item._originData.product) === null || _item$_originData$pro === void 0 ? void 0 : _item$_originData$pro.discount_list) || []);
+  var mainProductDiscountAmount = getDiscountAmount((item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.discount_list) || (item === null || item === void 0 || (_item$_originData = item._originData) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.product) === null || _item$_originData === void 0 ? void 0 : _item$_originData.discount_list) || []);
   total = total.minus(mainProductDiscountAmount);
 
   // 单规格

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

@@ -1163,7 +1163,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
         product_variant_id: product_variant_id
       });
-      debugger;
       // 保护，如果进来的是 session 商品，则必须要有 date 和时间片，否则不允许添加
       if (isSessionProduct(productData)) {
         if (!date || !date.startTime || !date.endTime) {
@@ -2138,6 +2137,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       }
+
+      // 如果依然 resources 空的，则证明他是切换日期了，此时直接从 date 模块里取
+      if (resources.length === 0) {
+        resources.push.apply(resources, _toConsumableArray(this.store.date.getResourcesListByDate(dateRange[0].date) || []));
+      }
       var resourcesMap = getResourcesMap(resources);
       var duration = 0;
       // duration = 不同账号的最长时间
@@ -2217,12 +2221,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 +2398,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 +3164,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;
               })) {

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(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/modules/Summary/utils.js

@@ -212,7 +212,6 @@ var processItemsTax = (items, { bookingDetail, bookingId }, options) => {
     let bundlePreciseTax = new import_decimal.default(0);
     let bundleRoundedOriginTax = new import_decimal.default(0);
     let bundleRoundedTax = new import_decimal.default(0);
-    debugger;
     if (Array.isArray(item == null ? void 0 : item.bundle)) {
       for (let bundleItem of item == null ? void 0 : item.bundle) {
         if (getBundleItemIsOriginalPrice(bundleItem)) {
@@ -409,9 +408,9 @@ var getDiscountAmount = (discounts) => {
   }, new import_decimal.default(0)).toNumber();
 };
 var getMainProductTotal = (item) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   let total = new import_decimal.default((item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? item.price ?? 0);
-  const mainProductDiscountAmount = getDiscountAmount(((_c = (_b = item == null ? void 0 : item._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_d = item == null ? void 0 : item._originData.product) == null ? void 0 : _d.discount_list) || []);
+  const mainProductDiscountAmount = getDiscountAmount(((_c = (_b = item == null ? void 0 : item._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_e = (_d = item == null ? void 0 : item._originData) == null ? void 0 : _d.product) == null ? void 0 : _e.discount_list) || []);
   total = total.minus(mainProductDiscountAmount);
   if ((item == null ? void 0 : item.option) && Array.isArray(item == null ? void 0 : item.option)) {
     total = total.add(item == null ? void 0 : item.option.reduce((t, option) => {

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

@@ -608,7 +608,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       quantity = 1
     } = product || {};
     const productData = { ...origin, product_variant_id };
-    debugger;
     if ((0, import_products.isSessionProduct)(productData)) {
       if (!date || !date.startTime || !date.endTime) {
         return { success: false, errorCode: "date_or_time_required" };
@@ -1464,6 +1463,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();
@@ -1538,12 +1540,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 +1676,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 +2265,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);
             }

package/package.json

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