@pisell/pisellos 2.1.62 → 2.1.64

package/lib/modules/Rules/types.d.ts

@@ -25,6 +25,7 @@ export interface RulesModuleAPI {
         holders: {
             form_record_id: number;
         }[];
+        orderTotalAmount: number;
         isFormSubject: boolean;
     }) => DiscountResult;
 }

package/lib/modules/Summary/types.d.ts

@@ -5,6 +5,8 @@ export interface ISummaryState {
         subtotal: string | number;
         /** 最终总价 */
         total: string | number;
+        /** 最终原始价格 不包含折扣卡商品券折扣 */
+        originTotal: string | number;
         /** 税率标题 */
         taxTitle?: string;
         /** 商品总费率 */

package/lib/modules/Summary/utils.d.ts

@@ -8,6 +8,12 @@ export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) =
  * @returns 商品总价字符串，保留2位小数
  */
 export declare const calculateSubtotal: (items: CartItem[]) => string;
+/**
+ * 计算商品小计（不含其他费用 不包含折扣卡商品券抵扣金额）
+ * @param items - 购物车商品数组
+ * @returns 商品总价字符串，保留2位小数
+ */
+export declare const calculateOriginSubtotal: (items: CartItem[]) => string;
 /**
  * @title: 单个商品的税费
  * @description:

package/lib/modules/Summary/utils.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   calculateDeposit: () => calculateDeposit,
+  calculateOriginSubtotal: () => calculateOriginSubtotal,
   calculatePriceDetails: () => calculatePriceDetails,
   calculateSubtotal: () => calculateSubtotal,
   calculateTaxFee: () => calculateTaxFee
@@ -38,12 +39,15 @@ module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
 var calculatePriceDetails = (shopInfo, items) => {
   const subtotal = new import_decimal.default(calculateSubtotal(items));
+  const subOriginTotal = new import_decimal.default(calculateOriginSubtotal(items));
   const totalTaxFee = new import_decimal.default(calculateTaxFee(shopInfo, items));
   const total = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subtotal : subtotal.plus(totalTaxFee);
+  const originTotal = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subOriginTotal : subOriginTotal.plus(totalTaxFee);
   const deposit = calculateDeposit(items);
   return {
     subtotal: subtotal.toFixed(2),
     total: total.toFixed(2),
+    originTotal: originTotal.toFixed(2),
     taxTitle: shopInfo == null ? void 0 : shopInfo.tax_title,
     totalTaxFee: totalTaxFee.toFixed(2),
     isPriceIncludeTax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax,
@@ -60,6 +64,16 @@ var calculateSubtotal = (items) => {
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
 };
+var calculateOriginSubtotal = (items) => {
+  if (!(items == null ? void 0 : items.length)) {
+    return "0.00";
+  }
+  const subtotal = items.reduce((sum, item) => {
+    const cartItemTotalPrice = new import_decimal.default(item.summaryOriginTotal || 0);
+    return sum.plus(cartItemTotalPrice);
+  }, new import_decimal.default(0));
+  return subtotal.toFixed(2);
+};
 var calculateTaxFee = (shopInfo, items) => {
   if (!(items == null ? void 0 : items.length)) {
     return "0.00";
@@ -101,6 +115,7 @@ var calculateDeposit = (items) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   calculateDeposit,
+  calculateOriginSubtotal,
   calculatePriceDetails,
   calculateSubtotal,
   calculateTaxFee

package/lib/plugins/window.d.ts

@@ -1,3 +1,4 @@
+import { WalletPassEvaluator } from '../model';
 import { Plugin } from '../types';
 /**
  * WindowPlugin 接口定义
@@ -14,6 +15,7 @@ export interface WindowPlugin extends Plugin {
     document: Partial<Document>;
     history: History;
     interaction?: any;
+    getWalletPassEvaluator?: () => WalletPassEvaluator;
 }
 /**
  * 简单的 Storage 接口实现

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

@@ -144,6 +144,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getSummary(): Promise<{
         subtotal: string | number;
         total: string | number;
+        originTotal: string | number;
         taxTitle?: string | undefined;
         totalTaxFee?: string | number | undefined;
         isPriceIncludeTax?: 0 | 1 | undefined;
@@ -315,6 +316,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         end_at: dayjs.Dayjs;
         count: number;
         left: number;
+        summaryCount: number;
     }[];
     /**
      * 找到多个资源的公共可用时间段

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/BookingTicket/index.d.ts

@@ -115,7 +115,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/Checkout/index.js

@@ -222,6 +222,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           product_id: item.product_id,
           product_variant_id: item.product_variant_id,
           quantity: item.num,
+          is_price_include_tax: item.is_price_include_tax,
           // 商品是否含税：1；0
           is_charge_tax: item.is_charge_tax ?? 0,
           // 若商品不含税，计算得到的税费，单位（元）
@@ -246,6 +247,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           },
           product_bundle: item.product_bundle.map((bundle) => {
             return {
+              is_price_include_tax: item.is_price_include_tax,
               bundle_id: bundle.bundle_id,
               bundle_product_id: bundle.bundle_product_id,
               bundle_variant_id: bundle.bundle_variant_id,

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

@@ -21,6 +21,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     getCurrentBookingTime(): string | null;
     private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
+    setOriginTotalAmount(amount: number): void;
     setHolders(holders: {
         form_record_id: number;
     }[]): void;

package/lib/solution/ShopDiscount/index.js

@@ -55,6 +55,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
+      orderTotalAmount: 0,
       bookingSubject: void 0
     };
   }
@@ -193,6 +194,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       );
     }
   }
+  setOriginTotalAmount(amount) {
+    this.store.orderTotalAmount = amount;
+  }
   // 设置holders
   setHolders(holders) {
     this.store.holders = holders;
@@ -213,6 +217,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         productList,
         discountList: this.getDiscountList(),
         holders: this.store.holders || [],
+        orderTotalAmount: this.store.orderTotalAmount || 0,
         isFormSubject: ((_a = this.store.bookingSubject) == null ? void 0 : _a.type) === "form"
       },
       options
@@ -304,6 +309,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         oldDiscountList: this.getDiscountList(),
         newDiscountList: withScanList,
         holders: this.store.holders || [],
+        orderTotalAmount: this.store.orderTotalAmount || 0,
         isFormSubject: ((_b = this.store.bookingSubject) == null ? void 0 : _b.type) === "form"
       }) || {
         isAvailable: false,

package/lib/solution/ShopDiscount/types.d.ts

@@ -31,6 +31,7 @@ export interface ShopDiscountState {
     originalDiscountList: Discount[];
     currentBookingTime: string | null;
     filteredDiscountList: Discount[];
+    orderTotalAmount?: number;
     bookingSubject?: {
         type?: 'form' | 'customer';
         [key: string]: any;

package/lib/solution/ShopDiscount/utils.js

@@ -54,14 +54,18 @@ var isAllNormalProduct = (items) => {
 };
 var getDiscountAmount = (discount, total, price) => {
   var _a;
+  let discountedPrice = 0;
   if (discount.tag === "good_pass") {
-    return new import_decimal.default(price).minus(new import_decimal.default(price || 0)).toNumber();
-  }
-  const isFixedAmount = ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount";
-  if (isFixedAmount) {
-    return Math.max(new import_decimal.default(price).minus(new import_decimal.default(discount.par_value || 0)).toNumber(), 0);
+    discountedPrice = new import_decimal.default(price).minus(new import_decimal.default(price || 0)).toNumber();
+  } else {
+    const isFixedAmount = ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount";
+    if (isFixedAmount) {
+      discountedPrice = Math.max(new import_decimal.default(price).minus(new import_decimal.default(discount.par_value || 0)).toNumber(), 0);
+    } else {
+      discountedPrice = new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(price)).toNumber();
+    }
   }
-  return new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(price)).toNumber();
+  return discountedPrice;
 };
 var getDiscountListAmountTotal = (discount) => {
   return discount.reduce((acc, cur) => {

package/package.json

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