@pisell/pisellos 2.1.103 → 2.1.104

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

@@ -28,6 +28,7 @@ export interface RulesModuleAPI {
     calcDiscount: (params: {
         discountList: any[];
         productList: any[];
+        orderTotalAmount: number;
         holders: {
             form_record_id: number;
         }[];

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

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

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

@@ -58,6 +58,12 @@ export declare const getTax: ({ service, addons, bookingDetail, bookingId }: {
  * @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

@@ -31,6 +31,7 @@ var utils_exports = {};
 __export(utils_exports, {
   calcDiscountListDifference: () => calcDiscountListDifference,
   calculateDeposit: () => calculateDeposit,
+  calculateOriginSubtotal: () => calculateOriginSubtotal,
   calculatePriceDetails: () => calculatePriceDetails,
   calculateSubtotal: () => calculateSubtotal,
   calculateTaxFee: () => calculateTaxFee,
@@ -46,6 +47,7 @@ var import_utils = require("../Product/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var calculatePriceDetails = (shopInfo, items, isInScheduleByDate, surchargeList, scheduleById) => {
   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 surcharge = getSurcharge({ service: items, addons: [], bookingDetail: null, bookingId: void 0 }, { isEdit: false, isInScheduleByDate, surcharge_list: surchargeList, scheduleById });
   const surchargeAmount = new import_decimal.default(getSurchargeAmount({ bookingDetail: null, bookingId: void 0 }, surcharge, { isEdit: false }));
@@ -59,10 +61,12 @@ var calculatePriceDetails = (shopInfo, items, isInScheduleByDate, surchargeList,
     is_price_include_tax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax
   });
   const total = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subtotal.plus(surchargeAmount) : subtotal.plus(tax).plus(surchargeAmount);
+  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,
     taxRate: shopInfo == null ? void 0 : shopInfo.tax_rate,
     totalTaxFee: tax,
@@ -360,6 +364,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";
@@ -785,6 +799,7 @@ function resetItemsSurchargeSideEffects({ service, addons }) {
 0 && (module.exports = {
   calcDiscountListDifference,
   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;
@@ -310,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -357,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<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @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,
           // 若商品不含税，计算得到的税费，单位（元）
@@ -244,8 +245,9 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
             // 可选，附加费均摊舍入金额
             "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
           },
-          product_bundle: item.product_bundle.map((bundle) => {
+          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

@@ -22,6 +22,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

@@ -56,7 +56,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      bookingSubject: void 0
+      bookingSubject: void 0,
+      orderTotalAmount: 0
     };
   }
   // =========== 生命周期方法 ===========
@@ -194,6 +195,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(),
+        orderTotalAmount: this.store.orderTotalAmount || 0,
         holders: this.store.holders || [],
         isFormSubject: ((_a = this.store.bookingSubject) == null ? void 0 : _a.type) === "form"
       },
@@ -320,6 +325,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         productList: this.store.productList || [],
         oldDiscountList: this.getDiscountList(),
         newDiscountList: withScanList,
+        orderTotalAmount: this.store.orderTotalAmount || 0,
         holders: this.store.holders || [],
         isFormSubject: ((_b = this.store.bookingSubject) == null ? void 0 : _b.type) === "form"
       }) || {
@@ -388,7 +394,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if (item.booking_id) {
         const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(item);
         (item.discount_list || []).forEach((discount) => {
-          var _a3, _b, _c, _d, _e;
+          var _a3, _b, _c, _d, _e, _f, _g, _h, _i;
           if (discount.id && ["good_pass", "discount_card"].includes(discount.type)) {
             const index = editModeDiscountList.findIndex((n) => {
               var _a4;
@@ -397,8 +403,12 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
             if (index !== -1) {
               editModeDiscountList[index] = {
                 ...editModeDiscountList[index],
+                metadata: {
+                  ...discount.metadata || {},
+                  num: (((_b = (_a3 = editModeDiscountList == null ? void 0 : editModeDiscountList[index]) == null ? void 0 : _a3.metadata) == null ? void 0 : _b.num) || 1) + (((_c = discount.metadata) == null ? void 0 : _c.num) || 1)
+                },
                 amount: new import_decimal.default(discount.amount || 0).plus(new import_decimal.default(editModeDiscountList[index].amount || 0)).toNumber(),
-                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_a3 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a3.product_discount_difference) || 0).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_d = discount == null ? void 0 : discount.metadata) == null ? void 0 : _d.product_discount_difference) || 0).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
               };
             } else {
               if (discount.type && !discount.tag) {
@@ -406,16 +416,20 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
               }
               editModeDiscountList.push({
                 ...discount,
+                metadata: {
+                  ...discount.metadata || {},
+                  num: ((_e = discount.metadata) == null ? void 0 : _e.num) || 1
+                },
                 name: discount.name || discount.discount.title.auto,
                 isEditMode: true,
                 limited_relation_product_data: {},
-                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.product_discount_difference) || 0).toNumber(),
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_f = discount == null ? void 0 : discount.metadata) == null ? void 0 : _f.product_discount_difference) || 0).toNumber(),
                 isAvailable: true,
-                id: ((_c = discount.discount) == null ? void 0 : _c.resource_id) || discount.id,
-                format_title: ((_d = discount.discount) == null ? void 0 : _d.title) || discount.format_title,
+                id: ((_g = discount.discount) == null ? void 0 : _g.resource_id) || discount.id,
+                format_title: ((_h = discount.discount) == null ? void 0 : _h.title) || discount.format_title,
                 isDisabled: true,
                 isSelected: true,
-                product_id: ((_e = discount.discount) == null ? void 0 : _e.product_id) || discount.product_id
+                product_id: ((_i = discount.discount) == null ? void 0 : _i.product_id) || discount.product_id
               });
             }
           }
@@ -532,7 +546,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       }
       await this.core.effects.emit(
         `${this.name}:onLoadDiscountList`,
-        filteredDiscountList
+        newDiscountList
       );
     } catch (error) {
       console.error("[ShopDiscount] 加载准备配置出错:", error);

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

@@ -23,6 +23,7 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
+    orderTotalAmount?: number;
     holders?: {
         form_record_id: number;
         form_id?: number;

package/lib/solution/ShopDiscount/utils.js

@@ -56,14 +56,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.amount ?? 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.103",
+  "version": "2.1.104",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",