@pisell/pisellos 2.2.1 → 2.2.3

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(
-          `${this.name}: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);
+      setTimeout(() => {
         this.core.effects.emit(`${this.name}:onOrderAdded`, newOrder);
-        this.logInfo("createPaymentOrderAsync completed - new payment order created", {
-          orderUuid: newOrder.uuid,
-          orderId: newOrder.id
-        });
-        return newOrder;
-      }
+      }, 0);
+      return newOrder;
     } catch (error) {
       console.error("[PaymentModule] 创建支付订单失败", error);
       this.logError("createPaymentOrderAsync failed", error, {

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/lib/plugins/request.d.ts

@@ -35,6 +35,23 @@ export interface RequestPlugin extends Plugin {
      */
     request: <T = any>(options: RequestOptions) => Promise<T>;
 }
+export declare enum RequestModeENUM {
+    LOCAL = "local",
+    REMOTE = "remote",
+    LOCAL_REMOTE = "local_remote",
+    REMOTE_LOCAL = "remote_local",
+    OS_SERVER = "os_server"
+}
+export type RequestModeType = RequestModeENUM.LOCAL | RequestModeENUM.REMOTE | RequestModeENUM.LOCAL_REMOTE | RequestModeENUM.REMOTE_LOCAL | RequestModeENUM.OS_SERVER;
+export type CacheType = 'memory' | 'storage' | 'indexDB';
+export interface CacheProps {
+    key?: string;
+    type?: CacheType;
+    updateCache?: boolean;
+    cacheUpdateChange?: (data: any) => void;
+    mode?: RequestModeType;
+    cacheKeyData?: any;
+}
 /**
  * 请求配置
  */
@@ -49,6 +66,7 @@ export interface RequestOptions {
     responseType?: 'json' | 'text' | 'arraybuffer' | 'blob';
     withCredentials?: boolean;
     useCache?: boolean;
+    cache?: CacheProps;
     osServer?: boolean;
 }
 /**

package/lib/plugins/request.js

@@ -20,9 +20,18 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var request_exports = {};
 __export(request_exports, {
   RequestError: () => RequestError,
+  RequestModeENUM: () => RequestModeENUM,
   default: () => request_default
 });
 module.exports = __toCommonJS(request_exports);
+var RequestModeENUM = /* @__PURE__ */ ((RequestModeENUM2) => {
+  RequestModeENUM2["LOCAL"] = "local";
+  RequestModeENUM2["REMOTE"] = "remote";
+  RequestModeENUM2["LOCAL_REMOTE"] = "local_remote";
+  RequestModeENUM2["REMOTE_LOCAL"] = "remote_local";
+  RequestModeENUM2["OS_SERVER"] = "os_server";
+  return RequestModeENUM2;
+})(RequestModeENUM || {});
 var RequestError = class extends Error {
   constructor(message, config, request, response) {
     super(message);
@@ -314,5 +323,6 @@ var RequestPluginImpl = class {
 var request_default = new RequestPluginImpl();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  RequestError
+  RequestError,
+  RequestModeENUM
 });

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

@@ -24,6 +24,7 @@ __export(products_exports, {
 module.exports = __toCommonJS(products_exports);
 var import_BaseModule = require("../../../modules/BaseModule");
 var import_lodash_es = require("lodash-es");
+var import_plugins = require("../../../plugins");
 var import_types = require("./types");
 var import_product = require("../../utils/product");
 var INDEXDB_STORE_NAME = "products";
@@ -86,7 +87,13 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         customer_id,
         schedule_date
       },
-      { useCache: true }
+      {
+        cache: {
+          mode: import_plugins.RequestModeENUM.REMOTE_LOCAL,
+          updateCache: true,
+          type: "indexDB"
+        }
+      }
     );
     return productsData.data;
   }

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/Checkout/index.d.ts

@@ -19,6 +19,7 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
     private store;
     private otherParams;
     private logger;
+    private calculationCache;
     order: OrderModule;
     payment: PaymentModule;
     constructor(name?: string, version?: string);
@@ -302,16 +303,46 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 删除本地 IndexDB 中超过指定天数且已同步到后端的订单数据
      */
     private cleanupExpiredOrdersAsync;
+    /**
+     * 清除计算缓存
+     */
+    private clearCalculationCache;
+    /**
+     * 批量获取订单数据（用于性能优化）
+     * 一次性获取所有需要的数据，避免重复查询
+     */
+    private fetchOrderDataBatch;
+    /**
+     * 从支付项数组计算已支付金额（纯计算，不查询数据库）
+     */
+    private calculatePaidAmountFromItems;
     /**
      * 计算已支付金额（从 Payment 模块获取最新数据）
+     *
+     * 注意：此方法保持独立性，可以单独调用。
+     * 在 updateStateAmountToRemaining 等批量操作中会使用缓存优化。
      */
     private calculatePaidAmountAsync;
+    /**
+     * 从订单和支付项计算剩余金额（纯计算，不查询数据库）
+     */
+    private calculateRemainingAmountFromData;
+    /**
+     * 从订单和支付项计算剩余总金额（纯计算，排除定金）
+     */
+    private calculateRemainingTotalAmountFromData;
     /**
      * 计算剩余未支付金额（从 Payment 模块获取最新数据）
+     *
+     * 注意：此方法保持独立性，可以单独调用。
+     * 在 updateStateAmountToRemaining 等批量操作中会使用缓存优化。
      */
     private calculateRemainingAmountAsync;
     /**
      * 计算剩余未支付金额（排除定金计算，始终使用订单总金额）
+     *
+     * 注意：此方法保持独立性，可以单独调用。
+     * 在 updateStateAmountToRemaining 等批量操作中会使用缓存优化。
      */
     private calculateRemainingTotalAmountAsync;
     /**
@@ -320,12 +351,24 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
     private updateBalanceDueAmount;
     /**
      * 更新 stateAmount 为当前剩余未支付金额
+     *
+     * 优化版本：批量获取数据，避免重复查询数据库
      */
     private updateStateAmountToRemaining;
+    /**
+     * 检查订单支付是否完成（优化版，复用已获取的数据）
+     *
+     * @param paymentItems 已获取的支付项数据
+     * @param remainingAmount 已计算的剩余金额
+     */
+    private checkOrderPaymentCompletionOptimized;
     /**
      * 检查订单支付是否完成
      *
      * 当剩余待付款金额 <= 0 时，触发订单支付完成事件
+     *
+     * 注意：此方法保持独立性，可以单独调用。
+     * 在 updateStateAmountToRemaining 中会使用优化版本。
      */
     private checkOrderPaymentCompletion;
     /**
@@ -381,6 +424,8 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 重置 store 状态
      *
      * 在创建新订单前调用，确保状态完全干净
+     *
+     * 🚀 性能优化：改为同步方法，事件发射不阻塞主流程
      */
-    private resetStoreStateAsync;
+    private resetStoreState;
 }