@pisell/pisellos 2.2.244 → 2.2.245

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

@@ -25,9 +25,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     private dbManager;
     private logger;
     private voucherUpdateLockByOrderUuid;
-    private payMethodMemoryCache;
-    private payMethodListInFlight;
-    private isRefreshingPaymentMethods;
     protected otherParams: any;
     cash: CashPayment;
     eftpos: EftposPayment;
@@ -36,6 +33,13 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     private runVoucherUpdateLocked;
     private normalizeVoucherPaymentItems;
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 更新父级解决方案透传的运行态参数，主要用于日志父模块等上下文。
+     *
+     * @example
+     * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
+     */
+    updateOtherParams(params: Record<string, any>): void;
     /**
      * 记录信息日志
      */
@@ -57,23 +61,14 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      *
      */
     private registerNetworkHandlers;
-    private filterPayMethods;
     /**
      * 获取支付方式列表
      */
     getPayMethodListAsync(): Promise<PaymentMethod[]>;
-    private loadPayMethodListAsync;
-    /**
-     * 后台刷新支付方式列表
-     */
-    private refreshPaymentMethodsInBackground;
-    /**
-     * 检查支付方式列表是否有变化
-     */
-    private hasPaymentMethodsChanged;
     /**
      * 获取订单列表
      */
+    /** @deprecated */
     getOrderListAsync(): Promise<PaymentOrder[]>;
     /**
      * 根据订单UUID获取支付订单（新方法）
@@ -173,10 +168,12 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     /**
      * 确保支付模块所需的数据库表已创建
      */
+    /** @deprecated */
     private ensurePaymentTables;
     /**
      * 获取部分支付的订单
      */
+    /** @deprecated */
     getPartiallyPaidOrdersAsync(): Promise<PaymentOrder[]>;
     /**
      * 智能金额舍入

package/lib/modules/Payment/index.js

@@ -76,9 +76,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.defaultVersion = "1.0.0";
     // LoggerManager 实例
     this.voucherUpdateLockByOrderUuid = /* @__PURE__ */ new Map();
-    this.payMethodMemoryCache = null;
-    this.payMethodListInFlight = null;
-    this.isRefreshingPaymentMethods = false;
     this.otherParams = {};
     this.cash = new import_cash.CashPaymentImpl(this);
     this.eftpos = new import_eftpos.EftposPaymentImpl(this);
@@ -126,11 +123,19 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.app = appPlugin.getApp();
     this.dbManager = this.app.dbManager;
     this.logger = this.app.logger;
-    await this.ensurePaymentTables();
     this.registerNetworkHandlers();
     console.log("[PaymentModule] 初始化完成");
     this.logInfo("PaymentModule initialized successfully");
   }
+  /**
+   * 更新父级解决方案透传的运行态参数，主要用于日志父模块等上下文。
+   *
+   * @example
+   * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
+   */
+  updateOtherParams(params) {
+    this.otherParams = params || {};
+  }
   /**
    * 记录信息日志
    */
@@ -213,66 +218,18 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       }
     });
   }
-  async filterPayMethods(payMethods) {
-    payMethods = payMethods.filter((method) => method.status === 1 && method.disable === 0);
-    const walletPassMethod = payMethods.find((method) => method.code === "WALLET_PASS");
-    if (walletPassMethod) {
-      payMethods.forEach((method) => {
-        if (method.code === "PRODUCTVOUCHER" || method.code === "GIFTCARD" || method.code === "POINTCARD") {
-          method.channel_application = walletPassMethod.channel_application;
-        }
-      });
-    } else {
-      payMethods = payMethods.filter((method) => method.code !== "PRODUCTVOUCHER" && method.code !== "GIFTCARD" && method.code !== "POINTCARD");
-    }
-    return payMethods;
-  }
   /**
    * 获取支付方式列表
    */
   async getPayMethodListAsync() {
-    var _a;
     this.logInfo("Starting getPayMethodListAsync");
-    if ((_a = this.payMethodMemoryCache) == null ? void 0 : _a.length) {
-      return this.payMethodMemoryCache;
-    }
-    if (this.payMethodListInFlight) {
-      return this.payMethodListInFlight;
-    }
-    this.payMethodListInFlight = this.loadPayMethodListAsync().finally(() => {
-      this.payMethodListInFlight = null;
-    });
-    return this.payMethodListInFlight;
-  }
-  async loadPayMethodListAsync() {
     try {
-      let cachedMethods = [];
-      try {
-        cachedMethods = await this.dbManager.getAll("pay_method");
-      } catch (dbError) {
-        console.warn("[PaymentModule] pay_method 表不存在，将从服务器获取数据");
-      }
-      const hasCache = cachedMethods.length > 0;
-      if (hasCache) {
-        this.payMethodMemoryCache = cachedMethods;
-        this.refreshPaymentMethodsInBackground(cachedMethods);
-        return cachedMethods;
-      }
-      const response = await this.request.get("/pay/custom-payment/all");
-      response.data = await this.filterPayMethods(response.data);
-      const payMethods = response.data || [];
-      this.payMethodMemoryCache = payMethods;
-      try {
-        for (const method of payMethods) {
-          await this.dbManager.update("pay_method", method);
-        }
-      } catch (dbError) {
-        console.warn("[PaymentModule] 无法缓存支付方式，pay_method 表不存在");
-      }
-      await this.core.effects.emit(
-        `${this.name}:onPaymentMethodsLoaded`,
-        payMethods
-      );
+      const response = await this.request.get("/pay/custom-payment/all", {
+        filterPaymentMethods: true
+      }, {
+        osServer: true
+      });
+      const payMethods = (response == null ? void 0 : response.data) || response || [];
       this.logInfo("getPayMethodListAsync completed successfully", {
         payMethods
       });
@@ -283,101 +240,10 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       return [];
     }
   }
