@pisell/pisellos 2.1.54 → 2.1.59

package/dist/solution/ShopDiscount/utils.js

@@ -34,37 +34,22 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
  * @returns 
  */
 export var getDiscountAmount = function getDiscountAmount(discount, total, price) {
-  var discountedPrice = 0;
-
+  var _discount$metadata;
   // 商品券
   if (discount.tag === 'good_pass') {
-    discountedPrice = new Decimal(price).minus(new Decimal(price || 0)).toNumber();
-  } else {
-    var _discount$metadata;
-    // 判断是否是固定金额
-    var isFixedAmount = (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type) === 'fixed_amount';
-
-    // 固定金额 小于0时返回0
-    if (isFixedAmount) {
-      discountedPrice = Math.max(new Decimal(price).minus(new Decimal(discount.par_value || 0)).toNumber(), 0);
-    } else {
-      // 百分比：根据折扣卡金额计算
-      discountedPrice = new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(price)).toNumber();
-    }
+    return new Decimal(price).minus(new Decimal(price || 0)).toNumber();
   }
 
-  /*
-    // 🔥 如果有 maxDeductionAmount 限制，确保折扣金额不超过限制
-    if (discount.config?.maxDeductionAmount) {
-      const actualDiscountAmount = new Decimal(price).minus(discountedPrice).toNumber();
-      if (actualDiscountAmount > discount.config.maxDeductionAmount) {
-        // 折扣金额超过限制，重新计算折扣后价格
-        discountedPrice = new Decimal(price).minus(discount.config.maxDeductionAmount).toNumber();
-      }
-    }
-  */
+  // 判断是否是固定金额
+  var isFixedAmount = (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type) === 'fixed_amount';
+
+  // 固定金额 小于0时返回0
+  if (isFixedAmount) {
+    return Math.max(new Decimal(price).minus(new Decimal(discount.par_value || 0)).toNumber(), 0);
+  }
 
-  return discountedPrice;
+  // 百分比：根据折扣卡金额计算
+  return new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(price)).toNumber();
 };
 export var getDiscountListAmountTotal = function getDiscountListAmountTotal(discount) {
   return discount.reduce(function (acc, cur) {
@@ -457,10 +442,24 @@ export var filterDiscountListByBookingTime = function filterDiscountListByBookin
     return discountList;
   }
   return discountList.filter(function (discount) {
-    var _discount$metadata2, _discount$metadata3, _discount$custom_sche;
-    if (!(discount !== null && discount !== void 0 && (_discount$metadata2 = discount.metadata) !== null && _discount$metadata2 !== void 0 && _discount$metadata2.validity_type) || (discount === null || discount === void 0 || (_discount$metadata3 = discount.metadata) === null || _discount$metadata3 === void 0 ? void 0 : _discount$metadata3.validity_type) === "fixed_validity") {
+    var _discount$metadata2;
+    if ((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.validity_type) === "custom_schedule_validity") {
+      var _discount$custom_sche;
+      return getDateIsInSchedule(bookingTime, ((_discount$custom_sche = discount.custom_schedule_snapshot) === null || _discount$custom_sche === void 0 ? void 0 : _discount$custom_sche.data) || []);
+    }
+    try {
+      var isHasStart = !!discount.start_date && !!discount.start_time;
+      var startDate = dayjs("".concat(discount.start_date, " ").concat(discount.start_time));
+      var bookingTimeDayjs = dayjs(bookingTime);
+
+      // 判断预约时间是否在开始时间之后
+      var isAfterStart = isHasStart ? bookingTimeDayjs.isSameOrAfter(startDate) : true;
+
+      // 判断预约时间是否在过期时间之前（expire_time 为空时为长期有效）
+      var isBeforeExpire = discount.expire_time ? bookingTimeDayjs.isSameOrBefore(dayjs(discount.expire_time)) : true;
+      return isAfterStart && isBeforeExpire;
+    } catch (error) {
       return true;
     }
-    return getDateIsInSchedule(bookingTime, ((_discount$custom_sche = discount.custom_schedule_snapshot) === null || _discount$custom_sche === void 0 ? void 0 : _discount$custom_sche.data) || []);
   });
 };

package/lib/index.d.ts

@@ -6,7 +6,6 @@ export * from './types';
 export * from './modules';
 export * from './plugins';
 export * from './solution';
-export * from './model';
 export { PisellOSCore } from './core';
 import PisellOSCore from './core';
 export default PisellOSCore;

package/lib/index.js

@@ -38,7 +38,6 @@ __reExport(src_exports, require("./types"), module.exports);
 __reExport(src_exports, require("./modules"), module.exports);
 __reExport(src_exports, require("./plugins"), module.exports);
 __reExport(src_exports, require("./solution"), module.exports);
-__reExport(src_exports, require("./model"), module.exports);
 var import_core = require("./core");
 var import_core2 = __toESM(require("./core"));
 var src_default = import_core2.default;
@@ -48,6 +47,5 @@ var src_default = import_core2.default;
   ...require("./types"),
   ...require("./modules"),
   ...require("./plugins"),
-  ...require("./solution"),
-  ...require("./model")
+  ...require("./solution")
 });

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

