@pisell/pisellos 0.0.291 → 0.0.292

package/dist/modules/Payment/index.js

@@ -2037,7 +2037,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "roundAmountAsync",
     value: function () {
       var _roundAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(originalAmount, interval, rule) {
-        var amount, roundingInterval, supportedIntervals, intervalValue, baseValue, roundedValue, finalAmount, roundedAmountStr, originalAmountStr, roundingDifference, roundingDifferenceStr;
+        var amount, roundingInterval, supportedIntervals, intervalValue, baseValue, roundedValue, finalAmount, originalAmountStr, roundedAmountStr, roundingDifference, roundingDifferenceStr;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -2085,8 +2085,19 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 22:
               // 计算最终金额：roundedValue * interval
               finalAmount = roundedValue.mul(roundingInterval);
-              roundedAmountStr = finalAmount.toFixed(2);
-              originalAmountStr = amount.toFixed(2); // 计算舍入差额
+              originalAmountStr = amount.toFixed(2); // 如果最终金额是 0 元，则不采用舍入金额，返回原始金额
+              if (!finalAmount.eq(0)) {
+                _context26.next = 27;
+                break;
+              }
+              console.log("[PaymentModule] \u6700\u7EC8\u91D1\u989D\u4E3A0\uFF0C\u8FD4\u56DE\u539F\u59CB\u91D1\u989D: ".concat(originalAmountStr));
+              return _context26.abrupt("return", {
+                originalAmount: originalAmountStr,
+                roundedAmount: originalAmountStr,
+                roundingDifference: '0.00'
+              });
+            case 27:
+              roundedAmountStr = finalAmount.toFixed(2); // 计算舍入差额
               roundingDifference = finalAmount.sub(amount);
               roundingDifferenceStr = roundingDifference.toFixed(2);
               console.log("[PaymentModule] \u820D\u5165\u7ED3\u679C - \u539F\u59CB\u91D1\u989D: ".concat(originalAmountStr, ", \u820D\u5165\u540E\u91D1\u989D: ").concat(roundedAmountStr, ", \u820D\u5165\u5DEE\u989D: ").concat(roundingDifferenceStr));
@@ -2095,16 +2106,16 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 roundedAmount: roundedAmountStr,
                 roundingDifference: roundingDifferenceStr
               });
-            case 31:
-              _context26.prev = 31;
+            case 34:
+              _context26.prev = 34;
               _context26.t1 = _context26["catch"](0);
               console.error('[PaymentModule] 金额舍入失败:', _context26.t1);
               throw new Error("\u91D1\u989D\u820D\u5165\u5931\u8D25: ".concat(_context26.t1 instanceof Error ? _context26.t1.message : String(_context26.t1)));
-            case 35:
+            case 38:
             case "end":
               return _context26.stop();
           }