-  /**
-   * 后台刷新支付方式列表
-   */
-  async refreshPaymentMethodsInBackground(cachedMethods) {
-    if (this.isRefreshingPaymentMethods)
-      return;
-    this.isRefreshingPaymentMethods = true;
-    this.logInfo("Starting refreshPaymentMethodsInBackground", {
-      cachedMethodsCount: cachedMethods.length
-    });
-    try {
-      console.log("[PaymentModule] 后台刷新支付方式列表...");
-      const response = await this.request.get("/pay/custom-payment/all");
-      response.data = await this.filterPayMethods(response.data);
-      const newPayMethods = response.data || [];
-      this.payMethodMemoryCache = newPayMethods;
-      const hasChanges = this.hasPaymentMethodsChanged(
-        cachedMethods,
-        newPayMethods
-      );
-      if (hasChanges) {
-        console.log("[PaymentModule] 支付方式列表已更新");
-        this.logInfo("Payment methods updated in background", {
-          oldCount: cachedMethods.length,
-          newCount: newPayMethods.length
-        });
-        try {
-          for (const method of cachedMethods) {
-            await this.dbManager.delete("pay_method", method.id);
-          }
-          for (const method of newPayMethods) {
-            await this.dbManager.update("pay_method", method);
-          }
-        } catch (dbError) {
-          console.warn("[PaymentModule] 无法更新支付方式缓存", dbError);
-        }
-        const eventData = {
-          oldMethods: cachedMethods,
-          newMethods: newPayMethods
-        };
-        await this.core.effects.emit(
-          `${this.name}:onPaymentMethodsChanged`,
-          eventData
-        );
-      } else {
-        console.log("[PaymentModule] 支付方式列表无变化");
-      }
-    } catch (error) {
-      console.error("[PaymentModule] 后台刷新支付方式失败", error);
-    } finally {
-      this.isRefreshingPaymentMethods = false;
-    }
-  }
-  /**
-   * 检查支付方式列表是否有变化
-   */
-  hasPaymentMethodsChanged(oldMethods, newMethods) {
-    if (oldMethods.length !== newMethods.length) {
-      return true;
-    }
-    const oldMethodsMap = new Map(
-      oldMethods.map((method) => [method.id, method])
-    );
-    for (const newMethod of newMethods) {
-      const oldMethod = oldMethodsMap.get(newMethod.id);
-      if (!oldMethod) {
-        return true;
-      }
-      if (oldMethod.code !== newMethod.code || oldMethod.name !== newMethod.name || oldMethod.type !== newMethod.type || oldMethod.description !== newMethod.description || oldMethod.status !== newMethod.status || oldMethod.disable !== newMethod.disable || oldMethod.is_surcharge !== newMethod.is_surcharge || oldMethod.fixed !== newMethod.fixed || oldMethod.percentage !== newMethod.percentage || oldMethod.enabled !== newMethod.enabled || JSON.stringify(oldMethod.channel_application || []) !== JSON.stringify(newMethod.channel_application || []) || JSON.stringify(oldMethod.companies || []) !== JSON.stringify(newMethod.companies || []) || JSON.stringify(oldMethod.metadata || {}) !== JSON.stringify(newMethod.metadata || {})) {
-        console.log(`[PaymentModule] 支付方式 ${newMethod.id} (${newMethod.code}) 发生变化:`, {
-          id: newMethod.id,
-          changes: {
-            code: oldMethod.code !== newMethod.code ? { old: oldMethod.code, new: newMethod.code } : void 0,
-            name: oldMethod.name !== newMethod.name ? { old: oldMethod.name, new: newMethod.name } : void 0,
-            type: oldMethod.type !== newMethod.type ? { old: oldMethod.type, new: newMethod.type } : void 0,
-            description: oldMethod.description !== newMethod.description ? { old: oldMethod.description, new: newMethod.description } : void 0,
-            status: oldMethod.status !== newMethod.status ? { old: oldMethod.status, new: newMethod.status } : void 0,
-            disable: oldMethod.disable !== newMethod.disable ? { old: oldMethod.disable, new: newMethod.disable } : void 0,
-            is_surcharge: oldMethod.is_surcharge !== newMethod.is_surcharge ? { old: oldMethod.is_surcharge, new: newMethod.is_surcharge } : void 0,
-            fixed: oldMethod.fixed !== newMethod.fixed ? { old: oldMethod.fixed, new: newMethod.fixed } : void 0,
-            percentage: oldMethod.percentage !== newMethod.percentage ? { old: oldMethod.percentage, new: newMethod.percentage } : void 0,
-            enabled: oldMethod.enabled !== newMethod.enabled ? { old: oldMethod.enabled, new: newMethod.enabled } : void 0,
-            channel_application: JSON.stringify(oldMethod.channel_application || []) !== JSON.stringify(newMethod.channel_application || []) ? { old: oldMethod.channel_application, new: newMethod.channel_application } : void 0,
-            companies: JSON.stringify(oldMethod.companies || []) !== JSON.stringify(newMethod.companies || []) ? { old: oldMethod.companies, new: newMethod.companies } : void 0,
-            metadata: JSON.stringify(oldMethod.metadata || {}) !== JSON.stringify(newMethod.metadata || {}) ? { old: oldMethod.metadata, new: newMethod.metadata } : void 0
-          }
-        });
-        return true;
-      }
-    }
-    return false;
-  }
   /**
    * 获取订单列表
    */
