@pisell/pisellos 2.2.48 → 2.2.50

package/dist/modules/Payment/index.js

@@ -2019,7 +2019,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           // 如果当前支付项有服务费，还需要减去服务费
           var effectiveAmount = paymentAmount.plus(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
           if (payment.service_fee) {
-            effectiveAmount.minus(new Decimal(payment.service_fee));
+            effectiveAmount = effectiveAmount.minus(new Decimal(payment.service_fee));
           }
           return sum.plus(effectiveAmount);
         } catch (error) {

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

@@ -344,7 +344,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/Checkout/index.js

@@ -760,6 +760,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
+              debugger;
               this.logInfo('updateLocalOrderAsync called', {
                 orderId: params.orderId,
                 orderDataType: (_params$orderData6 = params.orderData) === null || _params$orderData6 === void 0 ? void 0 : _params$orderData6.type,
@@ -771,11 +772,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // 基础校验
               validation = validateLocalOrderData(params.orderData);
               if (validation.valid) {
-                _context10.next = 4;
+                _context10.next = 5;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, "\u8BA2\u5355\u6570\u636E\u9A8C\u8BC1\u5931\u8D25: ".concat(validation.errors.join(', ')));
-            case 4:
+            case 5:
               // 计算金额
               amountInfo = extractAmountFromCartSummary(params.cartSummary); // 规范化补充字段
               params.orderData.created_at = formatDateTime(new Date());
@@ -801,19 +802,19 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 保留原有支付项：通过 orderId 找到现有订单（按 id 或 order_id 匹配）
-              _context10.next = 17;
+              _context10.next = 18;
               return this.payment.getOrderListAsync();
-            case 17:
+            case 18:
               allOrders = _context10.sent;
               existingOrder = allOrders.find(function (o) {
                 return String(o.id) === String(params.orderId) || String(o.order_id) === String(params.orderId);
               });
               if (!existingOrder) {
-                _context10.next = 71;
+                _context10.next = 72;
                 break;
               }
               if (!(params.existPayment && params.existPayment.length > 0)) {
-                _context10.next = 47;
+                _context10.next = 48;
                 break;
               }
               this.logInfo('检测到云端支付项，将替换本地订单的支付项列表', {
@@ -837,7 +838,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 });
               }); // 计算是否需要支付定金
               _isNeedDeposit = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 更新订单，替换支付项列表
-              _context10.next = 28;
+              _context10.next = 29;
               return this.payment.updateOrderAsync(existingOrder.uuid, {
                 total_amount: amountInfo.totalAmount,
                 is_deposit: _isNeedDeposit.hasDeposit ? 1 : 0,
@@ -855,21 +856,21 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   amount_breakdown: amountInfo
                 }
               });
-            case 28:
-              _context10.next = 30;
+            case 29:
+              _context10.next = 31;
               return this.payment.getPaymentOrderByUuidAsync(existingOrder.uuid);
-            case 30:
+            case 31:
               _updated = _context10.sent;
               if (_updated) {
-                _context10.next = 33;
+                _context10.next = 34;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.UnknownError, '订单更新失败');
-            case 33:
+            case 34:
               this.store.currentOrder = _updated;
-              _context10.next = 36;
+              _context10.next = 37;
               return this.updateStateAmountToRemaining(false);
