@pisell/pisellos 2.1.15 → 2.1.17

package/dist/modules/Payment/index.js

@@ -1043,7 +1043,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderUuid, paymentItem) {
-        var _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, paymentUuid, newPaymentItem;
+        var _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, warningMessage, paymentUuid, newPaymentItem;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1064,6 +1064,27 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error("Order not found: ".concat(orderUuid));
             case 7:
+              // 🔒 支付锁检查：如果订单待付金额已经为0，不允许继续添加支付项
+              expectAmount = new Decimal(order.expect_amount);
+              if (!expectAmount.lte(0)) {
+                _context13.next = 13;
+                break;
+              }
+              warningMessage = "\u8BA2\u5355 ".concat(orderUuid, " \u5F85\u4ED8\u91D1\u989D\u5DF2\u4E3A0\uFF0C\u4E0D\u5141\u8BB8\u6DFB\u52A0\u65B0\u7684\u652F\u4ED8\u9879");
+              console.warn('[PaymentModule] Payment lock triggered:', {
+                orderUuid: orderUuid,
+                expectAmount: order.expect_amount,
+                attemptedPaymentAmount: paymentItem.amount,
+                attemptedPaymentCode: paymentItem.code,
+                reason: 'Order already fully paid'
+              });
+              this.logError('addPaymentItemAsync blocked by payment lock', new Error(warningMessage), {
+                orderUuid: orderUuid,
+                expectAmount: order.expect_amount,
+                paymentItem: paymentItem
+              });
+              throw new Error(warningMessage);
+            case 13:
               paymentUuid = getUniqueId('payment_');
               newPaymentItem = {
                 uuid: paymentUuid,
@@ -1086,15 +1107,15 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               };
               order.payment.push(newPaymentItem);
               this.recalculateOrderAmount(order);
-              _context13.next = 13;
+              _context13.next = 19;
               return this.dbManager.update('order', order);
-            case 13:
-              _context13.next = 15;
+            case 19:
+              _context13.next = 21;
               return this.core.effects.emit(PaymentHooks.OnPaymentAdded, {
                 orderUuid: orderUuid,
                 payment: newPaymentItem
               });
-            case 15:
+            case 21:
               this.logInfo('addPaymentItemAsync completed successfully', {
                 orderUuid: orderUuid,
                 paymentUuid: newPaymentItem.uuid,
@@ -1108,10 +1129,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 actualPaidAmount: (_newPaymentItem$metad2 = newPaymentItem.metadata) === null || _newPaymentItem$metad2 === void 0 ? void 0 : _newPaymentItem$metad2.actual_paid_amount,
                 changeGivenAmount: (_newPaymentItem$metad3 = newPaymentItem.metadata) === null || _newPaymentItem$metad3 === void 0 ? void 0 : _newPaymentItem$metad3.change_given_amount
               });
-              _context13.next = 23;
+              _context13.next = 29;
               break;
-            case 18:
-              _context13.prev = 18;
+            case 24:
+              _context13.prev = 24;
               _context13.t0 = _context13["catch"](1);
               console.error('[PaymentModule] 添加支付项失败', _context13.t0);
               this.logError('addPaymentItemAsync failed', _context13.t0, {
@@ -1119,11 +1140,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentItem: paymentItem
               });
               throw _context13.t0;
-            case 23:
+            case 29:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[1, 18]]);
+        }, _callee13, this, [[1, 24]]);
       }));
       function addPaymentItemAsync(_x14, _x15) {
         return _addPaymentItemAsync.apply(this, arguments);
@@ -1243,7 +1264,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateVoucherPaymentItemsAsync",
     value: (function () {
       var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(orderUuid, voucherPaymentItems) {
-        var order, existingVoucherItems, _iterator5, _step5, voucherItem, _iterator6, _step6, _voucherItem, updatedOrder;
+        var order, expectAmount, warningMessage, existingVoucherItems, _iterator5, _step5, voucherItem, _iterator6, _step6, _voucherItem, updatedOrder;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -1270,6 +1291,43 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728: ".concat(orderUuid));
             case 7:
+              // 🔒 订单状态检查：如果订单待付金额已经为0且尝试清空代金券（空数组），跳过操作
+              expectAmount = new Decimal(order.expect_amount);
+              if (!(expectAmount.lte(0) && voucherPaymentItems.length === 0)) {
+                _context15.next = 12;
+                break;
+              }
+              console.warn('[PaymentModule] Skipping voucher update - order already fully paid:', {
+                orderUuid: orderUuid,
+                expectAmount: order.expect_amount,
+                attemptedOperation: 'clear_vouchers',
+                reason: 'Order payment completed, no need to clear vouchers'
+              });
+              this.logInfo('updateVoucherPaymentItemsAsync skipped - order already paid', {
+                orderUuid: orderUuid,
+                expectAmount: order.expect_amount,
+                voucherCount: voucherPaymentItems.length
+              });
+              return _context15.abrupt("return");
+            case 12:
+              if (!(expectAmount.lte(0) && voucherPaymentItems.length > 0)) {
+                _context15.next = 17;
+                break;
+              }
+              warningMessage = "\u8BA2\u5355 ".concat(orderUuid, " \u5DF2\u5B8C\u6210\u652F\u4ED8\uFF0C\u4E0D\u5141\u8BB8\u6DFB\u52A0\u4EE3\u91D1\u5238\u652F\u4ED8\u9879");
+              console.warn('[PaymentModule] Voucher update blocked - order already fully paid:', {
+                orderUuid: orderUuid,
+                expectAmount: order.expect_amount,
+                attemptedVoucherCount: voucherPaymentItems.length,
+                reason: 'Order already fully paid'
+              });
+              this.logError('updateVoucherPaymentItemsAsync blocked', new Error(warningMessage), {
+                orderUuid: orderUuid,
+                expectAmount: order.expect_amount,
+                voucherPaymentItems: voucherPaymentItems
+              });
+              throw new Error(warningMessage);
+            case 17:
               // 1. 查找所有现有的代金券类支付项（带 voucher_id 且状态不是 voided）
               existingVoucherItems = order.payment.filter(function (payment) {
                 return payment.voucher_id && payment.status !== 'voided';
@@ -1289,96 +1347,96 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               // 2. 删除所有现有的代金券支付项
               _iterator5 = _createForOfIteratorHelper(existingVoucherItems);
-              _context15.prev = 10;
+              _context15.prev = 20;
               _iterator5.s();
-            case 12:
+            case 22:
               if ((_step5 = _iterator5.n()).done) {
-                _context15.next = 19;
+                _context15.next = 29;
                 break;
               }
               voucherItem = _step5.value;
               console.log("[PaymentModule] \u5220\u9664\u73B0\u6709\u4EE3\u91D1\u5238\u652F\u4ED8\u9879: ".concat(voucherItem.uuid));
-              _context15.next = 17;
+              _context15.next = 27;
               return this.deletePaymentAsync(orderUuid, voucherItem.uuid);
-            case 17:
-              _context15.next = 12;
+            case 27:
+              _context15.next = 22;
               break;
-            case 19:
-              _context15.next = 24;
+            case 29:
+              _context15.next = 34;
               break;
-            case 21:
-              _context15.prev = 21;
-              _context15.t0 = _context15["catch"](10);
+            case 31:
+              _context15.prev = 31;
+              _context15.t0 = _context15["catch"](20);
               _iterator5.e(_context15.t0);
-            case 24:
-              _context15.prev = 24;
+            case 34:
+              _context15.prev = 34;
               _iterator5.f();
-              return _context15.finish(24);
-            case 27:
+              return _context15.finish(34);
+            case 37:
               // 3. 添加新的代金券支付项
               console.log('[PaymentModule] 添加新的代金券支付项:', {
                 orderUuid: orderUuid,
                 newItemCount: voucherPaymentItems.length
               });
               _iterator6 = _createForOfIteratorHelper(voucherPaymentItems);
-              _context15.prev = 29;
+              _context15.prev = 39;
               _iterator6.s();
-            case 31:
+            case 41:
               if ((_step6 = _iterator6.n()).done) {
-                _context15.next = 40;
+                _context15.next = 50;
                 break;
               }
               _voucherItem = _step6.value;
               if (_voucherItem.voucher_id) {
-                _context15.next = 35;
+                _context15.next = 45;
                 break;
               }
               throw new Error("\u4EE3\u91D1\u5238\u652F\u4ED8\u9879\u7F3A\u5C11 voucher_id: ".concat(JSON.stringify(_voucherItem)));
-            case 35:
+            case 45:
               console.log("[PaymentModule] \u6DFB\u52A0\u4EE3\u91D1\u5238\u652F\u4ED8\u9879:", {
                 code: _voucherItem.code,
                 amount: _voucherItem.amount,
                 voucher_id: _voucherItem.voucher_id,
                 order_payment_type: _voucherItem.order_payment_type
               });
-              _context15.next = 38;
+              _context15.next = 48;
               return this.addPaymentItemAsync(orderUuid, _voucherItem);
-            case 38:
-              _context15.next = 31;
+            case 48:
+              _context15.next = 41;
               break;
-            case 40:
-              _context15.next = 45;
+            case 50:
+              _context15.next = 55;
               break;
-            case 42:
-              _context15.prev = 42;
-              _context15.t1 = _context15["catch"](29);
+            case 52:
+              _context15.prev = 52;
+              _context15.t1 = _context15["catch"](39);
               _iterator6.e(_context15.t1);
-            case 45:
-              _context15.prev = 45;
+            case 55:
+              _context15.prev = 55;
               _iterator6.f();
-              return _context15.finish(45);
-            case 48:
-              _context15.next = 50;
+              return _context15.finish(55);
+            case 58:
+              _context15.next = 60;
               return this.getPaymentOrderByUuidAsync(orderUuid);
-            case 50:
+            case 60:
               updatedOrder = _context15.sent;
-              _context15.next = 53;
+              _context15.next = 63;
               return this.core.effects.emit(PaymentHooks.OnPaymentAdded, {
                 orderUuid: orderUuid,
                 order: updatedOrder,
                 payment: null // 批量操作不提供单个支付项
               });
-            case 53:
+            case 63:
               this.logInfo('updateVoucherPaymentItemsAsync completed successfully', {
                 orderUuid: orderUuid,
                 removedVoucherCount: existingVoucherItems.length,
                 addedVoucherCount: voucherPaymentItems.length,
                 finalExpectAmount: updatedOrder === null || updatedOrder === void 0 ? void 0 : updatedOrder.expect_amount
               });
-              _context15.next = 61;
+              _context15.next = 71;
               break;
-            case 56:
-              _context15.prev = 56;
+            case 66:
+              _context15.prev = 66;
               _context15.t2 = _context15["catch"](1);
               console.error('[PaymentModule] 批量更新代金券支付项失败:', _context15.t2);
               this.logError('updateVoucherPaymentItemsAsync failed', _context15.t2, {
@@ -1386,11 +1444,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 voucherPaymentItems: voucherPaymentItems
               });
               throw _context15.t2;
-            case 61:
+            case 71:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[1, 56], [10, 21, 24, 27], [29, 42, 45, 48]]);
+        }, _callee15, this, [[1, 66], [20, 31, 34, 37], [39, 52, 55, 58]]);
       }));
       function updateVoucherPaymentItemsAsync(_x18, _x19) {
         return _updateVoucherPaymentItemsAsync.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/Checkout/index.js

@@ -381,7 +381,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           product_id: item.product.product_id,
           product_variant_id: item.product.product_variant_id,
           quantity: item.product.num,
-          selling_price: item.product.price - (item.product.discount_amount || 0) - getDiscountListAmount(item.product.discount_list)
+          selling_price: item.product.calculated_selling_price
         };
       })) || [];
       var relationProducts = ((_this$store$currentOr2 = this.store.currentOrder.order_info) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.original_order_data) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.relation_products) === null || _this$store$currentOr2 === void 0 ? void 0 : _this$store$currentOr2.map(function (item) {
@@ -1284,7 +1284,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(voucherPaymentItems) {
         var _this3 = this;
-        var orderPaymentType, voucherPaymentItemsWithType, currentOrderId, isCurrentOrderReal, updatedOrder;
+        var remainingAmount, remainingValue, orderPaymentType, voucherPaymentItemsWithType, currentOrderId, isCurrentOrderReal, updatedOrder;
         return _regeneratorRuntime().wrap(function _callee17$(_context17) {
           while (1) switch (_context17.prev = _context17.next) {
             case 0:
@@ -1295,6 +1295,24 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '当前没有活跃订单，无法更新代金券支付项');
             case 3:
+              _context17.next = 5;
+              return this.calculateRemainingAmountAsync();
+            case 5:
+              remainingAmount = _context17.sent;
+              remainingValue = new Decimal(remainingAmount);
+              if (!remainingValue.lte(0)) {
+                _context17.next = 10;
+                break;
+              }
+              this.logInfo('订单已完成支付且修改代金券，跳过操作避免重复同步:', {
+                orderUuid: this.store.currentOrder.uuid,
+                orderId: this.store.currentOrder.order_id,
+                remainingAmount: remainingAmount,
+                voucherPaymentItemsCount: voucherPaymentItems.length,
+                reason: 'Order payment completed, skip clear vouchers'
+              });
+              return _context17.abrupt("return");
+            case 10:
               this.logInfo('开始批量更新代金券支付项:', {
                 voucherPaymentItems: voucherPaymentItems
               });
@@ -1316,15 +1334,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   metadata: metadata
                 });
               }); // 调用 Payment 模块的批量更新方法
-              _context17.next = 8;
+              _context17.next = 15;
               return this.payment.updateVoucherPaymentItemsAsync(this.store.currentOrder.uuid, voucherPaymentItemsWithType);
-            case 8:
+            case 15:
               // 重新从Payment模块获取最新的订单数据，确保支付项同步
               currentOrderId = this.store.currentOrder.order_id; // 保存当前的订单ID
               isCurrentOrderReal = currentOrderId && !isVirtualOrderId(currentOrderId);
-              _context17.next = 12;
+              _context17.next = 19;
               return this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
-            case 12:
+            case 19:
               updatedOrder = _context17.sent;
               if (updatedOrder) {
                 // 如果当前订单ID是真实ID，但获取到的订单ID是虚拟ID，需要保护真实ID
@@ -1339,10 +1357,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 更新 stateAmount 为剩余未支付金额
-              _context17.next = 16;
+              _context17.next = 23;
               return this.updateStateAmountToRemaining();
-            case 16:
-              _context17.next = 18;
+            case 23:
+              _context17.next = 25;
               return this.core.effects.emit(CheckoutHooks.OnPaymentStarted, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: 'VOUCHER_BATCH',
@@ -1351,23 +1369,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 }, 0).toFixed(2),
                 timestamp: Date.now()
               });
