@pisell/pisellos 2.1.54 → 2.1.59

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

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

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

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

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

@@ -8,12 +8,6 @@ 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,7 +30,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   calculateDeposit: () => calculateDeposit,
-  calculateOriginSubtotal: () => calculateOriginSubtotal,
   calculatePriceDetails: () => calculatePriceDetails,
   calculateSubtotal: () => calculateSubtotal,
   calculateTaxFee: () => calculateTaxFee
@@ -39,15 +38,12 @@ 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,
@@ -64,16 +60,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";
@@ -115,7 +101,6 @@ 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,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;
@@ -343,7 +342,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/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

@@ -21,10 +21,13 @@ 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;
+    setBookingSubject(bookingSubject: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    }): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];

package/lib/solution/ShopDiscount/index.js

@@ -55,7 +55,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      orderTotalAmount: 0
+      bookingSubject: void 0
     };
   }
   // =========== 生命周期方法 ===========
@@ -193,15 +193,16 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       );
     }
   }
-  setOriginTotalAmount(amount) {
-    this.store.orderTotalAmount = amount;
-  }
   // 设置holders
   setHolders(holders) {
     this.store.holders = holders;
   }
+  setBookingSubject(bookingSubject) {
+    this.store.bookingSubject = bookingSubject;
+  }
   // 计算优惠券
   calcDiscount(productList, options) {
+    var _a;
     this.store.productList = productList;
     const rulesModule = this.core.getModule(`${this.name}_rules`);
     if (!rulesModule) {
@@ -212,7 +213,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
     ) || { productList, discountList: this.getDiscountList() };
@@ -259,7 +260,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   }
   // 扫码输入code
   async scanCode(code, customerId) {
-    var _a, _b;
+    var _a, _b, _c;
     try {
       const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, customerId)) || [];
       const rulesModule = this.store.rules;
@@ -303,7 +304,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,
         productList: this.store.productList || [],
@@ -313,7 +314,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         this.setDiscountList(newDiscountList || []);
         this.store.originalDiscountList = newDiscountList || [];
         this.setProductList(newProductList || []);
-        if (this.isWalkIn() && resultDiscountList.length && ((_b = this.options.otherParams) == null ? void 0 : _b.platform) === "shop") {
+        if (this.isWalkIn() && resultDiscountList.length && ((_c = this.options.otherParams) == null ? void 0 : _c.platform) === "shop") {
           await this.getCustomerWallet(
             resultDiscountList[0].customer_id
           );

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

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

package/lib/solution/ShopDiscount/utils.js

@@ -54,18 +54,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.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) => {
@@ -294,11 +290,20 @@ var filterDiscountListByBookingTime = (discountList, bookingTime) => {
     return discountList;
   }
   return discountList.filter((discount) => {
-    var _a, _b, _c;
-    if (!((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.validity_type) || ((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.validity_type) === "fixed_validity") {
+    var _a, _b;
+    if (((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.validity_type) === "custom_schedule_validity") {
+      return getDateIsInSchedule(bookingTime, ((_b = discount.custom_schedule_snapshot) == null ? void 0 : _b.data) || []);
+    }
+    try {
+      const isHasStart = !!discount.start_date && !!discount.start_time;
+      const startDate = (0, import_dayjs.default)(`${discount.start_date} ${discount.start_time}`);
+      const bookingTimeDayjs = (0, import_dayjs.default)(bookingTime);
+      const isAfterStart = isHasStart ? bookingTimeDayjs.isSameOrAfter(startDate) : true;
+      const isBeforeExpire = discount.expire_time ? bookingTimeDayjs.isSameOrBefore((0, import_dayjs.default)(discount.expire_time)) : true;
+      return isAfterStart && isBeforeExpire;
+    } catch (error) {
       return true;
     }
-    return getDateIsInSchedule(bookingTime, ((_c = discount.custom_schedule_snapshot) == null ? void 0 : _c.data) || []);
   });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.1.54",
+  "version": "2.1.59",
   "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;
-}