@pisell/pisellos 2.2.7 → 2.2.9

package/dist/solution/ShopDiscount/index.js

@@ -50,7 +50,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       productList: [],
       discount: null,
       rules: null,
-      originalDiscountList: []
+      originalDiscountList: [],
+      holders: []
     };
     return _this;
   }
@@ -233,7 +234,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return _setCustomer.apply(this, arguments);
       }
       return setCustomer;
-    }() // 计算优惠券
+    }() // 设置holders
+  }, {
+    key: "setHolders",
+    value: function setHolders(holders) {
+      this.store.holders = holders;
+    }
+
+    // 计算优惠券
   }, {
     key: "calcDiscount",
     value: function calcDiscount(productList, options) {
@@ -247,7 +255,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       }
       var _ref = rulesModule.calcDiscount({
           productList: productList,
-          discountList: this.getDiscountList()
+          discountList: this.getDiscountList(),
+          holders: this.store.holders || []
         }, options) || {
           productList: productList,
           discountList: this.getDiscountList()
@@ -385,7 +394,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               _ref2 = rulesModule.isDiscountListAvailable({
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
-                newDiscountList: withScanList
+                newDiscountList: withScanList,
+                holders: this.store.holders || []
               }) || {
                 isAvailable: false,
                 productList: this.store.productList || [],
@@ -665,7 +675,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 customer_id: customerId,
                 action: 'create',
                 with_good_pass: 1,
-                with_discount_card: 1
+                with_discount_card: 1,
+                with_wallet_pass_holder: 1
               });
             case 4:
               goodPassList = _context9.sent;

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

@@ -23,6 +23,11 @@ export interface ShopDiscountState {
     rules: RulesModule | null;
     productList: Record<string, any>[];
     originalDiscountList: Discount[];
+    holders?: {
+        form_record_id: number;
+        form_id?: number;
+        main_field?: string;
+    }[];
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

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

@@ -19,6 +19,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_good_pass: 0 | 1;
         with_discount_card: 0 | 1;
         customer_id: number;
+        with_wallet_pass_holder: 0 | 1;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];

package/lib/modules/Discount/index.js

@@ -96,7 +96,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       tags: ["good_pass", "product_discount_card"],
       available: 1,
       relation_product: 1,
-      with: ["extensionData"],
+      with: ["extensionData", "holder.detail"],
       order_behavior_count: 1,
       order_behavior_count_customer_id: customerId || 1
     });

package/lib/modules/Payment/cash.js

