@pisell/pisellos 2.2.8 → 2.2.10

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

@@ -22,6 +22,9 @@ export interface RulesModuleAPI {
     calcDiscount: (params: {
         discountList: any[];
         productList: any[];
+        holders: {
+            form_record_id: number;
+        }[];
     }) => DiscountResult;
 }
 type ProductDetail = {
@@ -40,6 +43,8 @@ type ProductDetail = {
     num?: number;
     quantity: number;
     vouchersApplicable?: boolean;
+    holder_id?: number;
+    startDate?: any;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;
@@ -50,8 +55,10 @@ export interface RulesParamsHooks {
         origin_total?: number;
         price?: string | number;
         variant?: any[];
-        original_price?: number;
+        original_price?: number | string;
         quantity?: number;
+        bundle?: any[];
+        main_product_selling_price?: string | number;
     }) => Record<string, any>;
 }
 export {};

package/lib/solution/BookingByStep/index.js

@@ -185,13 +185,19 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     collection = [],
     schedule_date
   }) {
-    return this.store.products.loadProducts({
+    const res = await this.store.products.loadProducts({
       category_ids,
       product_ids,
       collection,
       schedule_date,
       cacheId: this.cacheId
     });
+    this.getAvailableDate({
+      startDate: schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD"),
+      endDate: schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD"),
+      products: [...res]
+    });
+    return res;
   }
   /**
    * 通过 schedule 来读取商品，适用于 session 类商品
@@ -228,11 +234,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const allProductIds = [...newProductIds, ...otherProductsIds].filter(
       (n, index, self) => self.indexOf(n) === index
     );
-    return await this.loadProducts({
+    const res = await this.loadProducts({
       product_ids: allProductIds,
       category_ids,
       schedule_date: date
     });
+    return res;
   }
   /**
    * 更新完商品数据、切换日期、或者在较后的流程里登录了，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
@@ -599,6 +606,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       quantity = 1
     } = product || {};
     const productData = { ...origin, product_variant_id };
+    debugger;
+    if ((0, import_products.isSessionProduct)(productData)) {
+      if (!date || !date.startTime || !date.endTime) {
+        return { success: false, errorCode: "date_or_time_required" };
+      }
+    }
     const currentCartItems = this.store.cart.getItems();
     const stockCheckResult = (0, import_stock.checkProductStock)({
       productData,
@@ -1606,6 +1619,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     });
+    this.core.effects.emit(
+      `${this.store.cart.name}:onUpdateBookingDate`,
+      {}
+    );
   }
   getScheduleDataByIds(scheduleIds) {
     const targetSchedules = this.store.schedule.getScheduleListByIds(scheduleIds);

package/lib/solution/BookingByStep/utils/products.d.ts

@@ -9,3 +9,9 @@ export declare const getAvailableProductResources: (products: ProductData[]) =>
     rules: any[];
     resourcesMap: Record<number, ProductResourceItem>;
 };
+/**
+ * 判断商品是否是 session 商品
+ * @param product 商品数据
+ * @returns 是否是 session 商品
+ */
+export declare const isSessionProduct: (product: ProductData) => boolean;

package/lib/solution/BookingByStep/utils/products.js

@@ -19,7 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/BookingByStep/utils/products.ts
 var products_exports = {};
 __export(products_exports, {
-  getAvailableProductResources: () => getAvailableProductResources
+  getAvailableProductResources: () => getAvailableProductResources,
+  isSessionProduct: () => isSessionProduct
 });
 module.exports = __toCommonJS(products_exports);
 var getAvailableProductResources = (products) => {
@@ -57,7 +58,12 @@ var getAvailableProductResources = (products) => {
   });
   return { resourceIds: [...new Set(resourceIds)], rules, resourcesMap };
 };
+var isSessionProduct = (product) => {
+  var _a;
+  return (((_a = product == null ? void 0 : product["schedule.ids"]) == null ? void 0 : _a.length) ?? 0) > 0;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getAvailableProductResources
+  getAvailableProductResources,
+  isSessionProduct
 });

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

@@ -123,7 +123,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.d.ts

@@ -48,11 +48,13 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 初始化结账流程
      */
     initializeCheckoutAsync(params: CheckoutInitParams): Promise<void>;
