@pisell/pisellos 2.2.29 → 2.2.31

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(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/dist/modules/Summary/utils.d.ts

@@ -21,7 +21,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * @title: 计算定金
  * @param items - 购物车商品数组

package/dist/solution/Checkout/index.js

@@ -1745,32 +1745,53 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(voucherPaymentItems) {
         var _this4 = this;
-        var paymentItems, allPaymentItemsSynced, remainingAmount, remainingValue, isOrderSynced, orderPaymentType, voucherPaymentItemsWithType, currentOrderId, isCurrentOrderReal, updatedOrder;
+        var paymentItems, savedVoucherPaymentItems, allPaymentItemsSynced, remainingAmount, remainingValue, isOrderSynced, orderPaymentType, voucherPaymentItemsWithType, currentOrderId, isCurrentOrderReal, updatedOrder;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
               _context18.prev = 0;
+              this.logInfo('updateVoucherPaymentItemsAsync called:', {
+                voucherPaymentItems: voucherPaymentItems
+              });
+              // 检查是否有当前订单
               if (this.store.currentOrder) {
-                _context18.next = 3;
+                _context18.next = 4;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '当前没有活跃订单，无法更新代金券支付项');
-            case 3:
-              _context18.next = 5;
+            case 4:
+              _context18.next = 6;
               return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid);
-            case 5:
+            case 6:
               paymentItems = _context18.sent;
+              if (!(!voucherPaymentItems || (voucherPaymentItems === null || voucherPaymentItems === void 0 ? void 0 : voucherPaymentItems.length) === 0)) {
+                _context18.next = 12;
+                break;
+              }
+              savedVoucherPaymentItems = (paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.filter(function (item) {
+                return item.voucher_id && !item.isSynced;
+              })) || [];
+              this.logInfo('未传入 voucher 且本地订单无 voucher 记录，阻断updateVoucherPaymentItemsAsync', {
+                voucherPaymentItems: voucherPaymentItems,
+                savedVoucherPaymentItems: savedVoucherPaymentItems
+              });
+              if (!((savedVoucherPaymentItems === null || savedVoucherPaymentItems === void 0 ? void 0 : savedVoucherPaymentItems.length) === 0)) {
+                _context18.next = 12;
+                break;
+              }
+              return _context18.abrupt("return");
+            case 12:
               allPaymentItemsSynced = paymentItems.every(function (item) {
                 return item.isSynced;
               });
-              _context18.next = 9;
+              _context18.next = 15;
               return this.calculateRemainingAmountAsync();
-            case 9:
+            case 15:
               remainingAmount = _context18.sent;
               remainingValue = new Decimal(remainingAmount);
               isOrderSynced = this.store.isOrderSynced;
               if (!(remainingValue.lte(0) && isOrderSynced && voucherPaymentItems.length === 0 && allPaymentItemsSynced)) {
-                _context18.next = 15;
+                _context18.next = 21;
                 break;
               }
               this.logInfo('订单已同步且支付完成，跳过清空代金券操作避免重复同步:', {
@@ -1782,7 +1803,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 15:
+            case 21:
               this.logInfo('开始批量更新代金券支付项:', {
                 voucherPaymentItems: voucherPaymentItems
               });
@@ -1804,18 +1825,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   metadata: metadata
                 });
               }); // 调用 Payment 模块的批量更新方法
-              _context18.next = 20;
+              _context18.next = 26;
               return this.payment.updateVoucherPaymentItemsAsync(this.store.currentOrder.uuid, voucherPaymentItemsWithType);
-            case 20:
+            case 26:
               // 🚀 清除计算缓存，确保获取最新数据
               this.clearCalculationCache();
 
               // 重新从Payment模块获取最新的订单数据，确保支付项同步
               currentOrderId = this.store.currentOrder.order_id; // 保存当前的订单ID
               isCurrentOrderReal = currentOrderId && !isVirtualOrderId(currentOrderId);
-              _context18.next = 25;
+              _context18.next = 31;
               return this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
-            case 25:
+            case 31:
               updatedOrder = _context18.sent;
               if (updatedOrder) {
                 // 如果当前订单ID是真实ID，但获取到的订单ID是虚拟ID，需要保护真实ID
@@ -1830,10 +1851,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 更新 stateAmount 为剩余未支付金额
-              _context18.next = 29;
+              _context18.next = 35;
               return this.updateStateAmountToRemaining(false);
-            case 29:
-              _context18.next = 31;
+            case 35:
+              _context18.next = 37;
               return this.core.effects.emit("".concat(this.name, ":onPaymentStarted"), {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: 'VOUCHER_BATCH',
@@ -1842,23 +1863,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 }, 0).toFixed(2),
                 timestamp: Date.now()
               });
-            case 31:
+            case 37:
               this.logInfo('代金券支付项批量更新成功');
-              _context18.next = 40;
+              _context18.next = 46;
               break;
-            case 34:
-              _context18.prev = 34;
+            case 40:
+              _context18.prev = 40;
               _context18.t0 = _context18["catch"](0);
               this.logError('[Checkout] 批量更新代金券支付项失败:', _context18.t0);
-              _context18.next = 39;
+              _context18.next = 45;
               return this.handleError(_context18.t0, CheckoutErrorType.PaymentFailed);
-            case 39:
+            case 45:
               throw _context18.t0;
-            case 40:
+            case 46:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this, [[0, 34]]);
+        }, _callee18, this, [[0, 40]]);
       }));
       function updateVoucherPaymentItemsAsync(_x17) {
         return _updateVoucherPaymentItemsAsync.apply(this, arguments);

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(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/lib/modules/Summary/utils.d.ts

@@ -21,7 +21,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * @title: 计算定金
  * @param items - 购物车商品数组

package/lib/solution/Checkout/index.js

@@ -1172,6 +1172,9 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    */
   async updateVoucherPaymentItemsAsync(voucherPaymentItems) {
     try {
+      this.logInfo("updateVoucherPaymentItemsAsync called:", {
+        voucherPaymentItems
+      });
       if (!this.store.currentOrder) {
         throw (0, import_utils.createCheckoutError)(
           import_types.CheckoutErrorType.ValidationFailed,
@@ -1181,6 +1184,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       const paymentItems = await this.payment.getPaymentItemsAsync(
         this.store.currentOrder.uuid
       );
+      if (!voucherPaymentItems || (voucherPaymentItems == null ? void 0 : voucherPaymentItems.length) === 0) {
+        const savedVoucherPaymentItems = (paymentItems == null ? void 0 : paymentItems.filter((item) => item.voucher_id && !item.isSynced)) || [];
+        this.logInfo("未传入 voucher 且本地订单无 voucher 记录，阻断updateVoucherPaymentItemsAsync", {
+          voucherPaymentItems,
+          savedVoucherPaymentItems
+        });
+        if ((savedVoucherPaymentItems == null ? void 0 : savedVoucherPaymentItems.length) === 0)
+          return;
+      }
       const allPaymentItemsSynced = paymentItems.every((item) => item.isSynced);
       const remainingAmount = await this.calculateRemainingAmountAsync();
       const remainingValue = new import_decimal.default(remainingAmount);

package/package.json

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