@pisell/pisellos 2.2.54 → 2.2.56

package/dist/modules/Payment/index.js

@@ -332,7 +332,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               // 1. 筛选 status === 1 && disable === 0的数据
               // 2. 检查列表里是否有 code=WALLET_PASS的数据，如果没有，则列表里如果有 PRODUCTVOUCHER 、 GIFTCARD 、 POINTCARD 则删除他们
               // 如果有 code = WALLET_PASS的数据，则列表里PRODUCTVOUCHER 、 GIFTCARD 、 POINTCARD 的channel_application 指向 WALLET_PASS 的 channel_application
-              payMethods.filter(function (method) {
+              payMethods = payMethods.filter(function (method) {
                 return method.status === 1 && method.disable === 0;
               });
               walletPassMethod = payMethods.find(function (method) {
@@ -442,8 +442,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit("".concat(this.name, ":onPaymentMethodsLoaded"), payMethods);
             case 46:
               this.logInfo('getPayMethodListAsync completed successfully', {
-                methodCount: payMethods.length,
-                hasCache: cachedMethods.length > 0
+                payMethods: payMethods
               });
               return _context4.abrupt("return", payMethods);
             case 50:
@@ -2018,9 +2017,6 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           var roundingAmount = new Decimal(payment.rounding_amount || 0);
           // 如果当前支付项有服务费，还需要减去服务费
           var effectiveAmount = paymentAmount.plus(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
-          if (payment.service_fee) {
-            effectiveAmount = effectiveAmount.minus(new Decimal(payment.service_fee));
-          }
           return sum.plus(effectiveAmount);
         } catch (error) {
           console.warn("[PaymentModule] \u65E0\u6548\u7684\u652F\u4ED8\u91D1\u989D: amount=".concat(payment.amount, ", rounding_amount=").concat(payment.rounding_amount, "\uFF0C\u8DF3\u8FC7\u8BA1\u7B97"));

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

@@ -144,8 +144,6 @@ export interface PaymentItem {
     created_at?: string;
     /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss) */
     updated_at?: string;
-    /** 三方支付手续费,正常来说只有编辑订单后端会给 */
-    service_fee?: string;
 }
 /**
  * 订单信息

package/dist/solution/Checkout/index.js

@@ -894,9 +894,6 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               _syncedAmount = syncedPayments.reduce(function (sum, p) {
                 var amt = new Decimal(p.amount || '0');
                 var rounding = new Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || '0').abs();
-                if (p.service_fee) {
-                  amt = amt.minus(new Decimal(p.service_fee));
-                }
                 return sum.plus(amt).plus(rounding);
               }, new Decimal(0));
               _totalAmount = new Decimal(amountInfo.totalAmount || '0');
@@ -3138,9 +3135,6 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
         // 当 rounding_amount 为负数时，表示抹掉的金额，应该按绝对值加到实际支付中
         // 例如：amount=15, rounding_amount=-0.2，实际相当于支付了15.2（抹掉了0.2元的零头）
         var effectiveAmount = amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
-        if (payment.service_fee) {
-          effectiveAmount = effectiveAmount.minus(new Decimal(payment.service_fee));
-        }
         return sum.add(effectiveAmount);
       }, new Decimal(0));
       return paidAmount.toFixed(2);

package/lib/modules/Payment/index.js

@@ -204,7 +204,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     });
   }
   async filterPayMethods(payMethods) {
-    payMethods.filter((method) => method.status === 1 && method.disable === 0);
+    payMethods = payMethods.filter((method) => method.status === 1 && method.disable === 0);
     const walletPassMethod = payMethods.find((method) => method.code === "WALLET_PASS");
     if (walletPassMethod) {
       payMethods.forEach((method) => {
@@ -249,8 +249,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         payMethods
       );
       this.logInfo("getPayMethodListAsync completed successfully", {
-        methodCount: payMethods.length,
-        hasCache: cachedMethods.length > 0
+        payMethods
       });
       return payMethods;
     } catch (error) {
@@ -1030,10 +1029,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           }
           const paymentAmount = new import_decimal.Decimal(payment.amount || 0);
           const roundingAmount = new import_decimal.Decimal(payment.rounding_amount || 0);
-          let effectiveAmount = paymentAmount.plus(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
-          if (payment.service_fee) {
-            effectiveAmount = effectiveAmount.minus(new import_decimal.Decimal(payment.service_fee));
-          }
+          const effectiveAmount = paymentAmount.plus(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
           return sum.plus(effectiveAmount);
         } catch (error) {
           console.warn(`[PaymentModule] 无效的支付金额: amount=${payment.amount}, rounding_amount=${payment.rounding_amount}，跳过计算`);

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

@@ -144,8 +144,6 @@ export interface PaymentItem {
     created_at?: string;
     /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss) */
     updated_at?: string;
-    /** 三方支付手续费,正常来说只有编辑订单后端会给 */
-    service_fee?: string;
 }
 /**
  * 订单信息

package/lib/solution/Checkout/index.js

@@ -608,9 +608,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         const syncedAmount2 = syncedPayments.reduce((sum, p) => {
           let amt = new import_decimal.default(p.amount || "0");
           const rounding = new import_decimal.default(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || "0").abs();
-          if (p.service_fee) {
-            amt = amt.minus(new import_decimal.default(p.service_fee));
-          }
           return sum.plus(amt).plus(rounding);
         }, new import_decimal.default(0));
         const totalAmount2 = new import_decimal.default(amountInfo.totalAmount || "0");
@@ -2034,10 +2031,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     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");
-      let effectiveAmount = amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
-      if (payment.service_fee) {
-        effectiveAmount = effectiveAmount.minus(new import_decimal.default(payment.service_fee));
-      }
+      const effectiveAmount = amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
       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.54",
+  "version": "2.2.56",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",