-            case 36:
+            case 37:
               this.logInfo('本地订单更新成功(已替换云端支付项):', {
                 orderId: params.orderId,
                 uuid: _updated.uuid,
@@ -880,12 +881,12 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 事件通知
-              _context10.next = 39;
+              _context10.next = 40;
               return this.core.effects.emit("".concat(this.name, ":onOrderCreated"), {
                 order: _updated,
                 timestamp: Date.now()
               });
-            case 39:
+            case 40:
               // 计算已同步的支付金额
               syncedPayments = _updated.payment.filter(function (p) {
                 return p.isSynced && p.status !== 'voided';
@@ -905,7 +906,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 order_wait_pay_amount: Number(_depositDiffAmount) > 0 ? Number(_depositDiffAmount) : Number(_remainingExpectAmount)
               });
               return _context10.abrupt("return", _updated);
-            case 47:
+            case 48:
               // 原有逻辑：保留现有支付项
               totalAmount = new Decimal(amountInfo.totalAmount || '0');
               activePayments = (existingOrder.payment || []).filter(function (p) {
@@ -918,7 +919,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }, new Decimal(0));
               remaining = Decimal.max(0, totalAmount.minus(paidAmount)).toFixed(2); // 计算是否需要支付定金，如果需要默认切换到定金模式，以及记录定金总金额，并把当前默认待付金额调整为定金总金额
               _isNeedDeposit2 = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 更新到支付模块（使用 uuid，不修改 payment 列表）
-              _context10.next = 54;
+              _context10.next = 55;
               return this.payment.updateOrderAsync(existingOrder.uuid, {
                 total_amount: amountInfo.totalAmount,
                 is_deposit: _isNeedDeposit2.hasDeposit ? 1 : 0,
@@ -935,21 +936,21 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   amount_breakdown: amountInfo
                 }
               });
-            case 54:
-              _context10.next = 56;
+            case 55:
+              _context10.next = 57;
               return this.payment.getPaymentOrderByUuidAsync(existingOrder.uuid);
-            case 56:
+            case 57:
               updated = _context10.sent;
               if (updated) {
-                _context10.next = 59;
+                _context10.next = 60;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.UnknownError, '订单更新失败');
-            case 59:
+            case 60:
               this.store.currentOrder = updated;
-              _context10.next = 62;
+              _context10.next = 63;
               return this.updateStateAmountToRemaining(false);
-            case 62:
+            case 63:
               this.logInfo('本地订单更新成功(保留支付项):', {
                 orderId: params.orderId,
                 uuid: updated.uuid,
@@ -959,12 +960,12 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 事件通知（复用创建事件，便于上层监听刷新）
-              _context10.next = 65;
+              _context10.next = 66;
               return this.core.effects.emit("".concat(this.name, ":onOrderCreated"), {
                 order: updated,
                 timestamp: Date.now()
               });
-            case 65:
+            case 66:
               // 需要减去已经同步给后端的支付过的钱
               syncedAmount = activePayments.reduce(function (sum, p) {
                 var amt = new Decimal(p.amount || '0');
@@ -980,10 +981,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 order_wait_pay_amount: Number(depositDiffAmount) > 0 ? Number(depositDiffAmount) : Number(remainingExpectAmount)
               });
               return _context10.abrupt("return", updated);
-            case 71:
+            case 72:
               // 计算是否需要支付定金，如果需要默认切换到定金模式，以及记录定金总金额，并把当前默认待付金额调整为定金总金额
               isNeedDeposit = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 没找到现有订单时，回退为创建逻辑（用于异常兜底）
-              _context10.next = 74;
+              _context10.next = 75;
               return this.payment.createPaymentOrderAsync({
                 order_id: String(params.orderId),
                 total_amount: amountInfo.totalAmount,
@@ -1002,7 +1003,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   amount_breakdown: amountInfo
                 }
               });
-            case 74:
+            case 75:
               created = _context10.sent;
               this.store.currentOrder = created;
 
@@ -1038,7 +1039,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 this.initWalletData();
               }
               return _context10.abrupt("return", created);
-            case 78:
+            case 79:
             case "end":
               return _context10.stop();
           }
@@ -3134,6 +3135,9 @@ 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

@@ -1032,7 +1032,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           const roundingAmount = new import_decimal.Decimal(payment.rounding_amount || 0);
           let effectiveAmount = paymentAmount.plus(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
           if (payment.service_fee) {
-            effectiveAmount.minus(new import_decimal.Decimal(payment.service_fee));
+            effectiveAmount = effectiveAmount.minus(new import_decimal.Decimal(payment.service_fee));
           }
           return sum.plus(effectiveAmount);
         } catch (error) {

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

@@ -344,7 +344,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/Checkout/index.js

@@ -507,6 +507,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    */
   async updateLocalOrderAsync(params) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    debugger;
     this.logInfo("updateLocalOrderAsync called", {
       orderId: params.orderId,
       orderDataType: (_a = params.orderData) == null ? void 0 : _a.type,
@@ -2030,7 +2031,10 @@ 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");
-      const effectiveAmount = amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
+      let effectiveAmount = amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
+      if (payment.service_fee) {
+        effectiveAmount = effectiveAmount.minus(new import_decimal.default(payment.service_fee));
+      }
       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.48",
+  "version": "2.2.50",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",