-        }, _callee26, this, [[0, 31]]);
+        }, _callee26, this, [[0, 34]]);
       }));
       function roundAmountAsync(_x28, _x29, _x30) {
         return _roundAmountAsync.apply(this, arguments);

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -326,7 +326,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

@@ -573,7 +573,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 自动设置 stateAmount 为剩余未支付金额
               _context9.next = 27;
-              return this.updateStateAmountToRemaining();
+              return this.updateStateAmountToRemaining(false);
             case 27:
               this.logInfo('本地订单创建成功:', {
                 localOrderId: localOrderId,
@@ -717,7 +717,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 31:
               this.store.currentOrder = updated;
               _context10.next = 34;
-              return this.updateStateAmountToRemaining();
+              return this.updateStateAmountToRemaining(false);
             case 34:
               this.logInfo('本地订单更新成功(保留支付项):', {
                 orderId: params.orderId,
@@ -1455,7 +1455,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(voucherPaymentItems) {
         var _this3 = this;
-        var remainingAmount, remainingValue, isOrderSynced, orderPaymentType, voucherPaymentItemsWithType, currentOrderId, isCurrentOrderReal, updatedOrder;
+        var paymentItems, allPaymentItemsSynced, remainingAmount, remainingValue, isOrderSynced, orderPaymentType, voucherPaymentItemsWithType, currentOrderId, isCurrentOrderReal, updatedOrder;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
@@ -1467,13 +1467,20 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '当前没有活跃订单，无法更新代金券支付项');
             case 3:
               _context18.next = 5;
-              return this.calculateRemainingAmountAsync();
+              return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid);
             case 5:
+              paymentItems = _context18.sent;
+              allPaymentItemsSynced = paymentItems.every(function (item) {
+                return item.isSynced;
+              });
+              _context18.next = 9;
+              return this.calculateRemainingAmountAsync();
+            case 9:
               remainingAmount = _context18.sent;
               remainingValue = new Decimal(remainingAmount);
               isOrderSynced = this.store.isOrderSynced;
-              if (!(remainingValue.lte(0) && isOrderSynced && voucherPaymentItems.length === 0)) {
-                _context18.next = 11;
+              if (!(remainingValue.lte(0) && isOrderSynced && voucherPaymentItems.length === 0 && allPaymentItemsSynced)) {
+                _context18.next = 15;
                 break;
               }
               this.logInfo('订单已同步且支付完成，跳过清空代金券操作避免重复同步:', {
@@ -1485,7 +1492,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 reason: 'Order synced and payment completed, skip clear vouchers to avoid duplicate sync'
               });
               return _context18.abrupt("return");
-            case 11:
+            case 15:
               this.logInfo('开始批量更新代金券支付项:', {
                 voucherPaymentItems: voucherPaymentItems
               });
@@ -1507,15 +1514,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   metadata: metadata
                 });
               }); // 调用 Payment 模块的批量更新方法
-              _context18.next = 16;
+              _context18.next = 20;
               return this.payment.updateVoucherPaymentItemsAsync(this.store.currentOrder.uuid, voucherPaymentItemsWithType);
-            case 16:
+            case 20:
               // 重新从Payment模块获取最新的订单数据，确保支付项同步
               currentOrderId = this.store.currentOrder.order_id; // 保存当前的订单ID
               isCurrentOrderReal = currentOrderId && !isVirtualOrderId(currentOrderId);
-              _context18.next = 20;
+              _context18.next = 24;
               return this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
-            case 20:
+            case 24:
               updatedOrder = _context18.sent;
               if (updatedOrder) {
                 // 如果当前订单ID是真实ID，但获取到的订单ID是虚拟ID，需要保护真实ID
@@ -1530,10 +1537,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 更新 stateAmount 为剩余未支付金额
-              _context18.next = 24;
+              _context18.next = 28;
               return this.updateStateAmountToRemaining(false);
-            case 24:
-              _context18.next = 26;
+            case 28:
+              _context18.next = 30;
               return this.core.effects.emit(CheckoutHooks.OnPaymentStarted, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: 'VOUCHER_BATCH',
@@ -1542,23 +1549,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 }, 0).toFixed(2),
                 timestamp: Date.now()
               });
-            case 26:
+            case 30:
               this.logInfo('代金券支付项批量更新成功');
-              _context18.next = 35;
+              _context18.next = 39;
               break;
-            case 29:
-              _context18.prev = 29;
+            case 33:
+              _context18.prev = 33;
               _context18.t0 = _context18["catch"](0);
               this.logError('[Checkout] 批量更新代金券支付项失败:', _context18.t0);
-              _context18.next = 34;
+              _context18.next = 38;
               return this.handleError(_context18.t0, CheckoutErrorType.PaymentFailed);
-            case 34:
+            case 38:
               throw _context18.t0;