+  /** @deprecated */
   async getOrderListAsync() {
     try {
       return await this.dbManager.getAll("order");
@@ -1135,6 +1001,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   /**
    * 确保支付模块所需的数据库表已创建
    */
+  /** @deprecated */
   async ensurePaymentTables() {
     try {
       await this.dbManager.getAll("pay_method");
@@ -1156,6 +1023,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   /**
    * 获取部分支付的订单
    */
+  /** @deprecated */
   async getPartiallyPaidOrdersAsync() {
     try {
       const allOrders = await this.dbManager.getAll("order");

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

@@ -135,6 +135,8 @@ export interface PaymentItem {
     origin_amount?: string;
     /** 订单支付类型 */
     order_payment_type?: 'normal' | 'deposit';
+    /** 支付时间 (格式: YYYY-MM-DD HH:mm:ss) */
+    payment_time?: string;
     /** 本支付项是否已成功同步到后端 */
     isSynced?: boolean;
     /** 最近一次同步失败信息（存在则代表同步失败过） */

package/lib/modules/Payment/utils.js

@@ -31,7 +31,7 @@ var getAvailableMaxAmount = (data) => {
   return data.tag !== "point_card" ? data.available_max_amount : data == null ? void 0 : data.recommended_usage_amount;
 };
 var formatWalletPassList2PreparePayments = (list) => {
-  return (list || []).map((item) => {
+  const formatted = (list || []).map((item) => {
     return {
       voucher_id: item.id || 0,
       amount: Number(item.edit_current_amount || getAvailableMaxAmount(item)) || 0,
@@ -40,6 +40,7 @@ var formatWalletPassList2PreparePayments = (list) => {
       wallet_pass_use_value: item.wallet_pass_use_value || void 0
     };
   });
+  return formatted;
 };
 var sortUserIdentificationCodeList = (list) => {
   if (!Array.isArray(list) || list.length === 0) {

package/lib/modules/Payment/walletpass.js

@@ -264,6 +264,9 @@ var WalletPassPaymentImpl = class {
         sale_channel: params.sale_channel,
         payment_order_id: (_a = this.walletParams) == null ? void 0 : _a.payment_order_id
       });
+      if (typeof params.payment_order_id === "string" && params.payment_order_id.startsWith("LOCAL_")) {
+        params.payment_order_id = void 0;
+      }
       const response = await this.paymentModule.request.post(
         "/machinecode/prepare/deduction/recommend",
         params
@@ -296,18 +299,25 @@ var WalletPassPaymentImpl = class {
     return (0, import_utils.formatWalletPassList2PreparePayments)(list);
   }
   async getUserIdentificationCodeListAsync(params) {
-    var _a, _b;
+    var _a, _b, _c;
     try {
       const newParams = {
         ...this.walletParams,
         ...params
       };
+      if (!((_a = newParams.products) == null ? void 0 : _a.length)) {
+        this.paymentModule.logInfo("[WalletPass] 商品列表为空，跳过获取用户识别码列表");
+        return [];
+      }
+      if (typeof newParams.payment_order_id === "string" && newParams.payment_order_id.startsWith("LOCAL_")) {
+        newParams.payment_order_id = void 0;
+      }
       this.paymentModule.logInfo("[WalletPass] 开始获取用户识别码列表", {
         customer_id: newParams.customer_id,
         available: newParams.available,
-        prepare_payments_count: ((_a = newParams.prepare_payments) == null ? void 0 : _a.length) || 0,
+        prepare_payments_count: ((_b = newParams.prepare_payments) == null ? void 0 : _b.length) || 0,
         filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
-        payment_order_id: (_b = this.walletParams) == null ? void 0 : _b.payment_order_id
+        payment_order_id: (_c = this.walletParams) == null ? void 0 : _c.payment_order_id
       });
       const response = await this.paymentModule.request.post(
         "/machinecode/prepare/deduction",
@@ -404,6 +414,9 @@ var WalletPassPaymentImpl = class {
         multiple: searchParams.multiple,
         payment_order_id: baseWalletParams == null ? void 0 : baseWalletParams.payment_order_id
       });
+      if (typeof searchParams.payment_order_id === "string" && searchParams.payment_order_id.startsWith("LOCAL_")) {
+        searchParams.payment_order_id = void 0;
+      }
       let response;
       if (!searchParams.products || ((_a = searchParams.products || []) == null ? void 0 : _a.length) === 0) {
         response = {

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

@@ -1,5 +1,6 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
+import { ProductListLoadProductsParams } from './types';
 import { ProductData } from '../Product/types';
 export * from './types';
 export declare class ProductList extends BaseModule implements Module {
@@ -10,19 +11,22 @@ export declare class ProductList extends BaseModule implements Module {
     private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
+    /**
+     * 更新运行态参数，供父级解决方案 setOtherParams 后同步查询上下文。
+     *
+     * @example
+     * productList.updateOtherParams({ channel: 'pos' });
+     */
+    updateOtherParams(params: Record<string, any>): void;
     storeChange(path?: string, value?: any): Promise<void>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, }: {
-        category_ids?: number[];
-        product_ids?: number[];
-        collection?: number | string[];
-        schedule_date?: string;
-        cacheId?: string;
-        customer_id?: number;
-        menu_list_ids?: number[];
-        schedule_datetime?: string;
-        with_count?: string[];
-        with_schedule?: number;
-    }, options?: {
+    /**
+     * 获取加时商品列表。
+     *
+     * @example
+     * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
+     */
+    getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<any>;
+    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, }?: ProductListLoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
     }): Promise<any>;

package/lib/modules/ProductList/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/modules/ProductList/index.ts
@@ -25,6 +35,7 @@ __export(ProductList_exports, {
 module.exports = __toCommonJS(ProductList_exports);
 var import_BaseModule = require("../BaseModule");
 var import_lodash_es = require("lodash-es");
+var import_dayjs = __toESM(require("dayjs"));
 __reExport(ProductList_exports, require("./types"), module.exports);
 var ProductList = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -47,8 +58,31 @@ var ProductList = class extends import_BaseModule.BaseModule {
     }
     this.request = core.getPlugin("request");
   }
+  /**
+   * 更新运行态参数，供父级解决方案 setOtherParams 后同步查询上下文。
+   *
+   * @example
+   * productList.updateOtherParams({ channel: 'pos' });
+   */
+  updateOtherParams(params) {
+    this.otherParams = params || {};
+  }
   async storeChange(path, value) {
   }
+  /**
+   * 获取加时商品列表。
+   *
+   * @example
+   * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
+   */
+  async getAddTimeProducts(params = {}) {
+    return this.loadProducts({
+      schedule_date: (0, import_dayjs.default)().format("YYYY-MM-DD"),
+      status: "published",
+      ...params,
+      extension_type: ["product_add_time"]
+    });
+  }
   async loadProducts({
     category_ids = [],
     product_ids = [],
@@ -59,8 +93,10 @@ var ProductList = class extends import_BaseModule.BaseModule {
     schedule_datetime,
     schedule_date,
     cacheId,
-    with_schedule
-  }, options) {
+    with_schedule,
+    extension_type,
+    status = "published"
+  } = {}, options) {
     var _a, _b;
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
@@ -83,7 +119,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
           "event_item"
         ],
         with: ["category", "collection", "resourceRelation"],
-        status: "published",
+        status,
         num: 500,
         skip: 1,
         customer_id,
@@ -98,7 +134,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
         application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
         is_eject: 1,
         with_schedule,
-        schedule_datetime
+        schedule_datetime,
+        extension_type
       },
       { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId, customToast: () => {
       } }

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

@@ -1,4 +1,18 @@
 import { ProductData } from '../Product/types';
+export interface ProductListLoadProductsParams {
+    category_ids?: number[];
+    product_ids?: number[];
+    collection?: number | string[];
+    schedule_date?: string;
+    cacheId?: string;
+    customer_id?: number;
+    menu_list_ids?: number[];
+    schedule_datetime?: string;
+    with_count?: string[];
+    with_schedule?: number;
+    extension_type?: string[];
+    status?: string;
+}
 export interface ProductListData {
     list: ProductData[];
     selectProducts: ProductData[];

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

@@ -47,7 +47,6 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Map<string, string | null>;
     setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
-    private filterQuotationsByCustomer;
     private isQuotationVisibleForCustomer;
     private hasValidCustomerId;
     private isQuotationActiveAt;

package/lib/modules/Quotation/index.js

@@ -43,20 +43,15 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     const query = {};
     if (params == null ? void 0 : params.channel)
       query.channel = params.channel;
-    if (params == null ? void 0 : params.customer_id)
-      query.customer_id = String(params.customer_id);
     if ((params == null ? void 0 : params.channel) === "online_store") {
       query.channel = "online-store";
     }
     const res = await this.request.get(
       "/quotation/available",
       query,
-      { useCache: false }
-    );
-    const list = this.filterQuotationsByCustomer(
-      ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [],
-      params == null ? void 0 : params.customer_id
+      { useCache: false, osServer: true }
     );
+    const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
     list.sort((a, b) => a.sort - b.sort);
     this.store.list = list;
   }
@@ -74,9 +69,11 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
   getPriceForProduct(params) {
     const { productId, variantId, datetime, customer_id } = params;
     for (const quotation of this.store.list) {
-      if (!this.isQuotationVisibleForCustomer(quotation, customer_id))
+      const visible = this.isQuotationVisibleForCustomer(quotation, customer_id);
+      if (!visible)
         continue;
-      if (!this.isQuotationActiveAt(quotation, datetime))
+      const active = this.isQuotationActiveAt(quotation, datetime);
+      if (!active)
         continue;
       const match = this.findProductData(quotation.product_data, productId, variantId);
       if (!match)
@@ -128,9 +125,6 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
   setScheduleResolver(resolver) {
     this.scheduleResolver = resolver;
   }
-  filterQuotationsByCustomer(list, customerId) {
-    return list.filter((quotation) => this.isQuotationVisibleForCustomer(quotation, customerId));
-  }
   isQuotationVisibleForCustomer(quotation, customerId) {
     const customers = quotation.customer || [];
     if (customers.length === 0)
@@ -148,18 +142,27 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     var _a;
     if (!((_a = quotation.schedule) == null ? void 0 : _a.length))
       return false;
-    const scheduleItems = quotation.schedule.map((s) => {
+    const scheduleItems = [];
+    quotation.schedule.forEach((s) => {
       var _a2;
       const full = (_a2 = this.scheduleResolver) == null ? void 0 : _a2.call(this, s.id);
-      if (full)
-        return full;
-      return {
+      if (full) {
+        scheduleItems.push(full);
+        return;
+      }
+      if (this.scheduleResolver) {
+        return;
+      }
+      const fallbackSchedule = {
         ...s,
         repeat_type: s.repeat_type || "none",
         repeat_rule: s.repeat_rule || null,
         time_slot: s.time_slot || []
       };
+      scheduleItems.push(fallbackSchedule);
     });
+    if (!scheduleItems.length)
+      return false;
     return (0, import_getDateIsInSchedule.getDateIsInSchedule)(datetime, scheduleItems);
   }
   findProductData(productData, productId, variantId) {

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

@@ -32,6 +32,10 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         unavailableReason?: UnavailableReason;
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
+    /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
+    excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
+    /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
+    resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];