@pisell/pisellos 0.0.293 → 0.0.295

package/lib/modules/Payment/index.js

@@ -397,6 +397,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       const order = await this.dbManager.get("order", orderUuid);
       if (order) {
         const updatedOrder = { ...order, ...params };
+        this.recalculateOrderAmount(updatedOrder);
         await this.dbManager.update("order", updatedOrder);
         await this.core.effects.emit(import_types.PaymentHooks.OnOrderUpdated, updatedOrder);
         await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
@@ -914,7 +915,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       },
       new import_decimal.Decimal(0)
     );
-    const remainingAmount = totalAmount.minus(paidAmount);
+    const remainingAmount = order.is_deposit === 1 ? new import_decimal.Decimal(order.deposit_amount).minus(paidAmount) : totalAmount.minus(paidAmount);
     order.expect_amount = import_decimal.Decimal.max(0, remainingAmount).toFixed(2);
     console.log(`[PaymentModule] 重新计算订单金额:`, {
       orderUuid: order.uuid,

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

@@ -637,6 +637,10 @@ export interface WalletInitBusinessData {
     amountInfo: {
         totalAmount: string;
         subTotal: string;
+        /** 是否是定金订单 */
+        isDeposit?: number;
+        /** 定金金额 */
+        depositAmount?: string;
     };
     /** 商品列表 */
     products: {

package/lib/modules/Payment/walletpass.js

@@ -60,7 +60,7 @@ var WalletPassPaymentImpl = class {
       // 订单小计金额
       order_product_amount: subTotal,
       // 订单待支付金额
-      order_wait_pay_amount: order_wait_pay_amount || totalAmount,
+      order_wait_pay_amount: order_wait_pay_amount || ((amountInfo == null ? void 0 : amountInfo.isDeposit) ? Number(amountInfo == null ? void 0 : amountInfo.depositAmount) : totalAmount),
       // order_behavior_count_customer_id: 1,
       products,
       prepare_payments: [],

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

@@ -326,7 +326,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/BookingByStep/index.js

@@ -1829,13 +1829,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               return !(0, import_dayjs.default)(n2.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n2.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || (0, import_dayjs.default)(n2.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n2.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
             });
             const mSet = /* @__PURE__ */ new Map();
-            n.event_list.forEach((m) => {
-              if ((0, import_resources.isConflict)(
-                { start_at: m.start_at, end_at: m.end_at },
-                { start_at: (0, import_dayjs.default)(item.start), end_at: (0, import_dayjs.default)(item.end) }
-              )) {
-                mSet.set(m.id, m.pax || 1);
-              }
+            mTimes.forEach((n2) => {
+              n2.event_list.forEach((m) => {
+                if ((0, import_resources.isConflict)(
+                  { start_at: m.start_at, end_at: m.end_at },
+                  { start_at: (0, import_dayjs.default)(item.start), end_at: (0, import_dayjs.default)(item.end) }
+                )) {
+                  mSet.set(m.id, m.pax || 1);
+                }
+              });
             });
             acc += Array.from(mSet.values()).reduce((acc2, curr2) => acc2 + curr2, 0);
             return acc;

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

@@ -111,7 +111,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

@@ -56,6 +56,14 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
     initWalletData(params?: {
         order_wait_pay_amount: number;
     }): Promise<void>;
+    checkIsNeedDepositAsync(bookings: any[], relationProducts: any[]): {
+        total: number;
+        protocols: {
+            id: number;
+            title: string;
+        }[];
+        hasDeposit: boolean;
+    };
     /**
      * 创建本地订单 (前端模拟下单流程)
      *

package/lib/solution/Checkout/index.js

@@ -40,6 +40,7 @@ var import_Payment = require("../../modules/Payment");
 var import_types = require("./types");
 var import_types2 = require("../../modules/Payment/types");
 var import_utils = require("./utils");
+var import_utils2 = require("../../modules/Cart/utils");
 __reExport(Checkout_exports, require("./types"), module.exports);
 var CheckoutImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -221,7 +222,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     return [...productList, ...relationProducts];
   }
   async initWalletData(params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     this.logInfo("initWalletData called", {
       params
     });
@@ -236,13 +237,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       customer_id: ((_c = this.store.currentCustomer) == null ? void 0 : _c.customer_id) ? Number(this.store.currentCustomer.customer_id) : void 0,
       amountInfo: {
         totalAmount: amountInfo.totalAmount,
-        subTotal: amountInfo.subTotal
+        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
       },
       products: this.getProductListByOrder(),
       ...params
     };
     if (this.store.isOrderSynced) {
-      walletBusinessData.payment_order_id = (_d = this.store.currentOrder) == null ? void 0 : _d.order_id;
+      walletBusinessData.payment_order_id = (_f = this.store.currentOrder) == null ? void 0 : _f.order_id;
     }
     this.logInfo("开始拉取:initializeWalletDataFromBusinessAsync", {
       walletBusinessData
@@ -260,7 +263,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       currentOrder: this.store.currentOrder
     });
     await this.core.effects.emit(import_types.CheckoutHooks.OnWalletDataInitialized, {
-      orderUuid: (_e = this.store.currentOrder) == null ? void 0 : _e.uuid,
+      orderUuid: (_g = this.store.currentOrder) == null ? void 0 : _g.uuid,
       customerId: walletBusinessData.customer_id,
       walletBusinessData: {
         customer_id: walletBusinessData.customer_id,
@@ -270,6 +273,58 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       timestamp: Date.now()
     });
   }
+  checkIsNeedDepositAsync(bookings, relationProducts) {
+    const summaryDeposit = {
+      total: 0,
+      protocols: [],
+      hasDeposit: false
+    };
+    bookings == null ? void 0 : bookings.forEach((item) => {
+      const deposit = (0, import_utils2.getProductDeposit)({
+        cartItem: {
+          total: item.product.price * item.num
+        },
+        product: item.product,
+        bundle: item.bundle,
+        options: item.options,
+        num: item.num
+      });
+      item.deposit = deposit;
+      if ((deposit == null ? void 0 : deposit.total) && Number(deposit.total) > 0) {
+        summaryDeposit.total = new import_decimal.default(summaryDeposit.total).plus(deposit.total).toNumber();
+        item.product.discount_list.forEach((discount) => {
+          summaryDeposit.total = new import_decimal.default(summaryDeposit.total).minus(discount.amount || 0).toNumber();
+        });
+        summaryDeposit.protocols = summaryDeposit.protocols.concat(
+          deposit.protocols
+        );
+        summaryDeposit.hasDeposit = true;
+      }
+    });
+    relationProducts == null ? void 0 : relationProducts.forEach((item) => {
+      const deposit = (0, import_utils2.getProductDeposit)({
+        cartItem: {
+          total: item.price * item.num
+        },
+        product: item,
+        bundle: item.product_bundle,
+        options: item.product_option_item,
+        num: item.num
+      });
+      item.deposit = deposit;
+      if ((deposit == null ? void 0 : deposit.total) && Number(deposit.total) > 0) {
+        summaryDeposit.total = new import_decimal.default(summaryDeposit.total).plus(deposit.total).toNumber();
+        item.discount_list.forEach((discount) => {
+          summaryDeposit.total = new import_decimal.default(summaryDeposit.total).minus(discount.amount || 0).toNumber();
+        });
+        summaryDeposit.protocols = summaryDeposit.protocols.concat(
+          deposit.protocols
+        );
+        summaryDeposit.hasDeposit = true;
+      }
+    });
+    return summaryDeposit;
+  }
   /**
    * 创建本地订单 (前端模拟下单流程)
    *
@@ -319,11 +374,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         this.store.currentCustomer = void 0;
         console.log("[Checkout] 未提供客户信息");
       }
+      const isNeedDeposit = this.checkIsNeedDepositAsync(
+        params.orderData.bookings,
+        params.orderData.relation_products
+      );
       const paymentOrder = await this.payment.createPaymentOrderAsync({
         order_id: localOrderId,
         total_amount: amountInfo.totalAmount,
-        is_deposit: params.orderData.is_deposit || 0,
-        deposit_amount: amountInfo.depositAmount || "0.00",
+        is_deposit: isNeedDeposit.hasDeposit ? 1 : 0,
+        deposit_amount: isNeedDeposit.total ? isNeedDeposit.total.toString() : "0.00",
         order_info: {
           original_order_data: params.orderData,
           cart_summary: params.cartSummary,
@@ -412,13 +471,17 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     );
     if (existingOrder) {
       const totalAmount = new import_decimal.default(amountInfo.totalAmount || "0");
-      const activePayments = (existingOrder.payment || []).filter((p) => p.status !== "voided");
+      const activePayments = (existingOrder.payment || []).filter(
+        (p) => p.status !== "voided"
+      );
       const paidAmount = activePayments.reduce((sum, p) => {
         const amt = new import_decimal.default(p.amount || "0");
         const rounding = new import_decimal.default(p.rounding_amount || "0").abs();
         return sum.plus(amt).plus(rounding);
       }, new import_decimal.default(0));
-      const remaining = import_decimal.default.max(0, totalAmount.minus(paidAmount)).toFixed(2);
+      const remaining = import_decimal.default.max(0, totalAmount.minus(paidAmount)).toFixed(
+        2
+      );
       await this.payment.updateOrderAsync(existingOrder.uuid, {
         total_amount: amountInfo.totalAmount,
         is_deposit: params.orderData.is_deposit || 0,
@@ -435,9 +498,14 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           amount_breakdown: amountInfo
         }
       });
-      const updated = await this.payment.getPaymentOrderByUuidAsync(existingOrder.uuid);
+      const updated = await this.payment.getPaymentOrderByUuidAsync(
+        existingOrder.uuid
+      );
       if (!updated)
-        throw (0, import_utils.createCheckoutError)(import_types.CheckoutErrorType.UnknownError, "订单更新失败");
+        throw (0, import_utils.createCheckoutError)(
+          import_types.CheckoutErrorType.UnknownError,
+          "订单更新失败"
+        );
       this.store.currentOrder = updated;
       await this.updateStateAmountToRemaining(false);
       this.logInfo("本地订单更新成功(保留支付项):", {
@@ -908,7 +976,9 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           "当前没有活跃订单，无法更新代金券支付项"
         );
       }
-      const paymentItems = await this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid);
+      const paymentItems = await this.payment.getPaymentItemsAsync(
+        this.store.currentOrder.uuid
+      );
       const allPaymentItemsSynced = paymentItems.every((item) => item.isSynced);
       const remainingAmount = await this.calculateRemainingAmountAsync();
       const remainingValue = new import_decimal.default(remainingAmount);
@@ -1028,6 +1098,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       if (this.store.localOrderData) {
         this.store.localOrderData.is_deposit = newDepositValue;
       }
+      this.updateStateAmountToRemaining();
       await this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreated, {
         order: this.store.currentOrder,
         timestamp: Date.now()
@@ -1076,13 +1147,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           "未找到当前订单，无法设置定金金额"
         );
       }
-      const totalAmount = new import_decimal.default(this.store.currentOrder.total_amount || "0");
-      if (depositValue.gt(totalAmount)) {
-        throw (0, import_utils.createCheckoutError)(
-          import_types.CheckoutErrorType.ValidationFailed,
-          `定金金额 ${depositAmount} 不能超过订单总额 ${totalAmount.toFixed(2)}`
-        );
-      }
       const formattedDepositAmount = depositValue.toFixed(2);
       const oldDepositAmount = this.store.currentOrder.deposit_amount || "0.00";
       if (formattedDepositAmount === oldDepositAmount) {
@@ -1097,7 +1161,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         orderId: this.store.currentOrder.order_id,
         oldDepositAmount,
         newDepositAmount: formattedDepositAmount,
-        totalAmount: totalAmount.toFixed(2)
+        totalAmount: this.store.currentOrder.total_amount
       });
       const updateParams = {
         deposit_amount: formattedDepositAmount
@@ -1125,6 +1189,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           this.store.localOrderData.is_deposit = updateParams.is_deposit;
         }
       }
+      this.updateStateAmountToRemaining(false);
       await this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreated, {
         order: this.store.currentOrder,
         timestamp: Date.now()
@@ -1152,7 +1217,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * 用于强制同步订单到后端，特别适用于纯代金券支付完成的订单
    */
   async manualSyncOrderAsync() {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     this.logInfo("manualSyncOrderAsync called", {
       hasCurrentOrder: !!this.store.currentOrder,
       currentOrderId: (_a = this.store.currentOrder) == null ? void 0 : _a.order_id,
@@ -1197,14 +1262,19 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           "[Checkout] 严重警告：返回的订单ID与存储的订单ID不一致！"
         );
       }
-      return syncResult;
+      let newRes = {
+        ...syncResult,
+        is_deposit: ((_d = this.store.currentOrder) == null ? void 0 : _d.is_deposit) || 0
+      };
+      await this.updateStateAmountToRemaining(false);
+      return newRes;
     } catch (error) {
       this.logError("手动同步订单失败:", error);
       const errorMessage = error instanceof Error ? error.message : "同步失败";
       return {
         success: false,
         message: `订单同步失败: ${errorMessage}`,
-        orderUuid: (_d = this.store.currentOrder) == null ? void 0 : _d.uuid
+        orderUuid: (_e = this.store.currentOrder) == null ? void 0 : _e.uuid
       };
     }
   }
@@ -1715,9 +1785,11 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       this.logWarning("calculateRemainingAmountAsync: 没有当前订单");
       return "0.00";
     }
-    const totalAmount = new import_decimal.default(
-      this.store.currentOrder.total_amount || "0"
-    );
+    let totalAmount = new import_decimal.default(this.store.currentOrder.total_amount || "0");
+    const currentOrder = await this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
+    if ((currentOrder == null ? void 0 : currentOrder.is_deposit) && (currentOrder == null ? void 0 : currentOrder.deposit_amount) && Number(currentOrder == null ? void 0 : currentOrder.deposit_amount) > 0) {
+      totalAmount = new import_decimal.default(currentOrder == null ? void 0 : currentOrder.deposit_amount);
+    }
     const paidAmountStr = await this.calculatePaidAmountAsync();
     const paidAmount = new import_decimal.default(paidAmountStr);
     const remainingAmount = totalAmount.sub(paidAmount);
@@ -1757,7 +1829,28 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * 更新 stateAmount 为当前剩余未支付金额
    */
   async updateStateAmountToRemaining(checkOrder = true) {
+    var _a, _b, _c, _d;
     try {
+      if (((_a = this.store.currentOrder) == null ? void 0 : _a.is_deposit) === 1) {
+        const paymentItems = await this.payment.getPaymentItemsAsync((_b = this.store.currentOrder) == null ? void 0 : _b.uuid);
+        const depositPaidAmount = paymentItems.filter((item) => item.order_payment_type === "deposit" && item.status !== "voided").reduce((sum, item) => {
+          if (item.voucher_id && !item.isSynced) {
+            return sum;
+          }
+          const amount = new import_decimal.default(item.amount || "0");
+          const roundingAmount = new import_decimal.default(item.rounding_amount || "0");
+          return sum.add(amount.add(roundingAmount.abs()));
+        }, new import_decimal.default(0));
+        if (depositPaidAmount.gte((_c = this.store.currentOrder) == null ? void 0 : _c.deposit_amount)) {
+          this.store.currentOrder = {
+            ...this.store.currentOrder,
+            is_deposit: 0
+          };
+          await this.payment.updateOrderAsync((_d = this.store.currentOrder) == null ? void 0 : _d.uuid, {
+            is_deposit: 0
+          });
+        }
+      }
       const remainingAmount = await this.calculateRemainingAmountAsync();
       const currentStateAmount = this.store.stateAmount;
       if (remainingAmount !== currentStateAmount) {
@@ -1868,7 +1961,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @returns 包含订单ID、UUID和完整后端响应的对象
    */
   async syncOrderToBackendWithReturn(isManual = false, customPaymentItems) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     if (!this.store.localOrderData || !this.store.currentOrder) {
       throw new Error("缺少必要的订单数据，无法同步到后端");
     }
@@ -1896,42 +1989,23 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     });
     let finalDepositAmount;
     const manualDepositAmount = ((_a = this.store.currentOrder) == null ? void 0 : _a.deposit_amount) || "0.00";
-    const depositPaymentItems = processedPaymentItems.filter(
-      (item) => item.order_payment_type === "deposit" && item.status !== "voided"
-    );
-    const calculatedDepositAmount = depositPaymentItems.reduce((sum, item) => {
-      const amount = new import_decimal.default(item.amount || "0");
-      const roundingAmount = new import_decimal.default(item.rounding_amount || "0");
-      const effectiveAmount = amount.add(roundingAmount.abs());
-      return sum.add(effectiveAmount);
-    }, new import_decimal.default(0)).toFixed(2);
     const manualDepositValue = new import_decimal.default(manualDepositAmount);
-    const calculatedDepositValue = new import_decimal.default(calculatedDepositAmount);
     if (manualDepositValue.gt(0)) {
       finalDepositAmount = manualDepositAmount;
       this.logInfo("使用手动设置的定金金额", {
         manualDepositAmount,
-        calculatedDepositAmount,
         reason: "用户通过setDepositAmountAsync手动设置了定金金额"
       });
-    } else if (calculatedDepositValue.gt(0)) {
-      finalDepositAmount = calculatedDepositAmount;
-      this.logInfo("使用从支付项计算的定金金额", {
-        manualDepositAmount,
-        calculatedDepositAmount,
-        reason: "未手动设置定金金额，从定金类型支付项计算得出"
-      });
     } else {
       finalDepositAmount = "0.00";
       this.logInfo("定金金额为0", {
         manualDepositAmount,
-        calculatedDepositAmount,
         reason: "手动设置和计算值均为0"
       });
     }
     this.logInfo("定金金额确定结果", {
-      depositPaymentItemsCount: depositPaymentItems.length,
-      depositPaymentItems: depositPaymentItems.map((item) => ({
+      depositPaymentItemsCount: processedPaymentItems.length,
+      depositPaymentItems: processedPaymentItems.map((item) => ({
         uuid: item.uuid,
         code: item.code,
         amount: item.amount,
@@ -1940,7 +2014,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         status: item.status
       })),
       manualDepositAmount,
-      calculatedDepositAmount,
       finalDepositAmount,
       isDeposit: ((_b = this.store.currentOrder) == null ? void 0 : _b.is_deposit) || 0
     });
@@ -1963,11 +2036,28 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       currency_code: this.otherParams.currency_code,
       currency_symbol: this.otherParams.currency_symbol,
       currency_format: this.otherParams.currency_format,
-      is_deposit: ((_d = this.store.currentOrder) == null ? void 0 : _d.is_deposit) || 0,
+      is_deposit: (((_d = this.store.currentOrder) == null ? void 0 : _d.is_deposit) || Number(finalDepositAmount) > 0 ? 1 : 0) || 0,
       deposit_amount: finalDepositAmount,
       // 使用最终确定的定金金额（手动设置优先）
       product_tax_fee: this.store.localOrderData.tax_fee,
-      note: this.store.localOrderData.shop_note
+      note: this.store.localOrderData.shop_note,
+      bookings: (_e = this.store.localOrderData.bookings) == null ? void 0 : _e.map((item) => {
+        return {
+          ...item,
+          product: {
+            ...item.product,
+            custom_deposit_data: void 0
+          },
+          deposit: void 0
+        };
+      }),
+      relation_products: (_f = this.store.localOrderData.relation_products) == null ? void 0 : _f.map((item) => {
+        return {
+          ...item,
+          custom_deposit_data: void 0,
+          deposit: void 0
+        };
+      })
     };
     if (isUpdateOperation) {
       if ((0, import_utils.isVirtualOrderId)(currentOrderId)) {
@@ -2018,7 +2108,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         orderUuid: this.store.currentOrder.uuid,
         operation: isUpdateOperation ? "update" : "create",
         isManual,
-        orderId: submitSuccess ? ((_e = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _e.order_id) || (checkoutResponse == null ? void 0 : checkoutResponse.order_id) : void 0,
+        orderId: submitSuccess ? ((_g = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _g.order_id) || (checkoutResponse == null ? void 0 : checkoutResponse.order_id) : void 0,
         error: submitError,
         duration: Date.now() - startTime,
         timestamp: Date.now()
@@ -2044,7 +2134,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     if (isUpdateOperation) {
       realOrderId = currentOrderId;
     } else {
-      let extractedOrderId = (_f = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _f.order_id;
+      let extractedOrderId = (_h = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _h.order_id;
       if (!extractedOrderId) {
         extractedOrderId = checkoutResponse == null ? void 0 : checkoutResponse.order_id;
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.293",
+  "version": "0.0.295",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",