@@ -35,7 +35,7 @@ var CashPaymentImpl = class {
     const paymentItem = {
       amount: amount.toString(),
       code: cashMethod.code,
-      id: cashMethod.id,
+      custom_payment_id: cashMethod.id,
       name: cashMethod.name,
       type: cashMethod.type,
       voucher_id: ""

package/lib/modules/Payment/eftpos.js

@@ -34,7 +34,7 @@ var EftposPaymentImpl = class {
     const paymentItem = {
       amount: amount.toString(),
       code: eftposMethod.code,
-      id: eftposMethod.id,
+      custom_payment_id: eftposMethod.id,
       name: eftposMethod.name,
       type: eftposMethod.type,
       voucher_id: ""

package/lib/modules/Payment/index.js

@@ -41,6 +41,15 @@ function formatAmount(amount) {
     return "0.00";
   }
 }
+function formatDateTime(date) {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  const hours = String(date.getHours()).padStart(2, "0");
+  const minutes = String(date.getMinutes()).padStart(2, "0");
+  const seconds = String(date.getSeconds()).padStart(2, "0");
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
 function generateRequestUniqueId() {
   const now = /* @__PURE__ */ new Date();
   const year = now.getFullYear();
@@ -308,7 +317,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    */
   async getPaymentOrderByUuidAsync(orderUuid) {
     try {
-      return await this.dbManager.get("order", orderUuid);
+      return await this.dbManager.get("order", orderUuid, true);
     } catch (error) {
       console.error("[PaymentModule] 获取支付订单失败", error);
       return null;
@@ -337,8 +346,35 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         is_deposit: params.is_deposit || 0,
         deposit_amount: params.deposit_amount || "0.00"
       };
+      if (params.existPayment && params.existPayment.length > 0) {
+        const currentTime = formatDateTime(/* @__PURE__ */ new Date());
+        newOrder.payment = params.existPayment.map((payment) => ({
+          ...payment,
+          isSynced: true,
+          // 标记为已同步
+          status: payment.status || "active",
+          // 如果云端支付项已有时间戳，则保留；否则使用当前时间
+          created_at: payment.created_at || currentTime,
+          updated_at: payment.updated_at || currentTime
+        }));
+        this.recalculateOrderAmount(newOrder);
+        this.logInfo("创建订单时包含云端支付项", {
+          orderId: params.order_id,
+          existPaymentCount: params.existPayment.length,
+          totalAmount: newOrder.total_amount,
+          expectAmount: newOrder.expect_amount,
+          paymentDetails: params.existPayment.map((p) => ({
+            uuid: p.uuid,
+            code: p.code,
+            amount: p.amount,
+            status: p.status,
+            created_at: p.created_at,
+            updated_at: p.updated_at
+          }))
+        });
+      }
       const dbAddStartTime = Date.now();
-      await this.dbManager.add("order", newOrder);
+      await this.dbManager.add("order", newOrder, true);
       const dbAddDuration = Date.now() - dbAddStartTime;
       this.logInfo("Database add operation completed", {
         operation: "dbManager.add",
@@ -502,7 +538,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    * 为某个订单添加支付项（新方法）
    */
   async addPaymentItemAsync(orderUuid, paymentItem) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     this.logInfo("Starting addPaymentItemAsync", {
       orderUuid,
       paymentAmount: paymentItem.amount,
@@ -510,7 +546,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       orderPaymentType: paymentItem.order_payment_type
     });
     try {
+      this.logInfo("准备获取订单", {
+        orderUuid
+      });
       const order = await this.getPaymentOrderByUuidAsync(orderUuid);
+      this.logInfo("获取订单信息成功", {
+        orderUuid,
+        order
+      });
       if (!order) {
         throw new Error(`Order not found: ${orderUuid}`);
       }
@@ -538,10 +581,16 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         });
         throw new Error(warningMessage);
       }
-      const paymentUuid = (0, import_utils.getUniqueId)("payment_");
+      let paymentUuid;
+      if ((_a = paymentItem.metadata) == null ? void 0 : _a.unique_payment_number) {
+        paymentUuid = paymentItem.metadata.unique_payment_number;
+      } else {
+        paymentUuid = (0, import_utils.getUniqueId)("payment_");
+      }
+      const currentTime = formatDateTime(/* @__PURE__ */ new Date());
       const newPaymentItem = {
         uuid: paymentUuid,
-        id: paymentItem.id || 0,
+        custom_payment_id: paymentItem.custom_payment_id || 0,
         name: paymentItem.name,
         code: paymentItem.code,
         type: paymentItem.type,
@@ -553,6 +602,10 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         // 新支付项默认为活跃状态
         order_payment_type: paymentItem.order_payment_type || "normal",
         // 默认为正常支付
+        created_at: currentTime,
+        // 创建时间
+        updated_at: currentTime,
+        // 更新时间
         metadata: {
           ...paymentItem.metadata,
           // 保留传入的所有 metadata 字段
@@ -562,23 +615,30 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       };
       order.payment.push(newPaymentItem);
       this.recalculateOrderAmount(order);
-      await this.dbManager.update("order", order);
-      await this.core.effects.emit(`${this.name}:onPaymentAdded`, {
+      this.logInfo("开始更新订单支付项", {
+        orderUuid,
+        order
+      });
+      await this.dbManager.update("order", order, true);
+      this.logInfo("更新订单支付项完成", {
+        orderUuid
+      });
+      this.core.effects.emit(import_types.PaymentHooks.OnPaymentAdded, {
         orderUuid,
         payment: newPaymentItem
       });
       this.logInfo("addPaymentItemAsync completed successfully", {
         orderUuid,
         paymentUuid: newPaymentItem.uuid,
-        uniquePaymentNumber: (_a = newPaymentItem.metadata) == null ? void 0 : _a.unique_payment_number,
+        uniquePaymentNumber: (_b = newPaymentItem.metadata) == null ? void 0 : _b.unique_payment_number,
         newExpectAmount: order.expect_amount,
         paymentAmount: newPaymentItem.amount,
         paymentCode: newPaymentItem.code,
         orderPaymentType: newPaymentItem.order_payment_type,
         metadataFields: Object.keys(newPaymentItem.metadata || {}),
         // 现金支付找零信息
-        actualPaidAmount: (_b = newPaymentItem.metadata) == null ? void 0 : _b.actual_paid_amount,
-        changeGivenAmount: (_c = newPaymentItem.metadata) == null ? void 0 : _c.change_given_amount
+        actualPaidAmount: (_c = newPaymentItem.metadata) == null ? void 0 : _c.actual_paid_amount,
+        changeGivenAmount: (_d = newPaymentItem.metadata) == null ? void 0 : _d.change_given_amount
       });
     } catch (error) {
       console.error("[PaymentModule] 添加支付项失败", error);
@@ -797,7 +857,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           uuid: payment.uuid,
           amount: payment.amount,
           code: payment.code,
-          id: payment.id,
+          custom_payment_id: payment.custom_payment_id,
           name: payment.name,
           type: payment.type,
           voucher_id: payment.voucher_id,

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

@@ -96,7 +96,7 @@ export interface PaymentItem {
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
     code: string;
     /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    id: number;
+    custom_payment_id: number;
     /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
     name: string;
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
@@ -138,6 +138,10 @@ export interface PaymentItem {
         statusCode?: number;
         timestamp: number;
     };
+    /** 支付项创建时间 (格式: YYYY-MM-DD HH:mm:ss) */
+    created_at?: string;
+    /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss) */
+    updated_at?: string;
 }
 /**
  * 订单信息
@@ -200,6 +204,8 @@ export interface PushOrderParams {
     deposit_amount?: string;
     /** 原始订单数据（可选，由 Checkout 模块传入） */
     order_info?: any;
+    /** 云端已存在的支付项（可选，用于处理订单在其他设备或云端生成的场景） */
+    existPayment?: PaymentItem[];
 }
 /**
  * 更新订单参数
@@ -219,7 +225,7 @@ export interface PaymentItemInput {
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
     code: string;
     /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    id: number;
+    custom_payment_id: number;
     /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
     name: string;
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
@@ -248,6 +254,10 @@ export interface PaymentItemInput {
         /** 找零金额（现金支付时的找零金额） */
         change_given_amount?: number;
     };
+    /** 支付项创建时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
+    created_at?: string;
+    /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
+    updated_at?: string;
 }
 /**
  * 推送支付项参数
@@ -598,6 +608,8 @@ export interface WalletDeductionRecommendParams {
     expect_columns?: string[];
     /** 客户id */
     customer_id?: number;
+    /** 客户holder_id */
+    holder_id?: number;
     /** 订单总计金额 */
     order_expect_amount: number;
     /** 订单小计金额 */
@@ -616,6 +628,8 @@ export interface WalletDeductionRecommendParams {
         quantity: number;
         /** 商品使用了所有优惠后的最终价格 */
         selling_price: number;
+        /** 客户holder_id */
+        holder_id?: number;
     }[];
     /** 预备支付 */
     prepare_payments?: {
@@ -633,6 +647,10 @@ export interface WalletDeductionRecommendParams {
 export interface WalletInitBusinessData {
     /** 客户ID（可选） */
     customer_id?: number;
+    /** 客户 holder */
+    holder?: {
+        form_record: number[];
+    };
     /** 金额信息 */
     amountInfo: {
         totalAmount: string;
@@ -648,6 +666,7 @@ export interface WalletInitBusinessData {
         product_variant_id: string;
         quantity: number;
         selling_price: number;
+        holder_id?: number;
     }[];
     order_wait_pay_amount?: number;
     /** 订单ID */

package/lib/modules/Payment/walletpass.js

@@ -50,14 +50,15 @@ var WalletPassPaymentImpl = class {
    * 根据业务数据生成标准的钱包API参数，并存储在模块中
    */
   generateWalletParams(businessData) {
-    var _a;
-    const { customer_id, amountInfo, products, order_wait_pay_amount, payment_order_id } = businessData;
+    var _a, _b;
+    const { customer_id, holder, amountInfo, products, order_wait_pay_amount, payment_order_id } = businessData;
     const totalAmount = Number(amountInfo.totalAmount);
     const subTotal = Number(amountInfo.subTotal);
     const walletParams = {
       sale_channel: "pos",
       customer_id: customer_id || 0,
       // 提供默认值，确保类型为 number
+      holder_id: ((_a = holder == null ? void 0 : holder.form_record) == null ? void 0 : _a[0]) || void 0,
       order_expect_amount: totalAmount,
       // 订单小计金额
       order_product_amount: subTotal,
@@ -71,10 +72,11 @@ var WalletPassPaymentImpl = class {
     this.walletParams = walletParams;
     this.paymentModule.logInfo("[WalletPass] 钱包默认参数已生成并存储", {
       customer_id: walletParams.customer_id,
+      holder_id: walletParams.holder_id,
       order_expect_amount: walletParams.order_expect_amount,
       order_product_amount: walletParams.order_product_amount,
       order_wait_pay_amount: walletParams.order_wait_pay_amount,
-      products_count: ((_a = walletParams.products) == null ? void 0 : _a.length) || 0
+      products_count: ((_b = walletParams.products) == null ? void 0 : _b.length) || 0
     });
     return walletParams;
   }
@@ -387,7 +389,7 @@ var WalletPassPaymentImpl = class {
     const paymentItem = {
       amount: amount.toString(),
       code: walletMethod.code,
-      id: walletMethod.id,
+      custom_payment_id: walletMethod.id,
       name: walletMethod.name,
       type: walletMethod.type,
       voucher_id: voucherId || ""

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

@@ -12,18 +12,25 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setRulesList(rulesList: Rules[]): Promise<void>;
     getRulesList(): Rules[];
-    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, }: {
+    private checkHolderMatch;
+    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, }: {
         oldDiscountList: Discount[];
         newDiscountList: Discount[];
         productList: any[];
+        holders: {
+            form_record_id: number;
+        }[];
     }): {
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
     };
-    calcDiscount({ discountList, productList, }: {
+    calcDiscount({ discountList, productList, holders, }: {
         discountList: Discount[];
         productList: any[];
+        holders: {
+            form_record_id: number;
+        }[];
     }, options?: {
         isSelected?: boolean;
         discountId?: number;

package/lib/modules/Rules/index.js

@@ -37,6 +37,7 @@ var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
 var import_lodash_es = require("lodash-es");
+var flatItem;
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -56,11 +57,23 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   getRulesList() {
     return this.store.rulesList;
   }
+  // 检查 holder 是否匹配
+  checkHolderMatch(discount, product, holders) {
+    var _a;
+    if (((_a = discount.holder) == null ? void 0 : _a.holder_type) !== "form")
+      return true;
+    const orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id : void 0;
+    const productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
+    if (!orderHolderId && !productHolderId)
+      return true;
+    return (productHolderId || orderHolderId) === discount.holder.holder_id;
+  }
   // 判断discountList 是否可以对当前productList生效
   isDiscountListAvailable({
     oldDiscountList,
     newDiscountList,
-    productList
+    productList,
+    holders
   }) {
     if (!newDiscountList || newDiscountList.length === 0) {
       return {
@@ -87,7 +100,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     ]), "product_id");
     const result = this.calcDiscount({
       discountList: mergedDiscountList,
-      productList: [...productList]
+      productList: [...productList],
+      holders
     }, {
       scan: true
     });
@@ -115,7 +129,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   }
   calcDiscount({
     discountList,
-    productList
+    productList,
+    holders
   }, options) {
     const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
     const editModeDiscount = [];
@@ -197,12 +212,19 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     sortedProductList.forEach((originProduct) => {
       const product = this.hooks.getProduct(originProduct);
       addModeDiscount.forEach((discount) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
-        const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
-        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type))));
+        const isHolderMatch = this.checkHolderMatch(
+          discount,
+          {
+            holder_id: ((flatItem == null ? void 0 : flatItem.type) === "bundle" ? (_a = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _a.holder_id : (_b = flatItem == null ? void 0 : flatItem.product) == null ? void 0 : _b.holder_id) || product.holder_id
+          },
+          holders
+        );
+        const isLimitedProduct = (limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
+        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_c = product == null ? void 0 : product.discount_list) == null ? void 0 : _c.length) && ((_d = product == null ? void 0 : product.discount_list) == null ? void 0 : _d.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type))));
         if (isAvailableProduct && isLimitedProduct) {
-          (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
+          (_e = discountApplicability.get(discount.id)) == null ? void 0 : _e.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
           const productData = {
@@ -210,7 +232,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             type: discountType,
             tag: discountType,
             discount: {
-              discount_card_type: (_d = discount == null ? void 0 : discount.metadata) == null ? void 0 : _d.discount_card_type,
+              discount_card_type: (_f = discount == null ? void 0 : discount.metadata) == null ? void 0 : _f.discount_card_type,
               fixed_amount: product.price,
               resource_id: discount.id,
               title: discount.format_title,
@@ -236,7 +258,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
-        var _a2;
+        var _a2, _b2, _c2;
         if ((Number(product.price) <= 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
           return false;
         if ((Number(product.total) <= 0 || !product.total) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
@@ -248,6 +270,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")
           return false;
         const limitedData = discount.limited_relation_product_data;
+        const isHolderMatch = this.checkHolderMatch(
+          discount,
+          {
+            holder_id: ((flatItem == null ? void 0 : flatItem.type) === "bundle" ? (_b2 = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _b2.holder_id : (_c2 = flatItem == null ? void 0 : flatItem.product) == null ? void 0 : _c2.holder_id) || product.holder_id
+          },
+          holders
+        );
+        if (!isHolderMatch)
+          return false;
         if (limitedData.type === "product_all") {
           return true;
         } else if (limitedData.product_ids && limitedData.product_ids.includes(product.id)) {

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,7 @@ type ProductDetail = {
     num?: number;
     quantity: number;
     vouchersApplicable?: boolean;
+    holder_id?: number;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

package/lib/server/modules/menu/index.js

@@ -73,7 +73,7 @@ var MenuModule = class extends import_BaseModule.BaseModule {
           num: 999,
           code: "menu_list"
         },
-        { useCache: true }
+        { cache: void 0 }
       );
       const menuList = ((_a = response == null ? void 0 : response.data) == null ? void 0 : _a.list) || [];
       await this.saveMenuToIndexDB(menuList);

package/lib/server/modules/products/index.js

@@ -313,7 +313,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
           front_end_cache_id: cacheId,
           application_code: (_a = this.otherParams) == null ? void 0 : _a.channel
         },
-        { useCache: true }
+        { cache: void 0 }
       );
       await this.saveProductsToIndexDB(((_b = productsData == null ? void 0 : productsData.data) == null ? void 0 : _b.list) || []);
       await this.core.effects.emit(

package/lib/server/modules/schedule/index.js

@@ -82,7 +82,7 @@ var ScheduleModuleEx = class extends import_BaseModule.BaseModule {
     const scheduleList = await this.request.get(
       `/schedule`,
       { num: 999 },
-      { useCache: true }
+      { cache: void 0 }
     );
     const list = ((_a = scheduleList.data) == null ? void 0 : _a.list) || [];
     await this.saveScheduleToIndexDB(list);

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

@@ -342,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.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;