-            case 18:
+            case 25:
               this.logInfo('代金券支付项批量更新成功');
-              _context17.next = 27;
+              _context17.next = 34;
               break;
-            case 21:
-              _context17.prev = 21;
+            case 28:
+              _context17.prev = 28;
               _context17.t0 = _context17["catch"](0);
               this.logError('[Checkout] 批量更新代金券支付项失败:', _context17.t0);
-              _context17.next = 26;
+              _context17.next = 33;
               return this.handleError(_context17.t0, CheckoutErrorType.PaymentFailed);
-            case 26:
+            case 33:
               throw _context17.t0;
-            case 27:
+            case 34:
             case "end":
               return _context17.stop();
           }
-        }, _callee17, this, [[0, 21]]);
+        }, _callee17, this, [[0, 28]]);
       }));
       function updateVoucherPaymentItemsAsync(_x16) {
         return _updateVoucherPaymentItemsAsync.apply(this, arguments);

package/lib/modules/Payment/index.js

@@ -526,6 +526,23 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       if (!order) {
         throw new Error(`Order not found: ${orderUuid}`);
       }
+      const expectAmount = new import_decimal.Decimal(order.expect_amount);
+      if (expectAmount.lte(0)) {
+        const warningMessage = `订单 ${orderUuid} 待付金额已为0，不允许添加新的支付项`;
+        console.warn("[PaymentModule] Payment lock triggered:", {
+          orderUuid,
+          expectAmount: order.expect_amount,
+          attemptedPaymentAmount: paymentItem.amount,
+          attemptedPaymentCode: paymentItem.code,
+          reason: "Order already fully paid"
+        });
+        this.logError("addPaymentItemAsync blocked by payment lock", new Error(warningMessage), {
+          orderUuid,
+          expectAmount: order.expect_amount,
+          paymentItem
+        });
+        throw new Error(warningMessage);
+      }
       const paymentUuid = (0, import_utils.getUniqueId)("payment_");
       const newPaymentItem = {
         uuid: paymentUuid,
@@ -653,6 +670,36 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       if (!order) {
         throw new Error(`订单不存在: ${orderUuid}`);
       }
+      const expectAmount = new import_decimal.Decimal(order.expect_amount);
+      if (expectAmount.lte(0) && voucherPaymentItems.length === 0) {
+        console.warn("[PaymentModule] Skipping voucher update - order already fully paid:", {
+          orderUuid,
+          expectAmount: order.expect_amount,
+          attemptedOperation: "clear_vouchers",
+          reason: "Order payment completed, no need to clear vouchers"
+        });
+        this.logInfo("updateVoucherPaymentItemsAsync skipped - order already paid", {
+          orderUuid,
+          expectAmount: order.expect_amount,
+          voucherCount: voucherPaymentItems.length
+        });
+        return;
+      }
+      if (expectAmount.lte(0) && voucherPaymentItems.length > 0) {
+        const warningMessage = `订单 ${orderUuid} 已完成支付，不允许添加代金券支付项`;
+        console.warn("[PaymentModule] Voucher update blocked - order already fully paid:", {
+          orderUuid,
+          expectAmount: order.expect_amount,
+          attemptedVoucherCount: voucherPaymentItems.length,
+          reason: "Order already fully paid"
+        });
+        this.logError("updateVoucherPaymentItemsAsync blocked", new Error(warningMessage), {
+          orderUuid,
+          expectAmount: order.expect_amount,
+          voucherPaymentItems
+        });
+        throw new Error(warningMessage);
+      }
       const existingVoucherItems = order.payment.filter(
         (payment) => payment.voucher_id && payment.status !== "voided"
       );

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/Checkout/index.js

@@ -207,7 +207,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         product_id: item.product.product_id,
         product_variant_id: item.product.product_variant_id,
         quantity: item.product.num,
-        selling_price: item.product.price - (item.product.discount_amount || 0) - getDiscountListAmount(item.product.discount_list)
+        selling_price: item.product.calculated_selling_price
       })
     )) || [];
     const relationProducts = ((_e = (_d = (_c = this.store.currentOrder.order_info) == null ? void 0 : _c.original_order_data) == null ? void 0 : _d.relation_products) == null ? void 0 : _e.map(
@@ -792,6 +792,18 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           "当前没有活跃订单，无法更新代金券支付项"
         );
       }
+      const remainingAmount = await this.calculateRemainingAmountAsync();
+      const remainingValue = new import_decimal.default(remainingAmount);
+      if (remainingValue.lte(0)) {
+        this.logInfo("订单已完成支付且修改代金券，跳过操作避免重复同步:", {
+          orderUuid: this.store.currentOrder.uuid,
+          orderId: this.store.currentOrder.order_id,
+          remainingAmount,
+          voucherPaymentItemsCount: voucherPaymentItems.length,
+          reason: "Order payment completed, skip clear vouchers"
+        });
+        return;
+      }
       this.logInfo("开始批量更新代金券支付项:", {
         voucherPaymentItems
       });

package/package.json

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