+    getHolderIdFromBooking(obj: any): number | undefined;
     getProductListByOrder(): {
         product_id: number;
         product_variant_id: string;
         quantity: number;
         selling_price: number;
+        holder_id?: number;
     }[];
     initWalletData(params?: {
         order_wait_pay_amount: number;

package/lib/solution/Checkout/index.js

@@ -196,6 +196,16 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  getHolderIdFromBooking(obj) {
+    var _a;
+    if (!obj)
+      return void 0;
+    let ret = obj.holder_id || ((_a = obj.holder) == null ? void 0 : _a.form_record);
+    if (Array.isArray(ret)) {
+      return ret.length > 0 ? Number(ret[0]) : void 0;
+    }
+    return Number(ret) || void 0;
+  }
   getProductListByOrder() {
     var _a, _b, _c, _d, _e;
     if (!this.store.currentOrder) {
@@ -206,26 +216,74 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         return pre + (item.amount || 0);
       }, 0);
     };
-    const productList = ((_b = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data.bookings) == null ? void 0 : _b.map(
-      (item) => ({
-        product_id: item.product.product_id,
-        product_variant_id: item.product.product_variant_id,
-        quantity: item.product.num,
-        selling_price: item.product.calculated_selling_price
-      })
-    )) || [];
-    const relationProducts = ((_e = (_d = (_c = this.store.currentOrder.order_info) == null ? void 0 : _c.original_order_data) == null ? void 0 : _d.relation_products) == null ? void 0 : _e.map(
-      (item) => ({
-        product_id: item.product_id,
-        product_variant_id: item.product_variant_id,
-        quantity: item.num,
-        selling_price: item.source_product_price
-      })
-    )) || [];
+    const formatProduct = (items) => {
+      return items.map(
+        (item) => ({
+          product_id: item.product_id,
+          product_variant_id: item.product_variant_id,
+          quantity: item.num,
+          // 商品是否含税：1；0
+          is_charge_tax: item.is_charge_tax ?? 0,
+          // 若商品不含税，计算得到的税费，单位（元）
+          tax_fee: item.tax_fee,
+          // 整个商品折扣后的总金额
+          selling_price: item.calculated_selling_price,
+          // 使用者id
+          holder_id: item.holder_id,
+          // 整个商品折扣前的总金额
+          original_price: item.calculated_original_price,
+          // 主商品折扣前金额，不包含套餐子商品
+          main_product_original_price: item.price,
+          // 主商品折扣后金额，不包含套餐子商品
+          main_product_selling_price: item.main_product_selling_price,
+          metadata: {
+            // 主商品+非原价(加减价)子商品税费
+            "main_product_attached_bundle_tax_fee": item.metadata.main_product_attached_bundle_tax_fee,
+            // 主商品+非原价(加减价)子商品附加费
+            "main_product_attached_bundle_surcharge_fee": item.metadata.main_product_attached_bundle_surcharge_fee,
+            // 可选，附加费均摊舍入金额
+            "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
+          },
+          product_bundle: item.product_bundle.map((bundle) => {
+            return {
+              bundle_id: bundle.bundle_id,
+              bundle_product_id: bundle.bundle_product_id,
+              bundle_variant_id: bundle.bundle_variant_id,
+              price_type: bundle.price_type,
+              price_type_ext: bundle.price_type_ext,
+              // 套餐子商品总价，不包含折扣金额
+              bundle_sum_price: bundle.bundle_sum_price,
+              // 套餐子商品折扣后金额
+              bundle_selling_price: bundle.bundle_selling_price,
+              num: bundle.num,
+              is_charge_tax: bundle.is_charge_tax,
+              tax_fee: bundle.tax_fee,
+              metadata: {
+                // 子商品单数量附加费
+                "surcharge_fee": bundle.metadata.surcharge_fee,
+                // 可选，附加费均摊舍入金额
+                "surcharge_rounding_remainder": bundle.metadata.surcharge_rounding_remainder
+              }
+            };
+          })
+        })
+      ) || [];
+    };
+    const productList = formatProduct(
+      ((_c = (_b = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data) == null ? void 0 : _b.bookings) == null ? void 0 : _c.map(
+        (item) => {
+          return {
+            ...item.product,
+            holder_id: this.getHolderIdFromBooking(item)
+          };
+        }
+      )) || []
+    );
+    const relationProducts = formatProduct(((_e = (_d = this.store.currentOrder.order_info) == null ? void 0 : _d.original_order_data) == null ? void 0 : _e.relation_products) || []);
     return [...productList, ...relationProducts];
   }
   async initWalletData(params) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     this.logInfo("initWalletData called", {
       params
     });
