@pisell/pisellos 2.2.23 → 2.2.25

package/lib/modules/Summary/utils.js

@@ -32,7 +32,8 @@ __export(utils_exports, {
   calculateDeposit: () => calculateDeposit,
   calculatePriceDetails: () => calculatePriceDetails,
   calculateSubtotal: () => calculateSubtotal,
-  calculateTaxFee: () => calculateTaxFee
+  calculateTaxFee: () => calculateTaxFee,
+  getBundleDiscountList: () => getBundleDiscountList
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
@@ -50,13 +51,35 @@ var calculatePriceDetails = (shopInfo, items) => {
     deposit
   };
 };
+var getBundleDiscountList = (bundle) => {
+  if (!bundle) {
+    return [];
+  }
+  let discountList = [];
+  bundle.forEach((d) => {
+    if (d.discount_list && Array.isArray(d.discount_list)) {
+      discountList.push(...d.discount_list.filter((item) => !item.id));
+    }
+  });
+  return discountList;
+};
+var getProductDiscountProductDiscountDifference = (item) => {
+  var _a, _b, _c, _d;
+  const mainDiscountList = ((_b = (_a = item._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
+  const bundleDiscountList = getBundleDiscountList(((_d = (_c = item._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.product_bundle) || []);
+  const discountList = [...mainDiscountList, ...bundleDiscountList];
+  return discountList.reduce((pre, cur) => {
+    return pre + (cur.metadata.product_discount_difference || 0);
+  }, 0);
+};
 var calculateSubtotal = (items) => {
   if (!(items == null ? void 0 : items.length)) {
     return "0.00";
   }
   const subtotal = items.reduce((sum, item) => {
     const cartItemTotalPrice = new import_decimal.default(item.summaryTotal || 0);
-    return sum.plus(cartItemTotalPrice);
+    const productDiscountProductDiscountDifference = getProductDiscountProductDiscountDifference(item);
+    return sum.plus(cartItemTotalPrice).sub(productDiscountProductDiscountDifference);
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
 };
@@ -103,5 +126,6 @@ var calculateDeposit = (items) => {
   calculateDeposit,
   calculatePriceDetails,
   calculateSubtotal,
-  calculateTaxFee
+  calculateTaxFee,
+  getBundleDiscountList
 });

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

@@ -315,6 +315,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         end_at: dayjs.Dayjs;
         count: number;
         left: number;
+        summaryCount: number;
     }[];
     /**
      * 找到多个资源的公共可用时间段
@@ -342,7 +343,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

@@ -1735,8 +1735,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       const resourcesUseableMap = {};
       let count = 0;
       let bookingLeft = 0;
+      let summaryCount = 0;
       allProductResources == null ? void 0 : allProductResources.forEach((m) => {
         let currentResourcesCount = 0;
+        let currentResourcesSummaryCount = 0;
         const currentResourcesTimeSlotCanUsedArr = [];
         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") || (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");
@@ -1764,6 +1766,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           if (res.usable && res.remainingCapacity >= count && !m.onlyComputed) {
             currentResourcesCount = res.remainingCapacity;
           }
+          if (res.usable && !m.onlyComputed && res.remainingCapacity >= currentResourcesSummaryCount) {
+            currentResourcesSummaryCount = res.remainingCapacity;
+          }
           currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
         if (!currentResourcesTimeSlotCanUsedArr.some(
@@ -1775,6 +1780,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
           if (!m.onlyComputed) {
             bookingLeft += 1;
+            summaryCount += currentResourcesSummaryCount;
           }
         }
       });
@@ -1789,6 +1795,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           if (sameCartItems.length > 0 && sameCartItems.length >= currentResourcesSet.size || sameCartItems.length > bookingLeft) {
             bookingLeft = 0;
             count = 0;
+            summaryCount = 0;
           }
           const otherCartItems = cartItems2.filter((m) => {
             var _a2, _b2, _c2;
@@ -1814,6 +1821,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           if (currentResourcesSet.size > 0 && otherCartItems.length + sameCartItems.length >= currentResourcesSet.size) {
             bookingLeft = 0;
             count = 0;
+            summaryCount = 0;
           }
         } else {
           const sameCartItems = cartItems2.filter((m) => {
@@ -1825,6 +1833,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           if (sameCartNeedCapacity >= currentProductResourcesCapacity) {
             bookingLeft = 0;
             count = 0;
+            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);
@@ -1869,6 +1878,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           if (otherCartNeedCapacity + usedCapacity >= currentTypeResourcesCapacity) {
             bookingLeft = 0;
             count = 0;
+            summaryCount = 0;
           }
         }
       });
@@ -1880,7 +1890,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         start_at: startDayJs,
         end_at: endDayJs,
         count,
-        left: bookingLeft
+        left: bookingLeft,
+        summaryCount
       };
     });
     return formatScheduleTimeSlots;

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

@@ -20,6 +20,7 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
     private otherParams;
     private logger;
     private calculationCache;
+    private syncOrderToBackendInFlightByOrderKey;
     order: OrderModule;
     payment: PaymentModule;
     constructor(name?: string, version?: string);