@pisell/pisellos 0.0.254 → 0.0.256

package/lib/solution/Checkout/index.js

@@ -45,7 +45,12 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     if (!this.request) {
       throw new Error("Checkout 解决方案需要 request 插件支持");
     }
-    this.logger = core.getPlugin("logger");
+    const appPlugin = core.getPlugin("app");
+    if (!appPlugin) {
+      throw new Error("Checkout 解决方案需要 app 插件支持");
+    }
+    const app = appPlugin.getApp();
+    this.logger = app.logger;
     this.order = new import_Order.OrderModule();
     this.payment = new import_Payment.PaymentModule();
     this.store = {
@@ -874,6 +879,10 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       if (oldAmount === formattedAmount) {
         return;
       }
+      this.logger.info("[Checkout] 设置自定义支付金额:", {
+        oldAmount,
+        newAmount: formattedAmount
+      });
       this.store.stateAmount = formattedAmount;
       await this.core.effects.emit(import_types.CheckoutHooks.OnStateAmountChanged, {
         oldAmount,
@@ -997,7 +1006,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @throws 当前没有活跃订单时抛出错误
    */
   async addPaymentItemAsync(paymentItem) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     this.logInfo("addPaymentItemAsync called", {
       paymentCode: paymentItem.code,
       paymentType: paymentItem.type,
@@ -1018,13 +1027,14 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         );
       }
       const orderPaymentType = this.store.currentOrder.is_deposit === 1 ? "deposit" : "normal";
+      const processedPaymentItem = await this.processCashPaymentItem(paymentItem);
       const metadata = {
-        ...paymentItem.metadata,
+        ...processedPaymentItem.metadata,
         rounding_rule: this.otherParams.order_rounding_setting,
         shop_wallet_pass_id: this.otherParams.shop_wallet_pass_id
       };
       const paymentItemWithType = {
-        ...paymentItem,
+        ...processedPaymentItem,
         order_payment_type: orderPaymentType,
         metadata
       };
@@ -1042,14 +1052,20 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           metadata: paymentItemWithType.metadata
         },
         orderDepositStatus: this.store.currentOrder.is_deposit,
-        calculatedOrderPaymentType: orderPaymentType
+        calculatedOrderPaymentType: orderPaymentType,
+        // 现金支付找零详情
+        isCashPayment: this.isCashPayment(paymentItem.code, paymentItem.type),
+        originalAmount: paymentItem.amount,
+        processedAmount: paymentItemWithType.amount,
+        actualPaidAmount: (_c = paymentItemWithType.metadata) == null ? void 0 : _c.actual_paid_amount,
+        changeGivenAmount: (_d = paymentItemWithType.metadata) == null ? void 0 : _d.change_given_amount
       });
       await this.payment.addPaymentItemAsync(
         this.store.currentOrder.uuid,
         paymentItemWithType
       );
       console.log("[Checkout] 支付项添加成功");
-      const isEftposPayment = ((_c = paymentItem.type) == null ? void 0 : _c.toLowerCase()) === "eftpos" || ((_d = paymentItem.code) == null ? void 0 : _d.toUpperCase().includes("EFTPOS"));
+      const isEftposPayment = ((_e = paymentItem.type) == null ? void 0 : _e.toLowerCase()) === "eftpos" || ((_f = paymentItem.code) == null ? void 0 : _f.toUpperCase().includes("EFTPOS"));
       console.log("[Checkout] EFTPOS 支付检查:", {
         paymentCode: paymentItem.code,
         paymentType: paymentItem.type,
@@ -1905,6 +1921,75 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
   validateCheckoutParams(params) {
     return (0, import_utils.validateCheckoutData)(params);
   }
+  /**
+   * 处理现金支付项的找零逻辑
+   * 
+   * @param paymentItem 原始支付项
+   * @returns 处理后的支付项（包含找零信息）
+   */
+  async processCashPaymentItem(paymentItem) {
+    const isCashPayment = this.isCashPayment(paymentItem.code, paymentItem.type);
+    if (!isCashPayment) {
+      return paymentItem;
+    }
+    try {
+      const remainingAmountStr = await this.calculateRemainingAmountAsync();
+      const remainingAmount = parseFloat(remainingAmountStr);
+      const cashAmount = parseFloat(String(paymentItem.amount));
+      console.log("[Checkout] 现金支付处理:", {
+        cashAmount,
+        remainingAmount,
+        needsChange: cashAmount > remainingAmount
+      });
+      if (cashAmount <= remainingAmount) {
+        return paymentItem;
+      }
+      const changeAmount = cashAmount - remainingAmount;
+      console.log("[Checkout] 现金支付需要找零:", {
+        actualPaidAmount: cashAmount,
+        chargedAmount: remainingAmount,
+        changeGivenAmount: changeAmount
+      });
+      const processedPaymentItem = {
+        ...paymentItem,
+        amount: remainingAmount,
+        // 将 amount 设置为剩余待付金额
+        metadata: {
+          ...paymentItem.metadata,
+          actual_paid_amount: cashAmount,
+          // 实付金额
+          change_given_amount: changeAmount
+          // 找零金额
+        }
+      };
+      this.logInfo("Cash payment with change processed", {
+        originalAmount: cashAmount,
+        chargedAmount: remainingAmount,
+        changeAmount,
+        paymentCode: paymentItem.code,
+        paymentType: paymentItem.type
+      });
+      return processedPaymentItem;
+    } catch (error) {
+      console.error("[Checkout] 处理现金支付项时出错:", error);
+      return paymentItem;
+    }
+  }
+  /**
+   * 判断是否为现金支付
+   * 
+   * @param paymentCode 支付代码
+   * @param paymentType 支付类型
+   * @returns 是否为现金支付
+   */
+  isCashPayment(paymentCode, paymentType) {
+    const codeUpper = (paymentCode == null ? void 0 : paymentCode.toUpperCase()) || "";
+    const typeUpper = (paymentType == null ? void 0 : paymentType.toUpperCase()) || "";
+    const cashIdentifiers = ["CASH", "CASHMANUAL", "MANUAL"];
+    return cashIdentifiers.some(
+      (identifier) => codeUpper.includes(identifier) || typeUpper.includes(identifier)
+    );
+  }
   /**
    * 预加载支付方式（在初始化时调用）
    */
@@ -2311,11 +2396,19 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       originalCount: paymentItems.length,
       processedCount: processedPaymentItems.length,
       sampleMetadata: (_b = processedPaymentItems[0]) == null ? void 0 : _b.metadata,
-      allPaymentItems: processedPaymentItems.map((p) => ({
-        code: p.code,
-        amount: p.amount,
-        metadata: p.metadata
-      }))
+      allPaymentItems: processedPaymentItems.map((p) => {
+        var _a2, _b2;
+        return {
+          code: p.code,
+          amount: p.amount,
+          voucherId: p.voucher_id,
+          orderPaymentType: p.order_payment_type,
+          metadata: p.metadata,
+          // 现金支付找零信息
+          actualPaidAmount: (_a2 = p.metadata) == null ? void 0 : _a2.actual_paid_amount,
+          changeGivenAmount: (_b2 = p.metadata) == null ? void 0 : _b2.change_given_amount
+        };
+      })
     });
     const orderParams = {
       ...this.store.localOrderData,

package/package.json

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