@pisell/pisellos 0.0.373 → 0.0.376

package/lib/modules/Payment/index.js

@@ -37,7 +37,7 @@ function formatAmount(amount) {
     const decimal = new import_decimal.Decimal(amount);
     return decimal.toFixed(2);
   } catch (error) {
-    console.warn(`[PaymentModule] \u91D1\u989D\u683C\u5F0F\u5316\u5931\u8D25: ${amount}\uFF0C\u4F7F\u7528\u9ED8\u8BA4\u503C 0.00`);
+    console.warn(`[PaymentModule] 金额格式化失败: ${amount}，使用默认值 0.00`);
     return "0.00";
   }
 }
@@ -54,25 +54,12 @@ function generateRequestUniqueId() {
   return `${year}${month}${day}${hour}${minute}${second}${millisecond}${randomDigits}`;
 }
 var PaymentModule = class extends import_BaseModule.BaseModule {
-  defaultName = "pay";
-  defaultVersion = "1.0.0";
-  request;
-  app;
-  // App instance
-  store;
-  window;
-  // WindowPlugin 实例
-  dbManager;
-  // IndexDBManager 实例
-  logger;
-  // LoggerManager 实例
-  otherParams = {};
-  // 支付方式实例
-  cash;
-  eftpos;
-  wallet;
   constructor(name, version) {
     super(name || "payment", version);
+    this.defaultName = "pay";
+    this.defaultVersion = "1.0.0";
+    // LoggerManager 实例
+    this.otherParams = {};
     this.cash = new import_cash.CashPaymentImpl(this);
     this.eftpos = new import_eftpos.EftposPaymentImpl(this);
     this.wallet = new import_walletpass.WalletPassPaymentImpl(this);
@@ -85,17 +72,17 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     const appPlugin = core.getPlugin("app");
     this.window = core.getPlugin("window");
     if (!this.request) {
-      throw new Error("\u652F\u4ED8\u6A21\u5757\u9700\u8981 request \u63D2\u4EF6\u652F\u6301");
+      throw new Error("支付模块需要 request 插件支持");
     }
     if (!appPlugin) {
-      throw new Error("\u652F\u4ED8\u6A21\u5757\u9700\u8981 app \u63D2\u4EF6\u652F\u6301");
+      throw new Error("支付模块需要 app 插件支持");
     }
     this.app = appPlugin.getApp();
     this.dbManager = this.app.dbManager;
     this.logger = this.app.logger;
     await this.ensurePaymentTables();
     this.registerNetworkHandlers();
-    console.log("[PaymentModule] \u521D\u59CB\u5316\u5B8C\u6210");
+    console.log("[PaymentModule] 初始化完成");
     this.logInfo("PaymentModule initialized successfully");
   }
   /**
@@ -170,7 +157,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     const network = this.app.plugins.get("network");
     this.logInfo("Registering network status listener");
     network == null ? void 0 : network.addListener("networkStatusChange", async (status) => {
-      console.log("\u7F51\u7EDC\u72B6\u6001:", status.connected);
+      console.log("网络状态:", status.connected);
       this.logInfo("Network status changed", {
         connected: status.connected,
         previousStatus: status.previousStatus
@@ -190,7 +177,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       try {
         cachedMethods = await this.dbManager.getAll("pay_method");
       } catch (dbError) {
-        console.warn("[PaymentModule] pay_method \u8868\u4E0D\u5B58\u5728\uFF0C\u5C06\u4ECE\u670D\u52A1\u5668\u83B7\u53D6\u6570\u636E");
+        console.warn("[PaymentModule] pay_method 表不存在，将从服务器获取数据");
       }
       const hasCache = cachedMethods.length > 0;
       if (hasCache) {
@@ -204,7 +191,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           await this.dbManager.update("pay_method", method);
         }
       } catch (dbError) {
-        console.warn("[PaymentModule] \u65E0\u6CD5\u7F13\u5B58\u652F\u4ED8\u65B9\u5F0F\uFF0Cpay_method \u8868\u4E0D\u5B58\u5728");
+        console.warn("[PaymentModule] 无法缓存支付方式，pay_method 表不存在");
       }
       await this.core.effects.emit(
         `${this.name}:onPaymentMethodsLoaded`,
@@ -216,7 +203,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       });
       return payMethods;
     } catch (error) {
-      console.error("[PaymentModule] \u83B7\u53D6\u652F\u4ED8\u65B9\u5F0F\u5217\u8868\u5931\u8D25", error);
+      console.error("[PaymentModule] 获取支付方式列表失败", error);
       this.logError("getPayMethodListAsync failed", error);
       return [];
     }
@@ -229,7 +216,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       cachedMethodsCount: cachedMethods.length
     });
     try {
-      console.log("[PaymentModule] \u540E\u53F0\u5237\u65B0\u652F\u4ED8\u65B9\u5F0F\u5217\u8868...");
+      console.log("[PaymentModule] 后台刷新支付方式列表...");
       const response = await this.request.get("/pay/custom-payment/available", { channel: "pos" });
       const newPayMethods = response.data || [];
       const hasChanges = this.hasPaymentMethodsChanged(
@@ -237,7 +224,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         newPayMethods
       );
       if (hasChanges) {
-        console.log("[PaymentModule] \u652F\u4ED8\u65B9\u5F0F\u5217\u8868\u5DF2\u66F4\u65B0");
+        console.log("[PaymentModule] 支付方式列表已更新");
         this.logInfo("Payment methods updated in background", {
           oldCount: cachedMethods.length,
           newCount: newPayMethods.length
@@ -250,7 +237,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
             await this.dbManager.update("pay_method", method);
           }
         } catch (dbError) {
-          console.warn("[PaymentModule] \u65E0\u6CD5\u66F4\u65B0\u652F\u4ED8\u65B9\u5F0F\u7F13\u5B58", dbError);
+          console.warn("[PaymentModule] 无法更新支付方式缓存", dbError);
         }
         const eventData = {
           oldMethods: cachedMethods,
@@ -261,10 +248,10 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           eventData
         );
       } else {
-        console.log("[PaymentModule] \u652F\u4ED8\u65B9\u5F0F\u5217\u8868\u65E0\u53D8\u5316");
+        console.log("[PaymentModule] 支付方式列表无变化");
       }
     } catch (error) {
-      console.error("[PaymentModule] \u540E\u53F0\u5237\u65B0\u652F\u4ED8\u65B9\u5F0F\u5931\u8D25", error);
+      console.error("[PaymentModule] 后台刷新支付方式失败", error);
     }
   }
   /**
@@ -283,7 +270,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         return true;
       }
       if (oldMethod.code !== newMethod.code || oldMethod.name !== newMethod.name || oldMethod.type !== newMethod.type || oldMethod.description !== newMethod.description || oldMethod.status !== newMethod.status || oldMethod.disable !== newMethod.disable || oldMethod.is_surcharge !== newMethod.is_surcharge || oldMethod.fixed !== newMethod.fixed || oldMethod.percentage !== newMethod.percentage || oldMethod.enabled !== newMethod.enabled || JSON.stringify(oldMethod.channel_application || []) !== JSON.stringify(newMethod.channel_application || []) || JSON.stringify(oldMethod.companies || []) !== JSON.stringify(newMethod.companies || []) || JSON.stringify(oldMethod.metadata || {}) !== JSON.stringify(newMethod.metadata || {})) {
-        console.log(`[PaymentModule] \u652F\u4ED8\u65B9\u5F0F ${newMethod.id} (${newMethod.code}) \u53D1\u751F\u53D8\u5316:`, {
+        console.log(`[PaymentModule] 支付方式 ${newMethod.id} (${newMethod.code}) 发生变化:`, {
           id: newMethod.id,
           changes: {
             code: oldMethod.code !== newMethod.code ? { old: oldMethod.code, new: newMethod.code } : void 0,
@@ -313,7 +300,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     try {
       return await this.dbManager.getAll("order");
     } catch (error) {
-      console.error("[PaymentModule] \u83B7\u53D6\u8BA2\u5355\u5217\u8868\u5931\u8D25", error);
+      console.error("[PaymentModule] 获取订单列表失败", error);
       return [];
     }
   }
@@ -324,7 +311,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     try {
       return await this.dbManager.get("order", orderUuid, true);
     } catch (error) {
-      console.error("[PaymentModule] \u83B7\u53D6\u652F\u4ED8\u8BA2\u5355\u5931\u8D25", error);
+      console.error("[PaymentModule] 获取支付订单失败", error);
       return null;
     }
   }
@@ -351,6 +338,27 @@ 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) {
+        newOrder.payment = params.existPayment.map((payment) => ({
+          ...payment,
+          isSynced: true,
+          // 标记为已同步
+          status: payment.status || "active"
+        }));
+        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
+          }))
+        });
+      }
       const dbAddStartTime = Date.now();
       await this.dbManager.add("order", newOrder, true);
       const dbAddDuration = Date.now() - dbAddStartTime;
@@ -367,7 +375,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       }, 0);
       return newOrder;
     } catch (error) {
-      console.error("[PaymentModule] \u521B\u5EFA\u652F\u4ED8\u8BA2\u5355\u5931\u8D25", error);
+      console.error("[PaymentModule] 创建支付订单失败", error);
       this.logError("createPaymentOrderAsync failed", error, {
         orderId: params.order_id
       });
@@ -383,10 +391,10 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       if (order) {
         await this.dbManager.delete("order", orderUuid);
         await this.core.effects.emit(`${this.name}:onOrderDeleted`, order);
-        console.log("[PaymentModule] \u652F\u4ED8\u8BA2\u5355\u5220\u9664\u6210\u529F:", orderUuid);
+        console.log("[PaymentModule] 支付订单删除成功:", orderUuid);
       }
     } catch (error) {
-      console.error("[PaymentModule] \u5220\u9664\u652F\u4ED8\u8BA2\u5355\u5931\u8D25", error);
+      console.error("[PaymentModule] 删除支付订单失败", error);
       throw error;
     }
   }
@@ -408,7 +416,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         });
       }
     } catch (error) {
-      console.error("[PaymentModule] \u66F4\u65B0\u8BA2\u5355\u5931\u8D25", error);
+      console.error("[PaymentModule] 更新订单失败", error);
       throw error;
     }
   }
@@ -442,7 +450,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           newOrderId,
           existingOrderUuid: duplicateOrder.uuid
         });
-        throw new Error(`\u8BA2\u5355ID ${newOrderId} \u5DF2\u5B58\u5728`);
+        throw new Error(`订单ID ${newOrderId} 已存在`);
       }
       const originalOrderId = existingOrder.id;
       const updatedOrder = {
@@ -474,10 +482,10 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         originalOrderId,
         newOrderId
       });
-      console.log(`[PaymentModule] \u8BA2\u5355ID\u66FF\u6362\u6210\u529F: ${originalOrderId} \u2192 ${newOrderId}`);
+      console.log(`[PaymentModule] 订单ID替换成功: ${originalOrderId} → ${newOrderId}`);
       return updatedOrder;
     } catch (error) {
-      console.error("[PaymentModule] \u66FF\u6362\u8BA2\u5355ID\u5931\u8D25", error);
+      console.error("[PaymentModule] 替换订单ID失败", error);
       this.logError("replaceOrderIdByUuidAsync failed", error, {
         orderUuid,
         newOrderId
@@ -524,11 +532,11 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       orderPaymentType: paymentItem.order_payment_type
     });
     try {
-      this.logInfo("\u51C6\u5907\u83B7\u53D6\u8BA2\u5355", {
+      this.logInfo("准备获取订单", {
         orderUuid
       });
       const order = await this.getPaymentOrderByUuidAsync(orderUuid);
-      this.logInfo("\u83B7\u53D6\u8BA2\u5355\u4FE1\u606F\u6210\u529F", {
+      this.logInfo("获取订单信息成功", {
         orderUuid,
         order
       });
@@ -544,7 +552,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       }, new import_decimal.Decimal(0));
       const expectedDepositAmount = new import_decimal.Decimal(order.deposit_amount || "0").sub(paidDepositAmount);
       if (expectAmount.lte(0) && expectedDepositAmount.eq(0)) {
-        const warningMessage = `\u8BA2\u5355 ${orderUuid} \u5F85\u4ED8\u91D1\u989D\u5DF2\u4E3A0\uFF0C\u4E0D\u5141\u8BB8\u6DFB\u52A0\u65B0\u7684\u652F\u4ED8\u9879`;
+        const warningMessage = `订单 ${orderUuid} 待付金额已为0，不允许添加新的支付项`;
         console.warn("[PaymentModule] Payment lock triggered:", {
           orderUuid,
           expectAmount: order.expect_amount,
@@ -588,12 +596,12 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       };
       order.payment.push(newPaymentItem);
       this.recalculateOrderAmount(order);
-      this.logInfo("\u5F00\u59CB\u66F4\u65B0\u8BA2\u5355\u652F\u4ED8\u9879", {
+      this.logInfo("开始更新订单支付项", {
         orderUuid,
         order
       });
       await this.dbManager.update("order", order, true);
-      this.logInfo("\u66F4\u65B0\u8BA2\u5355\u652F\u4ED8\u9879\u5B8C\u6210", {
+      this.logInfo("更新订单支付项完成", {
         orderUuid
       });
       this.core.effects.emit(`${this.name}:onPaymentAdded`, {
@@ -614,7 +622,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         changeGivenAmount: (_d = newPaymentItem.metadata) == null ? void 0 : _d.change_given_amount
       });
     } catch (error) {
-      console.error("[PaymentModule] \u6DFB\u52A0\u652F\u4ED8\u9879\u5931\u8D25", error);
+      console.error("[PaymentModule] 添加支付项失败", error);
       this.logError("addPaymentItemAsync failed", error, {
         orderUuid,
         paymentItem
@@ -630,22 +638,22 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     try {
       const order = await this.dbManager.get("order", orderUuid);
       if (!order) {
-        throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728");
+        throw new Error("订单不存在");
       }
       const paymentItem = order.payment.find(
         (payment) => payment.uuid === paymentUuid
       );
       if (!paymentItem) {
-        throw new Error(`\u652F\u4ED8\u9879\u4E0D\u5B58\u5728: ${paymentUuid}`);
+        throw new Error(`支付项不存在: ${paymentUuid}`);
       }
       if (paymentItem.status === "voided") {
-        console.warn(`[PaymentModule] \u652F\u4ED8\u9879 ${paymentUuid} \u5DF2\u7ECF\u88AB\u5220\u9664\uFF0C\u8DF3\u8FC7\u64CD\u4F5C`);
+        console.warn(`[PaymentModule] 支付项 ${paymentUuid} 已经被删除，跳过操作`);
         return;
       }
       paymentItem.status = "voided";
       paymentItem.origin_amount = paymentItem.amount;
       paymentItem.amount = "0.00";
-      console.log(`[PaymentModule] \u652F\u4ED8\u9879\u6807\u8BB0\u4E3A\u5220\u9664:`, {
+      console.log(`[PaymentModule] 支付项标记为删除:`, {
         uuid: paymentItem.uuid,
         originalAmount: paymentItem.origin_amount,
         status: paymentItem.status
@@ -668,7 +676,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         newExpectAmount: order.expect_amount
       });
     } catch (error) {
-      console.error("[PaymentModule] \u5220\u9664\u652F\u4ED8\u9879\u5931\u8D25", error);
+      console.error("[PaymentModule] 删除支付项失败", error);
       this.logError("deletePaymentAsync failed", error, {
         orderUuid,
         paymentUuid
@@ -696,12 +704,12 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     try {
       const order = await this.getPaymentOrderByUuidAsync(orderUuid);
       if (!order) {
-        throw new Error(`\u8BA2\u5355\u4E0D\u5B58\u5728: ${orderUuid}`);
+        throw new Error(`订单不存在: ${orderUuid}`);
       }
       const existingVoucherItems = order.payment.filter(
         (payment) => payment.voucher_id && payment.status !== "voided" && !payment.isSynced
       );
-      console.log("[PaymentModule] \u53D1\u73B0\u73B0\u6709\u4EE3\u91D1\u5238\u652F\u4ED8\u9879:", {
+      console.log("[PaymentModule] 发现现有代金券支付项:", {
         orderUuid,
         existingVoucherCount: existingVoucherItems.length,
         existingItems: existingVoucherItems.map((item) => ({
@@ -713,18 +721,18 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         }))
       });
       for (const voucherItem of existingVoucherItems) {
-        console.log(`[PaymentModule] \u5220\u9664\u73B0\u6709\u4EE3\u91D1\u5238\u652F\u4ED8\u9879: ${voucherItem.uuid}`);
+        console.log(`[PaymentModule] 删除现有代金券支付项: ${voucherItem.uuid}`);
         await this.deletePaymentAsync(orderUuid, voucherItem.uuid);
       }
-      console.log("[PaymentModule] \u6DFB\u52A0\u65B0\u7684\u4EE3\u91D1\u5238\u652F\u4ED8\u9879:", {
+      console.log("[PaymentModule] 添加新的代金券支付项:", {
         orderUuid,
         newItemCount: voucherPaymentItems.length
       });
       for (const voucherItem of voucherPaymentItems) {
         if (!voucherItem.voucher_id) {
-          throw new Error(`\u4EE3\u91D1\u5238\u652F\u4ED8\u9879\u7F3A\u5C11 voucher_id: ${JSON.stringify(voucherItem)}`);
+          throw new Error(`代金券支付项缺少 voucher_id: ${JSON.stringify(voucherItem)}`);
         }
-        console.log(`[PaymentModule] \u6DFB\u52A0\u4EE3\u91D1\u5238\u652F\u4ED8\u9879:`, {
+        console.log(`[PaymentModule] 添加代金券支付项:`, {
           code: voucherItem.code,
           amount: voucherItem.amount,
           voucher_id: voucherItem.voucher_id,
@@ -746,7 +754,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         finalExpectAmount: updatedOrder == null ? void 0 : updatedOrder.expect_amount
       });
     } catch (error) {
-      console.error("[PaymentModule] \u6279\u91CF\u66F4\u65B0\u4EE3\u91D1\u5238\u652F\u4ED8\u9879\u5931\u8D25:", error);
+      console.error("[PaymentModule] 批量更新代金券支付项失败:", error);
       this.logError("updateVoucherPaymentItemsAsync failed", error, {
         orderUuid,
         voucherPaymentItems
@@ -761,7 +769,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     try {
       const order = await this.dbManager.get("order", orderUuid);
       if (!order) {
-        throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728");
+        throw new Error("订单不存在");
       }
       const paymentItem = order.payment.find(
         (payment) => payment.uuid === paymentUuid
@@ -785,7 +793,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         });
       }
     } catch (error) {
-      console.error("[PaymentModule] \u66F4\u65B0\u652F\u4ED8\u9879\u5931\u8D25", error);
+      console.error("[PaymentModule] 更新支付项失败", error);
       throw error;
     }
   }
@@ -815,7 +823,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       });
       return result;
     } catch (error) {
-      console.error("[PaymentModule] \u63D0\u4EA4\u652F\u4ED8\u5931\u8D25", error);
+      console.error("[PaymentModule] 提交支付失败", error);
       this.logError("submitPayAsync failed", error, { orderUuid });
       return { status: "failed" };
     }
@@ -848,18 +856,18 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       if (totalPaidAmount.gte(orderTotalAmount)) {
         order.payment_status = import_types.PaymentStatus.Finished;
         console.log(
-          `[PaymentModule] \u8BA2\u5355 ${order.uuid} \u652F\u4ED8\u5B8C\u6210\uFF0C\u91D1\u989D: ${totalPaidAmount.toString()}/${orderTotalAmount.toString()}`
+          `[PaymentModule] 订单 ${order.uuid} 支付完成，金额: ${totalPaidAmount.toString()}/${orderTotalAmount.toString()}`
         );
       } else {
         order.payment_status = import_types.PaymentStatus.PartiallyPaid;
         console.log(
-          `[PaymentModule] \u8BA2\u5355 ${order.uuid} \u90E8\u5206\u652F\u4ED8\uFF0C\u91D1\u989D: ${totalPaidAmount.toString()}/${orderTotalAmount.toString()}`
+          `[PaymentModule] 订单 ${order.uuid} 部分支付，金额: ${totalPaidAmount.toString()}/${orderTotalAmount.toString()}`
         );
       }
       paymentData.payment_status = order.payment_status === import_types.PaymentStatus.Finished ? "paid" : "partially_paid";
       await this.dbManager.update("order", order);
       if (paymentData.payments.length === 0) {
-        console.log(`[PaymentModule] \u8BA2\u5355 ${order.uuid} \u652F\u4ED8\u5217\u8868\u4E3A\u7A7A\uFF0C\u8DF3\u8FC7\u652F\u4ED8\u5904\u7406`);
+        console.log(`[PaymentModule] 订单 ${order.uuid} 支付列表为空，跳过支付处理`);
         this.logWarning("Empty payment list", {
           orderUuid: order.uuid,
           orderId: order.order_id
@@ -872,7 +880,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         order
       });
     } catch (error) {
-      console.error(`[PaymentModule] \u8BA2\u5355 ${order.uuid} \u652F\u4ED8\u63D0\u4EA4\u5931\u8D25`, error);
+      console.error(`[PaymentModule] 订单 ${order.uuid} 支付提交失败`, error);
       throw error;
     }
   }
@@ -882,7 +890,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   async getRemainingOrderAmountAsync(orderUuid) {
     const order = await this.getPaymentOrderByUuidAsync(orderUuid);
     if (!order) {
-      throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728");
+      throw new Error("订单不存在");
     }
     return new import_decimal.Decimal(order.expect_amount).toNumber();
   }
@@ -892,7 +900,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   async getRemainingOrderAmountWithInputAsync(inputAmount, orderUuid) {
     const order = await this.getPaymentOrderByUuidAsync(orderUuid);
     if (!order) {
-      throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728");
+      throw new Error("订单不存在");
     }
     if (inputAmount === null || inputAmount === void 0) {
       return new import_decimal.Decimal(order.expect_amount).toNumber();
@@ -905,7 +913,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     if (typeof inputAmount === "number") {
       if (isNaN(inputAmount) || !isFinite(inputAmount)) {
         console.warn(
-          `[PaymentModule] \u8F93\u5165\u91D1\u989D\u4E0D\u662F\u6709\u6548\u6570\u5B57: ${inputAmount}\uFF0C\u8FD4\u56DE\u539F\u59CB\u5F85\u4ED8\u91D1\u989D`
+          `[PaymentModule] 输入金额不是有效数字: ${inputAmount}，返回原始待付金额`
         );
         return new import_decimal.Decimal(order.expect_amount).toNumber();
       }
@@ -915,7 +923,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       return new import_decimal.Decimal(order.expect_amount).minus(inputDecimal).toNumber();
     } catch (error) {
       console.warn(
-        `[PaymentModule] \u8F93\u5165\u91D1\u989D\u683C\u5F0F\u65E0\u6548: ${inputAmount}\uFF0C\u8FD4\u56DE\u539F\u59CB\u5F85\u4ED8\u91D1\u989D`
+        `[PaymentModule] 输入金额格式无效: ${inputAmount}，返回原始待付金额`
       );
       return new import_decimal.Decimal(order.expect_amount).toNumber();
     }
@@ -936,7 +944,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           const effectiveAmount = paymentAmount.plus(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
           return sum.plus(effectiveAmount);
         } catch (error) {
-          console.warn(`[PaymentModule] \u65E0\u6548\u7684\u652F\u4ED8\u91D1\u989D: amount=${payment.amount}, rounding_amount=${payment.rounding_amount}\uFF0C\u8DF3\u8FC7\u8BA1\u7B97`);
+          console.warn(`[PaymentModule] 无效的支付金额: amount=${payment.amount}, rounding_amount=${payment.rounding_amount}，跳过计算`);
           return sum;
         }
       },
@@ -944,7 +952,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     );
     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] \u91CD\u65B0\u8BA1\u7B97\u8BA2\u5355\u91D1\u989D:`, {
+    console.log(`[PaymentModule] 重新计算订单金额:`, {
       orderUuid: order.uuid,
       totalAmount: order.total_amount,
       effectivePaidAmount: paidAmount.toFixed(2),
@@ -957,7 +965,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         rounding_amount: p.rounding_amount || "0.00",
         effective_amount: new import_decimal.Decimal(p.amount || 0).plus(new import_decimal.Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || 0).abs()).toFixed(2)
       })),
-      \u8BF4\u660E: "\u6709\u6548\u652F\u4ED8\u91D1\u989D\u5305\u542B\u62B9\u96F6\u8BA1\u7B97\uFF08amount + |rounding_amount|\uFF09"
+      说明: "有效支付金额包含抹零计算（amount + |rounding_amount|）"
     });
   }
   /**
@@ -970,7 +978,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         (method) => method.code === import_types.PaymentMethodType.Cash
       ) || null;
     } catch (error) {
-      console.error("[PaymentModule] \u83B7\u53D6\u73B0\u91D1\u652F\u4ED8\u65B9\u5F0F\u5931\u8D25", error);
+      console.error("[PaymentModule] 获取现金支付方式失败", error);
       return null;
     }
   }
@@ -984,7 +992,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         (method) => method.code === import_types.PaymentMethodType.Eftpos
       ) || null;
     } catch (error) {
-      console.error("[PaymentModule] \u83B7\u53D6Eftpos\u652F\u4ED8\u65B9\u5F0F\u5931\u8D25", error);
+      console.error("[PaymentModule] 获取Eftpos支付方式失败", error);
       return null;
     }
   }
@@ -998,7 +1006,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         (method) => method.code === import_types.PaymentMethodType.Wallet
       ) || null;
     } catch (error) {
-      console.error("[PaymentModule] \u83B7\u53D6\u94B1\u5305\u652F\u4ED8\u65B9\u5F0F\u5931\u8D25", error);
+      console.error("[PaymentModule] 获取钱包支付方式失败", error);
       return null;
     }
   }
@@ -1010,7 +1018,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       await this.dbManager.getAll("pay_method");
     } catch (error) {
       console.warn(
-        "[PaymentModule] pay_method \u8868\u4E0D\u5B58\u5728\uFF0C\u8BF7\u5728\u6570\u636E\u5E93\u914D\u7F6E\u4E2D\u6DFB\u52A0\u4EE5\u4E0B\u914D\u7F6E\uFF1A"
+        "[PaymentModule] pay_method 表不存在，请在数据库配置中添加以下配置："
       );
       console.warn('{ name: "pay_method", keyPath: "id" }');
     }
@@ -1018,7 +1026,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       await this.dbManager.getAll("order");
     } catch (error) {
       console.warn(
-        "[PaymentModule] order \u8868\u4E0D\u5B58\u5728\uFF0C\u8BF7\u5728\u6570\u636E\u5E93\u914D\u7F6E\u4E2D\u6DFB\u52A0\u4EE5\u4E0B\u914D\u7F6E\uFF1A"
+        "[PaymentModule] order 表不存在，请在数据库配置中添加以下配置："
       );
       console.warn('{ name: "order", keyPath: "uuid" }');
     }
@@ -1033,7 +1041,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         (order) => order.payment_status === import_types.PaymentStatus.PartiallyPaid
       );
     } catch (error) {
-      console.error("[PaymentModule] \u83B7\u53D6\u90E8\u5206\u652F\u4ED8\u8BA2\u5355\u5931\u8D25", error);
+      console.error("[PaymentModule] 获取部分支付订单失败", error);
       return [];
     }
   }
@@ -1053,15 +1061,15 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       const amount = new import_decimal.Decimal(originalAmount);
       const roundingInterval = new import_decimal.Decimal(interval);
       if (roundingInterval.lte(0)) {
-        throw new Error("\u820D\u5165\u95F4\u9694\u5FC5\u987B\u5927\u4E8E 0");
+        throw new Error("舍入间隔必须大于 0");
       }
       const supportedIntervals = [0.05, 0.1, 0.5, 1];
       const intervalValue = roundingInterval.toNumber();
       if (!supportedIntervals.includes(intervalValue)) {
-        console.warn(`[PaymentModule] \u4E0D\u652F\u6301\u7684\u820D\u5165\u95F4\u9694: ${intervalValue}, \u652F\u6301\u7684\u95F4\u9694: ${supportedIntervals.join(", ")}`);
+        console.warn(`[PaymentModule] 不支持的舍入间隔: ${intervalValue}, 支持的间隔: ${supportedIntervals.join(", ")}`);
       }
       const baseValue = amount.div(roundingInterval);
-      console.log(`[PaymentModule] \u820D\u5165\u8BA1\u7B97 - \u539F\u59CB\u91D1\u989D: ${amount.toString()}, \u95F4\u9694: ${intervalValue}, \u57FA\u7840\u503C: ${baseValue.toString()}, \u89C4\u5219: ${rule}`);
+      console.log(`[PaymentModule] 舍入计算 - 原始金额: ${amount.toString()}, 间隔: ${intervalValue}, 基础值: ${baseValue.toString()}, 规则: ${rule}`);
       let roundedValue;
       switch (rule) {
         case import_types.RoundingRule.Standard:
@@ -1081,12 +1089,12 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           roundedValue = baseValue.floor();
           break;
         default:
-          throw new Error(`\u4E0D\u652F\u6301\u7684\u820D\u5165\u89C4\u5219: ${rule}`);
+          throw new Error(`不支持的舍入规则: ${rule}`);
       }
       const finalAmount = roundedValue.mul(roundingInterval);
       const originalAmountStr = amount.toFixed(2);
       if (finalAmount.eq(0)) {
-        console.log(`[PaymentModule] \u6700\u7EC8\u91D1\u989D\u4E3A0\uFF0C\u8FD4\u56DE\u539F\u59CB\u91D1\u989D: ${originalAmountStr}`);
+        console.log(`[PaymentModule] 最终金额为0，返回原始金额: ${originalAmountStr}`);
         return {
           originalAmount: originalAmountStr,
           roundedAmount: originalAmountStr,
@@ -1096,15 +1104,15 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       const roundedAmountStr = finalAmount.toFixed(2);
       const roundingDifference = finalAmount.sub(amount);
       const roundingDifferenceStr = roundingDifference.toFixed(2);
-      console.log(`[PaymentModule] \u820D\u5165\u7ED3\u679C - \u539F\u59CB\u91D1\u989D: ${originalAmountStr}, \u820D\u5165\u540E\u91D1\u989D: ${roundedAmountStr}, \u820D\u5165\u5DEE\u989D: ${roundingDifferenceStr}`);
+      console.log(`[PaymentModule] 舍入结果 - 原始金额: ${originalAmountStr}, 舍入后金额: ${roundedAmountStr}, 舍入差额: ${roundingDifferenceStr}`);
       return {
         originalAmount: originalAmountStr,
         roundedAmount: roundedAmountStr,
         roundingDifference: roundingDifferenceStr
       };
     } catch (error) {
-      console.error("[PaymentModule] \u91D1\u989D\u820D\u5165\u5931\u8D25:", error);
-      throw new Error(`\u91D1\u989D\u820D\u5165\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`);
+      console.error("[PaymentModule] 金额舍入失败:", error);
+      throw new Error(`金额舍入失败: ${error instanceof Error ? error.message : String(error)}`);
     }
   }
   /**

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

@@ -200,6 +200,8 @@ export interface PushOrderParams {
     deposit_amount?: string;
     /** 原始订单数据（可选，由 Checkout 模块传入） */
     order_info?: any;
+    /** 云端已存在的支付项（可选，用于处理订单在其他设备或云端生成的场景） */
+    existPayment?: PaymentItem[];
 }
 /**
  * 更新订单参数
@@ -581,12 +583,12 @@ export declare enum PaymentHooks {
     OnOrderAmountChanged = "payment:onOrderAmountChanged",
     OnPaymentSyncError = "payment:onPaymentSyncError",
     OnPaymentSyncSuccess = "payment:onPaymentSyncSuccess",
-    OnWalletRecommendListUpdated = 0,
-    OnWalletRecommendListCleared = 0,
-    OnUserIdentificationCodesUpdated = 0,
-    OnUserIdentificationCodesCleared = 0,
-    OnWalletCacheCleared = 0,
-    OnSearchIdentificationCodeCompleted = 0
+    OnWalletRecommendListUpdated = "wallet:onWalletRecommendListUpdated",
+    OnWalletRecommendListCleared = "wallet:onWalletRecommendListCleared",
+    OnUserIdentificationCodesUpdated = "wallet:onUserIdentificationCodesUpdated",
+    OnUserIdentificationCodesCleared = "wallet:onUserIdentificationCodesCleared",
+    OnWalletCacheCleared = "wallet:onWalletCacheCleared",
+    OnSearchIdentificationCodeCompleted = "wallet:onSearchIdentificationCodeCompleted"
 }
 /**
  * 钱包推荐扣款请求参数
@@ -749,7 +751,7 @@ export interface SearchIdentificationCodeResponse {
 /**
  * 搜索识别码结果类型
  */
-export declare type SearchIdentificationCodeResult = {
+export type SearchIdentificationCodeResult = {
     type: 'walletCode';
     data: SearchIdentificationCodeItem[];
 } | {

package/lib/modules/Payment/utils.js

@@ -49,9 +49,12 @@ var sortUserIdentificationCodeList = (list) => {
       var _a;
       const errorCode = (_a = item.unified_error_code) == null ? void 0 : _a.toString();
       const availableStatus = item.unified_available_status;
-      if (errorCode && middlePriorityErrorCodes.includes(errorCode)) return 2;
-      if (availableStatus === 0) return 3;
-      if (availableStatus === 1) return 1;
+      if (errorCode && middlePriorityErrorCodes.includes(errorCode))
+        return 2;
+      if (availableStatus === 0)
+        return 3;
+      if (availableStatus === 1)
+        return 1;
       return 0;
     };
     const aPriority = getPriority(a);