@pisell/pisellos 2.2.57 → 2.2.59

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

@@ -123,7 +123,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/dist/solution/Checkout/index.js

@@ -1909,7 +1909,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 41:
               _context18.prev = 41;
               _context18.t0 = _context18["catch"](0);
-              this.logError('[Checkout] 批量更新代金券支付项失败:', _context18.t0);
+              this.logInfo('[Checkout] 批量更新代金券支付项失败:', {
+                error: _context18.t0
+              });
               _context18.next = 46;
               return this.handleError(_context18.t0, CheckoutErrorType.PaymentFailed);
             case 46:
@@ -3128,13 +3130,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
         return payment.status !== 'voided';
       }) // 只计算未撤销的支付项
       .reduce(function (sum, payment) {
-        var amount = new Decimal(payment.amount || '0');
-        var roundingAmount = new Decimal(payment.rounding_amount || '0');
-
-        // 使用 Decimal.js 计算实际支付有效金额：
-        // 当 rounding_amount 为负数时，表示抹掉的金额，应该按绝对值加到实际支付中
-        // 例如：amount=15, rounding_amount=-0.2，实际相当于支付了15.2（抹掉了0.2元的零头）
-        var effectiveAmount = amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
+        // const amount = new Decimal(payment.amount || '0');
+        // 计算有效支付金额：支付金额 + 抹零金额的绝对值
+        // 当 rounding_amount 为负数时，表示抹掉的金额，按绝对值计算有效支付
+        // 例如：amount=15, rounding_amount=-0.2，有效支付=15.2（抹掉0.2元零头）
+        // 例2：amount=15,rounding_amount=0.2,有效支付 14.8 
+        var paymentAmount = new Decimal(payment.amount || 0);
+        var roundingAmount = new Decimal(payment.rounding_amount || 0);
+        var effectiveAmount = paymentAmount.minus(roundingAmount);
         return sum.add(effectiveAmount);
       }, new Decimal(0));
       return paidAmount.toFixed(2);

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

@@ -123,7 +123,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.js

@@ -1289,7 +1289,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       });
       this.logInfo("代金券支付项批量更新成功");
     } catch (error) {
-      this.logError("[Checkout] 批量更新代金券支付项失败:", error);
+      this.logInfo("[Checkout] 批量更新代金券支付项失败:", { error });
       await this.handleError(error, import_types.CheckoutErrorType.PaymentFailed);
       throw error;
     }
@@ -2029,9 +2029,9 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    */
   calculatePaidAmountFromItems(payments) {
     const paidAmount = payments.filter((payment) => payment.status !== "voided").reduce((sum, payment) => {
-      const amount = new import_decimal.default(payment.amount || "0");
-      const roundingAmount = new import_decimal.default(payment.rounding_amount || "0");
-      const effectiveAmount = amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
+      const paymentAmount = new import_decimal.default(payment.amount || 0);
+      const roundingAmount = new import_decimal.default(payment.rounding_amount || 0);
+      const effectiveAmount = paymentAmount.minus(roundingAmount);
       return sum.add(effectiveAmount);
     }, new import_decimal.default(0));
     return paidAmount.toFixed(2);

package/package.json

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