@pisell/pisellos 2.1.93 → 2.1.95

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

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

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

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

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

@@ -58,12 +58,6 @@ 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,7 +31,6 @@ var utils_exports = {};
 __export(utils_exports, {
   calcDiscountListDifference: () => calcDiscountListDifference,
   calculateDeposit: () => calculateDeposit,
-  calculateOriginSubtotal: () => calculateOriginSubtotal,
   calculatePriceDetails: () => calculatePriceDetails,
   calculateSubtotal: () => calculateSubtotal,
   calculateTaxFee: () => calculateTaxFee,
@@ -47,7 +46,6 @@ 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 }));
@@ -61,12 +59,10 @@ 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,
@@ -364,16 +360,6 @@ 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";
@@ -799,7 +785,6 @@ function resetItemsSurchargeSideEffects({ service, addons }) {
 0 && (module.exports = {
   calcDiscountListDifference,
   calculateDeposit,
-  calculateOriginSubtotal,
   calculatePriceDetails,
   calculateSubtotal,
   calculateTaxFee,

package/lib/plugins/window.d.ts

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

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

@@ -144,7 +144,6 @@ 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;
@@ -311,7 +310,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;

package/lib/solution/BookingByStep/index.js

@@ -1774,10 +1774,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               currentStartTime: currentStartTime2,
               times
             }) {
+              var _a4;
               const currentStart = (0, import_dayjs.default)(currentStartTime2);
               let earliestBlockStart;
               for (const time of times || []) {
-                for (const event of time.event_list || []) {
+                const blockedTimes = (_a4 = time.event_list) == null ? void 0 : _a4.filter((event) => event.type !== "schedule_event");
+                for (const event of blockedTimes || []) {
                   const eventStart = (0, import_dayjs.default)(event.start_at);
                   const eventEnd = (0, import_dayjs.default)(event.end_at);
                   if (eventStart.isBefore(currentStart) && eventEnd.isAfter(currentStart)) {

package/lib/solution/Checkout/index.js

@@ -222,7 +222,6 @@ 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,
           // 若商品不含税，计算得到的税费，单位（元）
@@ -247,7 +246,6 @@ 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

@@ -22,7 +22,6 @@ 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,8 +56,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      bookingSubject: void 0,
-      orderTotalAmount: 0
+      bookingSubject: void 0
     };
   }
   // =========== 生命周期方法 ===========
@@ -195,9 +194,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       );
     }
   }
-  setOriginTotalAmount(amount) {
-    this.store.orderTotalAmount = amount;
-  }
   // 设置holders
   setHolders(holders) {
     this.store.holders = holders;
@@ -217,7 +213,6 @@ 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"
       },
@@ -325,7 +320,6 @@ 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"
       }) || {
@@ -394,7 +388,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, _f, _g, _h, _i;
+          var _a3, _b, _c, _d, _e;
           if (discount.id && ["good_pass", "discount_card"].includes(discount.type)) {
             const index = editModeDiscountList.findIndex((n) => {
               var _a4;
@@ -403,12 +397,8 @@ 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(((_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()
+                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()
               };
             } else {
               if (discount.type && !discount.tag) {
@@ -416,20 +406,16 @@ 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(((_f = discount == null ? void 0 : discount.metadata) == null ? void 0 : _f.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(((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.product_discount_difference) || 0).toNumber(),
                 isAvailable: true,
-                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,
+                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,
                 isDisabled: true,
                 isSelected: true,
-                product_id: ((_i = discount.discount) == null ? void 0 : _i.product_id) || discount.product_id
+                product_id: ((_e = discount.discount) == null ? void 0 : _e.product_id) || discount.product_id
               });
             }
           }
@@ -546,7 +532,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       }
       await this.core.effects.emit(
         `${this.name}:onLoadDiscountList`,
-        newDiscountList
+        filteredDiscountList
       );
     } catch (error) {
       console.error("[ShopDiscount] 加载准备配置出错:", error);

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

@@ -23,7 +23,6 @@ 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,18 +56,14 @@ var isAllNormalProduct = (items) => {
 };
 var getDiscountAmount = (discount, total, price) => {
   var _a;
-  let discountedPrice = 0;
   if (discount.tag === "good_pass") {
-    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(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);
   }
-  return discountedPrice;
+  return new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(price)).toNumber();
 };
 var getDiscountListAmountTotal = (discount) => {
   return discount.reduce((acc, cur) => {

package/package.json

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

package/dist/model/index.d.ts

@@ -1 +0,0 @@
-export * from './strategy';

package/dist/model/index.js

@@ -1 +0,0 @@
-export * from "./strategy";

package/dist/model/strategy/adapter/index.d.ts

@@ -1,3 +0,0 @@
-export * from './type';
-export { default as WalletPassAdapter } from './walletPass';
-export { WalletPassEvaluator } from './walletPass/evaluator';

package/dist/model/strategy/adapter/index.js

@@ -1,4 +0,0 @@
-export * from "./type";
-export { default as WalletPassAdapter } from "./walletPass";
-export { WalletPassEvaluator } from "./walletPass/evaluator";
-// export * from './walletPass/type';

package/dist/model/strategy/adapter/type.d.ts

@@ -1,28 +0,0 @@
-import { EvaluationResult, RuntimeContext } from '../type';
-export interface BusinessAdapter {
-    /**
-     * 适配器名称
-     */
-    name: string;
-    /**
-     * 适配器版本
-     */
-    version: string;
-    /**
-     * 准备运行时上下文
-     * 将业务数据转换为策略引擎可识别的上下文
-     */
-    prepareContext(businessData: any): RuntimeContext;
-    /**
-     * 转换执行结果
-     * 将策略引擎的通用结果转换为业务层需要的格式
-     */
-    transformResult(result: EvaluationResult, businessData?: any): any;
-    /**
-     * 根据业务数据重新格式化配置
-     */
-    formatConfig(result: EvaluationResult, businessData?: any): {
-        result: EvaluationResult;
-        businessData?: any;
-    };
-}

package/dist/model/strategy/adapter/type.js

@@ -1 +0,0 @@
-export {};

package/dist/model/strategy/adapter/walletPass/evaluator.d.ts

@@ -1,84 +0,0 @@
-import { StrategyConfig } from '../../type';
-import { Voucher, Product, VoucherEvaluationResult, EvaluatorInput } from './type';
-/**
- * Wallet Pass 评估器
- * 用于评估哪些 voucher 可以在当前订单中使用
- */
-export declare class WalletPassEvaluator {
-    private engine;
-    private strategyConfigs;
-    private locale;
-    constructor();
-    setStrategyConfigs(strategyConfigs: StrategyConfig[]): void;
-    getStrategyConfigs(): StrategyConfig[];
-    setLocale(locale: string): void;
-    getText(key: string): string;
-    /**
-     * 搜索券的格式
-     * @param input 输入
-     * @returns 返回搜索券的格式
-     */
-    searchVoucherFormat(input: EvaluatorInput): Voucher[];
-    /**
-     * 评估可用的 vouchers
-     */
-    evaluate(input: EvaluatorInput): VoucherEvaluationResult[];
-    /** 检查代金券/折扣卡是否可用 并返回config */
-    checkVoucherAvailability(input: EvaluatorInput): {
-        isAvailable: boolean;
-        config: {
-            [x: string]: any;
-        };
-    };
-    /**
-     * 获取推荐券
-     * @param input 输入
-     * @returns 返回推荐券列表
-     */
-    getRecommendedVouchers(input: EvaluatorInput): {
-        recommendedAmount: any;
-        recommended: any[];
-        transformList: any[];
-        noApplicableVoucher: Voucher[];
-    };
-    enhanceWithReason(voucher: any): any;
-    /**
-     * 优惠券处理函数
-     * @param applicableVouchers 可用的券列表
-     * @param orderTotalAmount 订单总金额
-     * @param products 订单商品列表
-     * @returns 返回推荐券列表和全部列表，每个券包含 _available_max_amount 和 _unified_available_status
-     */
-    processVouchers(vouchers: Voucher[], orderTotalAmount: number, products: Product[]): {
-        recommended: any[];
-        transformList: any[];
-    };
-    /**
-     * 重新计算优惠券状态（基于已选券的增量计算）
-     * @param allVouchers 所有原始券列表
-     * @param selectedVouchers 已选中的券列表（按选中顺序）
-     * @param orderTotalAmount 订单总金额
-     * @param products 订单商品列表
-     * @returns 返回更新后的所有券列表和已选券的详细抵扣信息
-     */
-    recalculateVouchers(allVouchers: any[], selectedVouchers: any[], orderTotalAmount: number, products: any[]): {
-        allWithUpdatedStatus: any[];
-        selectedWithDetails: any[];
-    };
-    /**
-     * 查找适用于指定 voucher 的策略配置
-     */
-    private findApplicableStrategies;
-    /**
-     * 检查策略中是否包含指定的 voucher ID
-     */
-    private checkVoucherInStrategy;
-    /**
-     * 递归检查条件组中是否包含 voucher ID
-     */
-    private checkVoucherInConditionGroup;
-    /**
-     * 计算适用商品的总金额和数量
-     */
-    private calculateApplicableProducts;
-}