@@ -238,17 +296,20 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     }
     const walletBusinessData = {
       customer_id: ((_c = this.store.currentCustomer) == null ? void 0 : _c.customer_id) ? Number(this.store.currentCustomer.customer_id) : void 0,
+      holder: (_f = (_e = (_d = this.store.currentOrder) == null ? void 0 : _d.order_info) == null ? void 0 : _e.original_order_data) == null ? void 0 : _f.holder,
       amountInfo: {
         totalAmount: amountInfo.totalAmount,
         subTotal: amountInfo.subTotal,
-        depositAmount: (_d = this.store.currentOrder) == null ? void 0 : _d.deposit_amount,
-        isDeposit: (_e = this.store.currentOrder) == null ? void 0 : _e.is_deposit
+        depositAmount: (_g = this.store.currentOrder) == null ? void 0 : _g.deposit_amount,
+        isDeposit: (_h = this.store.currentOrder) == null ? void 0 : _h.is_deposit
       },
       products: this.getProductListByOrder(),
+      is_price_include_tax: this.otherParams.is_price_include_tax,
+      // core 有
       ...params
     };
     if (this.store.isOrderSynced) {
-      walletBusinessData.payment_order_id = (_f = this.store.currentOrder) == null ? void 0 : _f.order_id;
+      walletBusinessData.payment_order_id = (_i = this.store.currentOrder) == null ? void 0 : _i.order_id;
     }
     this.logInfo("开始拉取:initializeWalletDataFromBusinessAsync", {
       walletBusinessData
@@ -266,7 +327,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       currentOrder: this.store.currentOrder
     });
     await this.core.effects.emit(`${this.name}:onWalletDataInitialized`, {
-      orderUuid: (_g = this.store.currentOrder) == null ? void 0 : _g.uuid,
+      orderUuid: (_j = this.store.currentOrder) == null ? void 0 : _j.uuid,
       customerId: walletBusinessData.customer_id,
       walletBusinessData: {
         customer_id: walletBusinessData.customer_id,
@@ -441,7 +502,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * 会覆盖 order_info 与金额等字段，并重新计算待付金额，最后设置为 currentOrder。
    */
   async updateLocalOrderAsync(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
     this.logInfo("updateLocalOrderAsync called", {
       orderId: params.orderId,
       orderDataType: (_a = params.orderData) == null ? void 0 : _a.type,
@@ -479,6 +540,82 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       (o) => String(o.id) === String(params.orderId) || String(o.order_id) === String(params.orderId)
     );
     if (existingOrder) {
+      if (params.existPayment && params.existPayment.length > 0) {
+        this.logInfo("检测到云端支付项，将替换本地订单的支付项列表", {
+          orderId: params.orderId,
+          existingPaymentCount: ((_m = existingOrder.payment) == null ? void 0 : _m.length) || 0,
+          newPaymentCount: params.existPayment.length
+        });
+        this.store.isOrderSynced = true;
+        const currentTime = (0, import_utils.formatDateTime)(/* @__PURE__ */ new Date());
+        const formattedExistPayments = params.existPayment.map((payment) => ({
+          ...payment,
+          isSynced: true,
+          // 标记为已同步
+          status: payment.status || "active",
+          created_at: payment.created_at || currentTime,
+          updated_at: payment.updated_at || currentTime
+        }));
+        const isNeedDeposit3 = this.checkIsNeedDepositAsync(
+          params.orderData.bookings,
+          params.orderData.relation_products
+        );
+        await this.payment.updateOrderAsync(existingOrder.uuid, {
+          total_amount: amountInfo.totalAmount,
+          is_deposit: isNeedDeposit3.hasDeposit ? 1 : 0,
+          deposit_amount: isNeedDeposit3.total ? isNeedDeposit3.total.toString() : "0.00",
+          payment: formattedExistPayments,
+          // 🔧 替换支付项列表
+          order_info: {
+            original_order_data: params.orderData,
+            cart_summary: params.cartSummary,
+            created_at: (/* @__PURE__ */ new Date()).toISOString(),
+            platform: params.orderData.platform,
+            type: params.orderData.type,
+            schedule_date: params.orderData.schedule_date,
+            shop_note: params.orderData.shop_note,
+            amount_breakdown: amountInfo
+          }
+        });
+        const updated2 = await this.payment.getPaymentOrderByUuidAsync(
+          existingOrder.uuid
+        );
+        if (!updated2)
+          throw (0, import_utils.createCheckoutError)(
+            import_types.CheckoutErrorType.UnknownError,
+            "订单更新失败"
+          );
+        this.store.currentOrder = updated2;
+        await this.updateStateAmountToRemaining(false);
+        this.logInfo("本地订单更新成功(已替换云端支付项):", {
+          orderId: params.orderId,
+          uuid: updated2.uuid,
+          payments: ((_n = updated2.payment) == null ? void 0 : _n.length) || 0,
+          totalAmount: updated2.total_amount,
+          expectAmount: updated2.expect_amount,
+          isOrderSynced: true
+        });
+        await this.core.effects.emit(`${this.name}:onOrderCreated`, {
+          order: updated2,
+          timestamp: Date.now()
+        });
+        const syncedPayments = updated2.payment.filter((p) => p.isSynced && p.status !== "voided");
+        const syncedAmount2 = syncedPayments.reduce((sum, p) => {
+          const amt = new import_decimal.default(p.amount || "0");
+          const rounding = new import_decimal.default(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || "0").abs();
+          return sum.plus(amt).plus(rounding);
+        }, new import_decimal.default(0));
+        const totalAmount2 = new import_decimal.default(amountInfo.totalAmount || "0");
+        const remainingExpectAmount2 = import_decimal.default.max(0, totalAmount2.minus(syncedAmount2)).toFixed(2);
+        let depositDiffAmount2 = new import_decimal.default(0).toFixed(2);
+        if (updated2.is_deposit === 1) {
+          depositDiffAmount2 = new import_decimal.default(updated2.deposit_amount).minus(syncedAmount2).toFixed(2);
+        }
+        this.initWalletData({
+          order_wait_pay_amount: Number(depositDiffAmount2) > 0 ? Number(depositDiffAmount2) : Number(remainingExpectAmount2)
+        });
+        return updated2;
+      }
       const totalAmount = new import_decimal.default(amountInfo.totalAmount || "0");
       const activePayments = (existingOrder.payment || []).filter(
         (p) => p.status !== "voided"
@@ -524,7 +661,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       this.logInfo("本地订单更新成功(保留支付项):", {
         orderId: params.orderId,
         uuid: updated.uuid,
-        payments: ((_m = updated.payment) == null ? void 0 : _m.length) || 0,
+        payments: ((_o = updated.payment) == null ? void 0 : _o.length) || 0,
         totalAmount: updated.total_amount,
         expectAmount: updated.expect_amount
       });
@@ -558,6 +695,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       total_amount: amountInfo.totalAmount,
       is_deposit: isNeedDeposit.hasDeposit ? 1 : 0,
       deposit_amount: isNeedDeposit.total ? isNeedDeposit.total.toString() : "0.00",
+      existPayment: params.existPayment,
+      // 🔧 新增: 传递云端支付项
       order_info: {
         original_order_data: params.orderData,
         cart_summary: params.cartSummary,
@@ -570,7 +709,28 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.store.currentOrder = created;
-    this.initWalletData();
+    if (params.existPayment && params.existPayment.length > 0) {
+      this.store.isOrderSynced = true;
+      const syncedPayments = created.payment.filter((p) => p.isSynced && p.status !== "voided");
+      const syncedAmount = syncedPayments.reduce((sum, p) => {
+        const amt = new import_decimal.default(p.amount || "0");
+        const rounding = new import_decimal.default(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || "0").abs();
+        return sum.plus(amt).plus(rounding);
+      }, new import_decimal.default(0));
+      this.logInfo("云端订单初始化钱包数据", {
+        orderId: params.orderId,
+        totalAmount: created.total_amount,
+        expectAmount: created.expect_amount,
+        syncedAmount: syncedAmount.toFixed(2),
+        syncedPaymentCount: syncedPayments.length,
+        isOrderSynced: true
+      });
+      this.initWalletData({
+        order_wait_pay_amount: Number(created.expect_amount)
+      });
+    } else {
+      this.initWalletData();
+    }
     return created;
   }
   /**
@@ -1967,7 +2127,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         const depositPaidAmount = paymentItems.filter(
           (item) => item.order_payment_type === "deposit" && item.status !== "voided"
         ).reduce((sum, item) => {
-          if (item.voucher_id && !item.isSynced) {
+          if (item.voucher_id && !item.isSynced && paymentItems.filter((item2) => !item2.voucher_id).length === 0) {
             return sum;
           }
           const amount = new import_decimal.default(item.amount || "0");

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

@@ -103,6 +103,8 @@ export interface UpdateLocalOrderParams {
     cartSummary: CartSummaryItem[];
     /** total 信息（用于拆解金额） */
     totalInfo: any;
+    /** 云端已存在的支付项（可选，用于处理订单在其他设备或云端生成的场景） */
+    existPayment?: PaymentItem[];
 }
 /**
  * 本地订单数据结构 (基于 appointmentDemo.json)

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

@@ -18,7 +18,12 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private initializePlugins;
     private registerDependentModules;
     private registerEventListeners;
+    getCurrentBookingTime(): string | null;
+    private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
+    setHolders(holders: {
+        form_record_id: number;
+    }[]): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];

package/lib/solution/ShopDiscount/index.js

@@ -36,6 +36,7 @@ module.exports = __toCommonJS(ShopDiscount_exports);
 var import_BaseModule = require("../../modules/BaseModule");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
+var import_utils = require("./utils");
 var import_decimal = __toESM(require("decimal.js"));
 var import_lodash_es = require("lodash-es");
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
@@ -50,7 +51,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       productList: [],
       discount: null,
       rules: null,
-      originalDiscountList: []
+      originalDiscountList: [],
+      currentBookingTime: "",
+      filteredDiscountList: [],
+      holders: []
     };
   }
   // =========== 生命周期方法 ===========
@@ -139,6 +143,44 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     );
   }
   // =========== 公共 API ===========
+  // 设置预约时间
+  // public async setBookingTime(bookingTime: string | null): Promise<void> {
+  //   if (this.store.currentBookingTime !== bookingTime) {
+  //     this.store.currentBookingTime = bookingTime;
+  //
+  //     // 更新过滤后的优惠券列表
+  //     await this.updateFilteredDiscountList();
+  //   }
+  // }
+  // 获取当前预约时间
+  getCurrentBookingTime() {
+    return this.store.currentBookingTime;
+  }
+  // 根据预约时间过滤优惠券列表
+  filterDiscountListByBookingTime(discountList, bookingTime) {
+    if ((0, import_utils.isAllNormalProduct)(this.store.productList || [])) {
+      return discountList;
+    }
+    return (0, import_utils.filterDiscountListByBookingTime)(discountList, bookingTime);
+  }
+  // 更新过滤后的优惠券列表
+  // private async updateFilteredDiscountList(): Promise<void> {
+  //   const originalList = this.store.originalDiscountList;
+  //   const filteredList = this.filterDiscountListByBookingTime(originalList, this.store.currentBookingTime);
+  //
+  //   this.store.filteredDiscountList = filteredList;
+  //
+  //   // 更新 DiscountModule 中的优惠券列表
+  //   this.setDiscountList(filteredList);
+  //
+  //   if (this.store.productList?.length) {
+  //     const result = this.calcDiscount(this.store.productList);
+  //     await this.core.effects.emit(
+  //       ShopDiscountHooks.onLoadPrepareCalcResult,
+  //       result,
+  //     );
+  //   }
+  // }
   // 设置客户
   async setCustomer(customer) {
     var _a;
@@ -150,6 +192,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       );
     }
   }
+  // 设置holders
+  setHolders(holders) {
+    this.store.holders = holders;
+  }
   // 计算优惠券
   calcDiscount(productList, options) {
     this.store.productList = productList;
@@ -160,7 +206,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     let { productList: newProductList, discountList: newDiscountList } = rulesModule.calcDiscount(
       {
         productList,
-        discountList: this.getDiscountList()
+        discountList: this.getDiscountList(),
+        holders: this.store.holders || []
       },
       options
     ) || { productList, discountList: this.getDiscountList() };
@@ -249,7 +296,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       } = rulesModule.isDiscountListAvailable({
         productList: this.store.productList || [],
         oldDiscountList: this.getDiscountList(),
-        newDiscountList: withScanList
+        newDiscountList: withScanList,
+        holders: this.store.holders || []
       }) || {
         isAvailable: false,
         productList: this.store.productList || [],
@@ -324,7 +372,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
               editModeDiscountList[index] = {
                 ...editModeDiscountList[index],
                 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.num) || 1).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(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
               };
             } else {
               if (discount.type && !discount.tag) {
@@ -335,7 +383,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
                 name: discount.name || discount.discount.title.auto,
                 isEditMode: true,
                 limited_relation_product_data: {},
-                savedAmount: discount.amount * ((product == null ? void 0 : product.num) || 1),
+                savedAmount: discount.amount * ((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1),
                 isAvailable: true,
                 id: ((_a3 = discount.discount) == null ? void 0 : _a3.resource_id) || discount.id,
                 format_title: ((_b = discount.discount) == null ? void 0 : _b.title) || discount.format_title,
@@ -355,15 +403,17 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     const isProductFree = (id) => {
       var _a2;
       const targetProduct = productList.find((n) => n.id === id);
+      if (!targetProduct)
+        return false;
       const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(targetProduct);
       return Number(product == null ? void 0 : product.total) <= 0 && (Number(product == null ? void 0 : product.origin_total) <= 0 || !(product == null ? void 0 : product.origin_total)) || (0, import_lodash_es.isBoolean)(product == null ? void 0 : product.vouchersApplicable) && !(product == null ? void 0 : product.vouchersApplicable);
     };
-    const allUsedProductIds = newDiscountList.map((n) => {
+    const allUsedProductIds = newDiscountList.filter((item) => !(item == null ? void 0 : item.isEditMode)).map((n) => {
       var _a2;
-      return n.isSelected ? (_a2 = n.appliedProductDetails) == null ? void 0 : _a2.map((n2) => {
+      return n.isSelected ? ((_a2 = n.appliedProductDetails) == null ? void 0 : _a2.map((n2) => {
         var _a3;
         return (_a3 = n2.discount) == null ? void 0 : _a3.product_id;
-      }) : [];
+      })) || n.product_id : [];
     }).flat();
     newDiscountList.forEach((item) => {
       var _a2;
@@ -425,14 +475,15 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   }
   // 加载准备配置
   async loadPrepareConfig(params) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     try {
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
         action: "create",
         with_good_pass: 1,
-        with_discount_card: 1
+        with_discount_card: 1,
+        with_wallet_pass_holder: 1
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan
@@ -441,8 +492,11 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const newGoodPassList = goodPassList == null ? void 0 : goodPassList.filter((n) => !scanDiscountIds.includes(n.id));
       const newDiscountList = [...scanDiscount, ...newGoodPassList || []];
       this.store.originalDiscountList = newDiscountList;
-      this.setDiscountList(newDiscountList || []);
-      if ((_d = this.store.productList) == null ? void 0 : _d.length) {
+      await ((_d = this.store.discount) == null ? void 0 : _d.setOriginalDiscountList(newDiscountList));
+      const filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
+      this.store.filteredDiscountList = filteredDiscountList;
+      this.setDiscountList(filteredDiscountList || []);
+      if ((_e = this.store.productList) == null ? void 0 : _e.length) {
         const result = this.calcDiscount(this.store.productList);
         await this.core.effects.emit(
           `${this.name}:onLoadPrepareCalcResult`,
@@ -451,7 +505,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

@@ -1,5 +1,6 @@
-import { DiscountModule, Discount } from '../../modules/Discount';
+import { DiscountModule } from '../../modules/Discount';
 import { RulesModule } from '../../modules/Rules';
+import { Discount } from "../../modules/Discount/types";
 export declare enum ShopDiscountHooks {
     onInited = "shopDiscount:onInited",
     onDestroy = "shopDiscount:onDestroy",
@@ -23,6 +24,13 @@ export interface ShopDiscountState {
     rules: RulesModule | null;
     productList: Record<string, any>[];
     originalDiscountList: Discount[];
+    holders?: {
+        form_record_id: number;
+        form_id?: number;
+        main_field?: string;
+    }[];
+    currentBookingTime: string | null;
+    filteredDiscountList: Discount[];
 }
 export interface SetDiscountSelectedParams {
     discountId: number;