@@ -75,8 +75,6 @@ export interface CartItem {
     summaryTotal?: number | string;
     /** 商品原价总价，排除原始价格为0的场景 */
     origin_total?: number | string;
-    /** 基于 origin_total 乘以 商品数量的价格 */
-    summaryOriginTotal?: number | string;
     /** 商品数量 */
     num?: number;
     /** 商品图片 */

package/lib/modules/Cart/utils/cartProduct.js

@@ -88,14 +88,6 @@ var formatProductToCartItem = (params) => {
       num,
       discounts
     });
-    const origin_total = getProductTotalPrice({
-      product: cartItem._productInit || cartItem._productOrigin,
-      bundle,
-      options,
-      num,
-      discounts: []
-    });
-    cartItem.summaryOriginTotal = (origin_total || 0) * (num || 1);
     cartItem.image = product == null ? void 0 : product.cover;
     cartItem.like_status = "common";
     cartItem.duration = product == null ? void 0 : product.duration;
@@ -186,7 +178,6 @@ var getProductTotalPrice = (params) => {
       price = (0, import_utils2.getDiscountAmount)({
         tag: currentValue.type,
         par_value: currentValue.discount.percent,
-        config: currentValue.config,
         metadata: {
           discount_card_type: (_a = currentValue == null ? void 0 : currentValue.discount) == null ? void 0 : _a.discount_card_type
         }

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

@@ -25,8 +25,6 @@ interface Limitedrelationproductdata {
     product_ids: number[];
     product_collection_id: number[];
     package_sub_item_usage_rules?: PackageSubItemUsageRules;
-    filter: 0 | 1;
-    exclude_product_ids: number[];
 }
 interface ApplicableProductDetails {
     amount: string;
@@ -98,19 +96,6 @@ export interface Discount {
     isSelected?: boolean;
     isAvailable?: boolean;
     isUsed?: boolean;
-    config?: {
-        isAvailable?: boolean;
-        /** 最大抵扣金额 */
-        maxDeductionAmount?: number;
-        /** 每单最多使用张数 */
-        maxUsagePerOrder?: number;
-        /** 是否抵扣税费与附加费 */
-        deductTaxAndFee?: boolean;
-        /** 适用粒度（多商品共用） */
-        allowCrossProduct?: boolean;
-        /** 可用商品数量上限 */
-        applicableProductLimit?: number;
-    };
     applicableProductIds?: number[];
     applicableProductDetails: ApplicableProductDetails[];
     appliedProductDetails: ApplicableProductDetails[];
@@ -126,6 +111,8 @@ export interface Discount {
         data: any[];
     };
     num?: number;
+    start_date?: string;
+    start_time?: string;
 }
 export interface DiscountState {
     discountList: Discount[];

package/lib/modules/Payment/index.d.ts

@@ -1,5 +1,5 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
-import { RequestPlugin, WindowPlugin } from '../../plugins';
+import { RequestPlugin } from '../../plugins';
 import { BaseModule } from '../BaseModule';
 import { PaymentModuleAPI, PaymentMethod, PaymentOrder, PaymentItem, PaymentItemInput, PaymentUpdateFields, PushOrderParams, CashPayment, EftposPayment, WalletPassPayment, RoundingRule, RoundingInterval, RoundingResult } from './types';
 export * from './types';
@@ -21,7 +21,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     request: RequestPlugin;
     private app;
     private store;
-    window: WindowPlugin;
     private dbManager;
     private logger;
     protected otherParams: any;

package/lib/modules/Payment/index.js

@@ -70,7 +70,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.otherParams = options.otherParams || {};
     this.request = core.getPlugin("request");
     const appPlugin = core.getPlugin("app");
-    this.window = core.getPlugin("window");
     if (!this.request) {
       throw new Error("支付模块需要 request 插件支持");
     }

package/lib/modules/Payment/utils.js

@@ -25,9 +25,6 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var getAvailableMaxAmount = (data) => {
-  if (typeof data._available_max_amount === "number") {
-    return data._available_max_amount;
-  }
   return data.tag !== "point_card" ? data.available_max_amount : data == null ? void 0 : data.recommended_usage_amount;
 };
 var formatWalletPassList2PreparePayments = (list) => {

package/lib/modules/Payment/walletpass.d.ts

@@ -9,7 +9,6 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     private userIdentificationCodes;
     private searchResults;
     private walletParams;
-    private walletInitData;
     constructor(paymentModule: PaymentModule);
     /**
      * 发送事件的辅助方法
@@ -38,14 +37,7 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     initializeWalletDataFromBusinessAsync(businessData: WalletInitBusinessData): Promise<{
         walletRecommendList: WalletRecommendItem[];
         userIdentificationCodes: UserIdentificationCodeItem[];
-        transformList: any[];
-        noApplicableVoucher: any[];
-        products: any[];
     }>;
-    /**
-     * 获取订单基础详情
-     */
-    getOrderBasicDetailAsync(orderId: string): Promise<any>;
     /**
      * 初始化钱包数据
      * 先获取推荐列表，再获取用户识别码列表（顺序执行）
@@ -53,9 +45,6 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     initializeWalletDataAsync(baseParams: WalletDeductionRecommendParams): Promise<{
         walletRecommendList: WalletRecommendItem[];
         userIdentificationCodes: UserIdentificationCodeItem[];
-        transformList: any[];
-        noApplicableVoucher: any[];
-        products: any[];
     }>;
     getWalletPassRecommendListAsync(params: WalletDeductionRecommendParams): Promise<WalletRecommendItem[]>;
     formatWalletPassList2PreparePayments(list: WalletRecommendItem[]): {
@@ -103,18 +92,6 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
      * 清除搜索结果缓存
      */
     clearSearchResults(): void;
-    /**
-     * 获取存储的钱包初始化数据
-     */
-    getStoredWalletInitData(): {
-        transformList: any[];
-        noApplicableVoucher: any[];
-        products: any[];
-    } | null;
-    /**
-     * 清除存储的钱包初始化数据
-     */
-    clearStoredWalletInitData(): void;
     /**
      * 清除所有缓存数据
      */

package/lib/modules/Payment/walletpass.js

@@ -31,7 +31,6 @@ var WalletPassPaymentImpl = class {
     this.userIdentificationCodes = [];
     this.searchResults = [];
     this.walletParams = null;
-    this.walletInitData = null;
   }
   /**
    * 发送事件的辅助方法
@@ -43,9 +42,7 @@ var WalletPassPaymentImpl = class {
       const fullEventName = `${this.paymentModule.name}:${eventName}`;
       this.paymentModule.core.effects.emit(fullEventName, data);
     } catch (error) {
-      this.paymentModule.logError("[WalletPass] 发送事件失败", error, {
-        hook
-      });
+      this.paymentModule.logError("[WalletPass] 发送事件失败", error, { hook });
     }
   }
   /**
@@ -115,10 +112,7 @@ var WalletPassPaymentImpl = class {
     if (Number(((_a = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _a.totalAmount) || 0) < 0 || Number(((_b = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _b.subTotal) || 0) < 0) {
       return {
         walletRecommendList: [],
-        userIdentificationCodes: [],
-        transformList: [],
-        noApplicableVoucher: [],
-        products: []
+        userIdentificationCodes: []
       };
     }
     this.emitEvent(import_types.WalletPassHooks.OnWalletInitializationStarted, {
@@ -159,28 +153,11 @@ var WalletPassPaymentImpl = class {
         endTime,
         duration
       });
-      this.paymentModule.logError(
-        `[WalletPass] 从业务数据初始化钱包数据失败`,
-        error,
-        {
-          duration: `${duration}ms`,
-          customer_id: businessData.customer_id,
-          totalAmount: (_h = businessData.amountInfo) == null ? void 0 : _h.totalAmount
-        }
-      );
-      throw error;
-    }
-  }
-  /**
-   * 获取订单基础详情
-   */
-  async getOrderBasicDetailAsync(orderId) {
-    try {
-      const response = await this.paymentModule.request.get(
-        `/order/order/${orderId}/basic-detail`
-      );
-      return (response == null ? void 0 : response.data) || {};
-    } catch (error) {
+      this.paymentModule.logError(`[WalletPass] 从业务数据初始化钱包数据失败`, error, {
+        duration: `${duration}ms`,
+        customer_id: businessData.customer_id,
+        totalAmount: (_h = businessData.amountInfo) == null ? void 0 : _h.totalAmount
+      });
       throw error;
     }
   }
@@ -189,49 +166,19 @@ var WalletPassPaymentImpl = class {
    * 先获取推荐列表，再获取用户识别码列表（顺序执行）
    */
   async initializeWalletDataAsync(baseParams) {
-    var _a, _b;
     try {
+      const walletRecommendList = await this.getWalletPassRecommendListAsync(baseParams);
       const identificationParams = {
         ...baseParams,
         available: 2,
-        prepare_payments: [],
+        prepare_payments: this.formatWalletPassList2PreparePayments(walletRecommendList),
         other_exact_codes: [],
         filter_prepare_wallet_pass: 1
       };
-      const [allList, orderBasicDetail] = await Promise.all([
-        this.getUserIdentificationCodeListAsync(identificationParams),
-        baseParams.payment_order_id ? this.getOrderBasicDetailAsync(baseParams.payment_order_id) : Promise.resolve(null)
-      ]);
-      const walletPassEvaluator = (_b = (_a = this.paymentModule.window) == null ? void 0 : _a.getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
-      if (!walletPassEvaluator) {
-        return {
-          walletRecommendList: [],
-          userIdentificationCodes: [],
-          transformList: [],
-          noApplicableVoucher: [],
-          products: []
-        };
-      }
-      const products = (orderBasicDetail == null ? void 0 : orderBasicDetail.detail) || baseParams.products;
-      const res = walletPassEvaluator == null ? void 0 : walletPassEvaluator.getRecommendedVouchers({
-        orderTotalAmount: baseParams.order_wait_pay_amount,
-        products,
-        vouchers: allList
-      });
-      const { recommended, transformList, noApplicableVoucher, recommendedAmount } = res;
-      console.log(res, "resres12");
-      this.walletRecommendList = recommended;
-      this.walletInitData = {
-        transformList,
-        noApplicableVoucher,
-        products: products || []
-      };
+      const userIdentificationCodes = await this.getUserIdentificationCodeListAsync(identificationParams);
       return {
-        walletRecommendList: recommended,
-        userIdentificationCodes: allList,
-        transformList,
-        noApplicableVoucher,
-        products: products || []
+        walletRecommendList,
+        userIdentificationCodes
       };
     } catch (error) {
       this.paymentModule.logError("[WalletPass] 初始化钱包数据失败", error, {
@@ -314,14 +261,10 @@ var WalletPassPaymentImpl = class {
       });
       return this.userIdentificationCodes;
     } catch (error) {
-      this.paymentModule.logError(
-        "[WalletPass] 获取用户识别码列表失败",
-        error,
-        {
-          customer_id: params.customer_id,
-          available: params.available
-        }
-      );
+      this.paymentModule.logError("[WalletPass] 获取用户识别码列表失败", error, {
+        customer_id: params.customer_id,
+        available: params.available
+      });
       return [];
     }
   }
@@ -519,19 +462,6 @@ var WalletPassPaymentImpl = class {
     this.searchResults = [];
     this.paymentModule.logInfo("[WalletPass] 搜索结果缓存已清除");
   }
-  /**
-   * 获取存储的钱包初始化数据
-   */
-  getStoredWalletInitData() {
-    return this.walletInitData;
-  }
-  /**
-   * 清除存储的钱包初始化数据
-   */
-  clearStoredWalletInitData() {
-    this.walletInitData = null;
-    this.paymentModule.logInfo("[WalletPass] 钱包初始化数据已清除");
-  }
   /**
    * 清除所有缓存数据
    */
@@ -540,18 +470,11 @@ var WalletPassPaymentImpl = class {
     this.userIdentificationCodes = [];
     this.searchResults = [];
     this.walletParams = null;
-    this.walletInitData = null;
     this.emitEvent(import_types.WalletPassHooks.OnWalletCacheCleared, {
       clearedTypes: ["all"]
     });
     this.paymentModule.logInfo("[WalletPass] 所有缓存数据已清除", {
-      cleared_types: [
-        "walletRecommendList",
-        "userIdentificationCodes",
-        "searchResults",
-        "walletParams",
-        "walletInitData"
-      ]
+      cleared_types: ["walletRecommendList", "userIdentificationCodes", "searchResults", "walletParams"]
     });
   }
 };

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

@@ -1,41 +1,38 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { Rules, RulesModuleAPI, DiscountResult } from './types';
-import { Discount } from '../Discount/types';
+import { Discount } from "../Discount/types";
 import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
-import { WindowPlugin } from '../../plugins';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
-    window: WindowPlugin;
     private hooks;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setRulesList(rulesList: Rules[]): Promise<void>;
     getRulesList(): Rules[];
-    getWalletPassEvaluator(): import("../..").WalletPassEvaluator | undefined;
     private checkHolderMatch;
-    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, orderTotalAmount, }: {
+    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, isFormSubject, }: {
         oldDiscountList: Discount[];
         newDiscountList: Discount[];
         productList: any[];
         holders: {
             form_record_id: number;
         }[];
-        orderTotalAmount: number;
+        isFormSubject: boolean;
     }): {
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
     };
-    calcDiscount({ discountList, productList, holders, orderTotalAmount }: {
+    calcDiscount({ discountList, productList, holders, isFormSubject, }: {
         discountList: Discount[];
         productList: any[];
         holders: {
             form_record_id: number;
         }[];
-        orderTotalAmount: number;
+        isFormSubject: boolean;
     }, options?: {
         isSelected?: boolean;
         discountId?: number;