-            case 35:
+            case 39:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this, [[0, 29]]);
+        }, _callee18, this, [[0, 33]]);
       }));
       function updateVoucherPaymentItemsAsync(_x17) {
         return _updateVoucherPaymentItemsAsync.apply(this, arguments);
@@ -2876,27 +2883,29 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               _context34.next = 9;
               return this.updateBalanceDueAmount();
             case 9:
-              if (checkOrder) {
-                _context34.next = 12;
+              if (!checkOrder) {
+                _context34.next = 14;
                 break;
               }
-              this.logInfo('外部传入无需 checkOrder，不执行订单支付完成检测和同步');
-              return _context34.abrupt("return");
-            case 12:
-              _context34.next = 14;
+              _context34.next = 12;
               return this.checkOrderPaymentCompletion();
+            case 12:
+              _context34.next = 15;
+              break;
             case 14:
-              _context34.next = 19;
+              this.logInfo('外部传入无需 checkOrder，不执行订单支付完成检测和同步');
+            case 15:
+              _context34.next = 20;
               break;
-            case 16:
-              _context34.prev = 16;
+            case 17:
+              _context34.prev = 17;
               _context34.t0 = _context34["catch"](1);
               this.logError('更新 stateAmount 为剩余金额失败:', _context34.t0);
-            case 19:
+            case 20:
             case "end":
               return _context34.stop();
           }
-        }, _callee34, this, [[1, 16]]);
+        }, _callee34, this, [[1, 17]]);
       }));
       function updateStateAmountToRemaining() {
         return _updateStateAmountToRemaining.apply(this, arguments);

package/lib/modules/Payment/index.js

@@ -1056,8 +1056,16 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           throw new Error(`不支持的舍入规则: ${rule}`);
       }
       const finalAmount = roundedValue.mul(roundingInterval);
-      const roundedAmountStr = finalAmount.toFixed(2);
       const originalAmountStr = amount.toFixed(2);
+      if (finalAmount.eq(0)) {
+        console.log(`[PaymentModule] 最终金额为0，返回原始金额: ${originalAmountStr}`);
+        return {
+          originalAmount: originalAmountStr,
+          roundedAmount: originalAmountStr,
+          roundingDifference: "0.00"
+        };
+      }
+      const roundedAmountStr = finalAmount.toFixed(2);
       const roundingDifference = finalAmount.sub(amount);
       const roundingDifferenceStr = roundingDifference.toFixed(2);
       console.log(`[PaymentModule] 舍入结果 - 原始金额: ${originalAmountStr}, 舍入后金额: ${roundedAmountStr}, 舍入差额: ${roundingDifferenceStr}`);

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -326,7 +326,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

@@ -342,7 +342,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         order: paymentOrder,
         timestamp: Date.now()
       });
-      await this.updateStateAmountToRemaining();
+      await this.updateStateAmountToRemaining(false);
       this.logInfo("本地订单创建成功:", {
         localOrderId,
         uuid: paymentOrder.uuid,
@@ -439,7 +439,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       if (!updated)
         throw (0, import_utils.createCheckoutError)(import_types.CheckoutErrorType.UnknownError, "订单更新失败");
       this.store.currentOrder = updated;
-      await this.updateStateAmountToRemaining();
+      await this.updateStateAmountToRemaining(false);
       this.logInfo("本地订单更新成功(保留支付项):", {
         orderId: params.orderId,
         uuid: updated.uuid,
@@ -908,10 +908,12 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           "当前没有活跃订单，无法更新代金券支付项"
         );
       }
+      const paymentItems = await this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid);
+      const allPaymentItemsSynced = paymentItems.every((item) => item.isSynced);
       const remainingAmount = await this.calculateRemainingAmountAsync();
       const remainingValue = new import_decimal.default(remainingAmount);
       const isOrderSynced = this.store.isOrderSynced;
-      if (remainingValue.lte(0) && isOrderSynced && voucherPaymentItems.length === 0) {
+      if (remainingValue.lte(0) && isOrderSynced && voucherPaymentItems.length === 0 && allPaymentItemsSynced) {
         this.logInfo("订单已同步且支付完成，跳过清空代金券操作避免重复同步:", {
           orderUuid: this.store.currentOrder.uuid,
           orderId: this.store.currentOrder.order_id,
@@ -1776,11 +1778,11 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         });
       }
       await this.updateBalanceDueAmount();
-      if (!checkOrder) {
+      if (checkOrder) {
+        await this.checkOrderPaymentCompletion();
+      } else {
         this.logInfo("外部传入无需 checkOrder，不执行订单支付完成检测和同步");
-        return;
       }
-      await this.checkOrderPaymentCompletion();
     } catch (error) {
       this.logError("更新 stateAmount 为剩余金额失败:", error);
     }

package/package.json

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