@pisell/pisellos 0.0.178 → 0.0.180

package/dist/modules/Cart/utils/cartProduct.d.ts

@@ -54,6 +54,7 @@ export declare const getProductOriginTotalPrice: (params: {
     bundle?: any;
     options?: any;
     num?: number;
+    discounts?: any[];
 }) => number | undefined;
 /**
  * 格式化套餐规格信息

package/dist/modules/Cart/utils/cartProduct.js

@@ -71,7 +71,8 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
       product: product,
       bundle: bundle,
       options: options,
-      num: num
+      num: num,
+      discounts: discounts
     });
     cartItem.image = product === null || product === void 0 ? void 0 : product.cover;
     cartItem.like_status = 'common';
@@ -206,19 +207,11 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
 export var getProductOriginTotalPrice = function getProductOriginTotalPrice(params) {
   var product = params.product,
     bundle = params.bundle,
-    options = params.options;
+    options = params.options,
+    discounts = params.discounts;
   var num = (params === null || params === void 0 ? void 0 : params.num) || 1;
   var price = Number(product.original_price);
-
-  // if (product.discount_list?.length) {
-  //   price = product.discount_list.reduce((accumulator: any, currentValue: any) => {
-  //     return (
-  //       accumulator + Number(currentValue.price) * Number(currentValue.num)
-  //     );
-  //   }, price);
-  // }
-
-  if (isNaN(price) || price === 0) {
+  if ((isNaN(price) || price === 0) && !(discounts !== null && discounts !== void 0 && discounts.length)) {
     return undefined;
   }
   if (bundle !== null && bundle !== void 0 && bundle.length) {

package/dist/solution/BookingByStep/index.js

@@ -1295,7 +1295,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   var originResource = allOriginResources.find(function (n) {
                     return n.id === targetRes.id;
                   });
-                  var canUse = checkResourceCanUseByCapacity(currentResourcesCapacityMap[m.id], currentCapacity, originResource === null || originResource === void 0 ? void 0 : originResource.capacity);
+                  var canUse = checkResourceCanUseByCapacity(currentResourcesCapacityMap[m.id] || 0, currentCapacity, originResource === null || originResource === void 0 ? void 0 : originResource.capacity);
                   if (canUse) currentResourcesCapacityMap[m.id] += currentCapacity;
                   return !canUse;
                 }
@@ -1425,7 +1425,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var resources = [];
       if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
         dateRange.forEach(function (n) {
-          resources.push.apply(resources, _toConsumableArray(_this10.store.date.getResourcesListByDate(n.date) || []));
+          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
         });
       }
       var cartItems = this.store.cart.getItems().filter(function (n) {

package/lib/modules/Cart/utils/cartProduct.d.ts

@@ -54,6 +54,7 @@ export declare const getProductOriginTotalPrice: (params: {
     bundle?: any;
     options?: any;
     num?: number;
+    discounts?: any[];
 }) => number | undefined;
 /**
  * 格式化套餐规格信息

package/lib/modules/Cart/utils/cartProduct.js

@@ -82,7 +82,8 @@ var formatProductToCartItem = (params) => {
       product,
       bundle,
       options,
-      num
+      num,
+      discounts
     });
     cartItem.image = product == null ? void 0 : product.cover;
     cartItem.like_status = "common";
@@ -189,10 +190,10 @@ var getProductTotalPrice = (params) => {
   return price;
 };
 var getProductOriginTotalPrice = (params) => {
-  const { product, bundle, options } = params;
+  const { product, bundle, options, discounts } = params;
   const num = (params == null ? void 0 : params.num) || 1;
   let price = Number(product.original_price);
-  if (isNaN(price) || price === 0) {
+  if ((isNaN(price) || price === 0) && !(discounts == null ? void 0 : discounts.length)) {
     return void 0;
   }
   if (bundle == null ? void 0 : bundle.length) {

package/lib/solution/BookingByStep/index.js

@@ -719,7 +719,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                   (n) => n.id === targetRes.id
                 );
                 const canUse = (0, import_capacity.checkResourceCanUseByCapacity)(
-                  currentResourcesCapacityMap[m.id],
+                  currentResourcesCapacityMap[m.id] || 0,
                   currentCapacity,
                   originResource == null ? void 0 : originResource.capacity
                 );
@@ -825,7 +825,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const resources = [];
     if (dateRange == null ? void 0 : dateRange.length) {
       dateRange.forEach((n) => {
-        resources.push(...this.store.date.getResourcesListByDate(n.date) || []);
+        if (n.resource)
+          resources.push(...n.resource);
       });
     }
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));

package/package.json

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