@pisell/pisellos 2.1.29 → 2.1.31

package/lib/modules/Payment/index.js

@@ -323,48 +323,35 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       totalAmount: params.total_amount
     });
     try {
-      const existingOrder = await this.dbManager.get("order", params.order_id);
-      this.logInfo("createPaymentOrderAsync existingOrder", {
-        existingOrder
+      const newOrder = {
+        uuid: (0, import_utils.getUniqueId)("pay_order_"),
+        id: params.order_id,
+        order_id: params.order_id,
+        order_info: params.order_info,
+        payment_status: import_types.PaymentStatus.Processing,
+        payment: [],
+        adjust_offline_payments: [],
+        total_amount: params.total_amount,
+        expect_amount: params.total_amount,
+        tax_fee: "0.00",
+        is_deposit: params.is_deposit || 0,
+        deposit_amount: params.deposit_amount || "0.00"
+      };
+      const dbAddStartTime = Date.now();
+      await this.dbManager.add("order", newOrder);
+      const dbAddDuration = Date.now() - dbAddStartTime;
+      this.logInfo("Database add operation completed", {
+        operation: "dbManager.add",
+        table: "order",
+        orderUuid: newOrder.uuid,
+        orderId: newOrder.order_id,
+        duration: `${dbAddDuration}ms`,
+        performance: dbAddDuration > 100 ? "slow" : dbAddDuration > 50 ? "medium" : "fast"
       });
-      if (existingOrder) {
-        this.logInfo(
-          `createPaymentOrderAsync found duplicate order ID: ${params.order_id}, updating existing payment order`
-        );
-        existingOrder.order_info = params.order_info;
-        existingOrder.total_amount = params.total_amount;
-        existingOrder.is_deposit = params.is_deposit || 0;
-        existingOrder.deposit_amount = params.deposit_amount || "0.00";
-        this.recalculateOrderAmount(existingOrder);
-        await this.dbManager.update("order", existingOrder);
-        await this.core.effects.emit(
-          import_types.PaymentHooks.OnOrderUpdated,
-          existingOrder
-        );
-        return existingOrder;
-      } else {
-        const newOrder = {
-          uuid: (0, import_utils.getUniqueId)("pay_order_"),
-          id: params.order_id,
-          order_id: params.order_id,
-          order_info: params.order_info,
-          payment_status: import_types.PaymentStatus.Processing,
-          payment: [],
-          adjust_offline_payments: [],
-          total_amount: params.total_amount,
-          expect_amount: params.total_amount,
-          tax_fee: "0.00",
-          is_deposit: params.is_deposit || 0,
-          deposit_amount: params.deposit_amount || "0.00"
-        };
-        await this.dbManager.add("order", newOrder);
-        this.core.effects.emit(import_types.PaymentHooks.OnOrderAdded, newOrder);
-        this.logInfo("createPaymentOrderAsync completed - new payment order created", {
-          orderUuid: newOrder.uuid,
-          orderId: newOrder.id
-        });
-        return newOrder;
-      }
+      setTimeout(() => {
+        this.core.effects.emit(`${this.name}:onOrderAdded`, newOrder);
+      }, 0);
+      return newOrder;
     } catch (error) {
       console.error("[PaymentModule] 创建支付订单失败", error);
       this.logError("createPaymentOrderAsync failed", error, {

package/lib/modules/ProductList/index.js

@@ -96,9 +96,10 @@ var ProductList = class extends import_BaseModule.BaseModule {
         with_count,
         // client_schedule_ids: schedule_ids,
         schedule_date,
+        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
+        is_eject: 1,
         with_schedule,
-        schedule_datetime,
-        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel
+        schedule_datetime
       },
       { useCache: true }
     );

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

@@ -324,9 +324,25 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         success: boolean;
         minAvailableCount: number;
     };
+    /**
+     * 将 ProductData 转换为 CartItem，但不添加到购物车
+     * 参考 addProductToCart 方法的实现
+     */
+    private convertProductToCartItem;
+    checkMaxDurationCapacityForDetailNums({ product, date, account, }: {
+        product: ProductData;
+        date?: {
+            startTime: string;
+            endTime: string;
+        } | null;
+        account?: Account | null;
+    }): {
+        success: boolean;
+        minAvailableCount: number;
+    };
     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
      *