@pisell/pisellos 2.1.16 → 2.1.18

package/dist/modules/Date/index.js

@@ -267,6 +267,10 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
         if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
           return resource;
         }
+        // 如果resource.advanced 为 null 或者 resource.advanced.unit 为 0，则不进行修正
+        if (!resource.advanced || resource.advanced.unit === 0) {
+          return resource;
+        }
         var resourceStartTime = dayjs(resource.start_time);
 
         // 过滤和修正时间段

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);

package/dist/solution/Checkout/index.js

@@ -1049,7 +1049,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(paymentItem) {
-        var orderPaymentType, processedPaymentItem, metadata, paymentItemWithType, remainingAmount, _paymentItem$type, _paymentItem$code, isEftposPayment, syncResult;
+        var orderPaymentType, processedPaymentItem, metadata, paymentItemWithType, remainingAmount, _paymentItem$type, _paymentItem$code, isEftposPayment, _isCashPayment, isCustomePayment, syncResult;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -1090,44 +1090,46 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 17:
               remainingAmount = _context15.sent;
               if (!(Number(remainingAmount) > 0)) {
-                _context15.next = 36;
+                _context15.next = 38;
                 break;
               }
               this.logInfo('订单金额还有待付的，同步 EFTPOS 支付');
               // 检查是否是 EFTPOS 支付，如果是则立即同步订单
               isEftposPayment = ((_paymentItem$type = paymentItem.type) === null || _paymentItem$type === void 0 ? void 0 : _paymentItem$type.toLowerCase()) === 'eftpos' || ((_paymentItem$code = paymentItem.code) === null || _paymentItem$code === void 0 ? void 0 : _paymentItem$code.toUpperCase().includes('EFTPOS'));
+              _isCashPayment = paymentItem.code === 'CASHMANUAL';
+              isCustomePayment = paymentItem.type === 'custom';
               this.logInfo('EFTPOS 支付检查:', {
                 paymentCode: paymentItem.code,
                 paymentType: paymentItem.type,
                 isEftposPayment: isEftposPayment,
                 currentOrderSynced: this.store.isOrderSynced
               });
-              if (!isEftposPayment) {
-                _context15.next = 36;
+              if (!(isEftposPayment || _isCashPayment || isCustomePayment)) {
+                _context15.next = 38;
                 break;
               }
               this.logInfo('检测到 EFTPOS 支付，立即同步订单到后端...');
-              _context15.prev = 24;
-              _context15.next = 27;
+              _context15.prev = 26;
+              _context15.next = 29;
               return this.syncOrderToBackendWithReturn(true);
-            case 27:
+            case 29:
               syncResult = _context15.sent;
               this.logInfo('EFTPOS 支付后订单同步完成 (已标记为手动同步):', {
                 orderId: syncResult.orderId,
                 isOrderSynced: this.store.isOrderSynced,
                 backendResponse: syncResult.response
               });
-              _context15.next = 36;
+              _context15.next = 38;
               break;
-            case 31:
-              _context15.prev = 31;
-              _context15.t0 = _context15["catch"](24);
+            case 33:
+              _context15.prev = 33;
+              _context15.t0 = _context15["catch"](26);
               this.logError('EFTPOS 支付后订单同步失败:', _context15.t0);
               // 不抛出错误，避免影响支付流程，但记录错误
-              _context15.next = 36;
-              return this.handleError(new Error("EFTPOS \u652F\u4ED8\u540E\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(_context15.t0 instanceof Error ? _context15.t0.message : String(_context15.t0))), CheckoutErrorType.OrderCreationFailed);
-            case 36:
               _context15.next = 38;
+              return this.handleError(new Error("EFTPOS \u652F\u4ED8\u540E\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(_context15.t0 instanceof Error ? _context15.t0.message : String(_context15.t0))), CheckoutErrorType.OrderCreationFailed);
+            case 38:
+              _context15.next = 40;
               return this.core.effects.emit(CheckoutHooks.OnPaymentItemAdded, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: paymentItem.code,
@@ -1135,22 +1137,22 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 amount: String(paymentItem.amount),
                 timestamp: Date.now()
               });
-            case 38:
-              _context15.next = 46;
-              break;
             case 40:
-              _context15.prev = 40;
+              _context15.next = 48;
+              break;
+            case 42:
+              _context15.prev = 42;
               _context15.t1 = _context15["catch"](1);
               this.logError('添加支付项失败:', _context15.t1);
-              _context15.next = 45;
+              _context15.next = 47;
               return this.handleError(_context15.t1, CheckoutErrorType.PaymentFailed);
-            case 45:
+            case 47:
               throw _context15.t1;
-            case 46:
+            case 48:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[1, 40], [24, 31]]);
+        }, _callee15, this, [[1, 42], [26, 33]]);
       }));
       function addPaymentItemAsync(_x14) {
         return _addPaymentItemAsync.apply(this, arguments);
@@ -1284,7 +1286,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, isOrderSynced, orderPaymentType, voucherPaymentItemsWithType, currentOrderId, isCurrentOrderReal, updatedOrder;
         return _regeneratorRuntime().wrap(function _callee17$(_context17) {
           while (1) switch (_context17.prev = _context17.next) {
             case 0:
@@ -1295,6 +1297,26 @@ 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);
+              isOrderSynced = this.store.isOrderSynced;
+              if (!(remainingValue.lte(0) && isOrderSynced && voucherPaymentItems.length === 0)) {
+                _context17.next = 11;
+                break;
+              }
+              this.logInfo('订单已同步且支付完成，跳过清空代金券操作避免重复同步:', {
+                orderUuid: this.store.currentOrder.uuid,
+                orderId: this.store.currentOrder.order_id,
+                remainingAmount: remainingAmount,
+                isOrderSynced: isOrderSynced,
+                voucherPaymentItemsCount: voucherPaymentItems.length,
+                reason: 'Order synced and payment completed, skip clear vouchers to avoid duplicate sync'
+              });
+              return _context17.abrupt("return");
+            case 11:
               this.logInfo('开始批量更新代金券支付项:', {
                 voucherPaymentItems: voucherPaymentItems
               });
@@ -1316,15 +1338,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   metadata: metadata
                 });
               }); // 调用 Payment 模块的批量更新方法
-              _context17.next = 8;
+              _context17.next = 16;
               return this.payment.updateVoucherPaymentItemsAsync(this.store.currentOrder.uuid, voucherPaymentItemsWithType);
-            case 8:
+            case 16:
               // 重新从Payment模块获取最新的订单数据，确保支付项同步
               currentOrderId = this.store.currentOrder.order_id; // 保存当前的订单ID
               isCurrentOrderReal = currentOrderId && !isVirtualOrderId(currentOrderId);
-              _context17.next = 12;
+              _context17.next = 20;
               return this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
-            case 12:
+            case 20:
               updatedOrder = _context17.sent;
               if (updatedOrder) {
                 // 如果当前订单ID是真实ID，但获取到的订单ID是虚拟ID，需要保护真实ID
@@ -1339,10 +1361,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 更新 stateAmount 为剩余未支付金额
-              _context17.next = 16;
+              _context17.next = 24;
               return this.updateStateAmountToRemaining();
-            case 16:
-              _context17.next = 18;
+            case 24:
+              _context17.next = 26;
               return this.core.effects.emit(CheckoutHooks.OnPaymentStarted, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: 'VOUCHER_BATCH',
@@ -1351,23 +1373,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 }, 0).toFixed(2),
                 timestamp: Date.now()
               });
-            case 18:
+            case 26:
               this.logInfo('代金券支付项批量更新成功');
-              _context17.next = 27;
+              _context17.next = 35;
               break;
-            case 21:
-              _context17.prev = 21;
+            case 29:
+              _context17.prev = 29;
               _context17.t0 = _context17["catch"](0);
               this.logError('[Checkout] 批量更新代金券支付项失败:', _context17.t0);
-              _context17.next = 26;
+              _context17.next = 34;
               return this.handleError(_context17.t0, CheckoutErrorType.PaymentFailed);
-            case 26:
+            case 34:
               throw _context17.t0;
-            case 27:
+            case 35:
             case "end":
               return _context17.stop();
           }
-        }, _callee17, this, [[0, 21]]);
+        }, _callee17, this, [[0, 29]]);
       }));
       function updateVoucherPaymentItemsAsync(_x16) {
         return _updateVoucherPaymentItemsAsync.apply(this, arguments);

package/lib/modules/Date/index.js

@@ -178,6 +178,9 @@ var DateModule = class extends import_BaseModule.BaseModule {
       if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
         return resource;
       }
+      if (!resource.advanced || resource.advanced.unit === 0) {
+        return resource;
+      }
       const resourceStartTime = (0, import_dayjs.default)(resource.start_time);
       const correctedTimes = resource.times.map((timeSlot) => {
         if (!timeSlot.start_at || !timeSlot.end_at) {

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,

package/lib/solution/Checkout/index.js

@@ -659,13 +659,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       if (Number(remainingAmount) > 0) {
         this.logInfo("订单金额还有待付的，同步 EFTPOS 支付");
         const isEftposPayment = ((_a = paymentItem.type) == null ? void 0 : _a.toLowerCase()) === "eftpos" || ((_b = paymentItem.code) == null ? void 0 : _b.toUpperCase().includes("EFTPOS"));
+        const isCashPayment2 = paymentItem.code === "CASHMANUAL";
+        const isCustomePayment = paymentItem.type === "custom";
         this.logInfo("EFTPOS 支付检查:", {
           paymentCode: paymentItem.code,
           paymentType: paymentItem.type,
           isEftposPayment,
           currentOrderSynced: this.store.isOrderSynced
         });
-        if (isEftposPayment) {
+        if (isEftposPayment || isCashPayment2 || isCustomePayment) {
           this.logInfo("检测到 EFTPOS 支付，立即同步订单到后端...");
           try {
             const syncResult = await this.syncOrderToBackendWithReturn(true);
@@ -792,6 +794,20 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           "当前没有活跃订单，无法更新代金券支付项"
         );
       }
+      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) {
+        this.logInfo("订单已同步且支付完成，跳过清空代金券操作避免重复同步:", {
+          orderUuid: this.store.currentOrder.uuid,
+          orderId: this.store.currentOrder.order_id,
+          remainingAmount,
+          isOrderSynced,
+          voucherPaymentItemsCount: voucherPaymentItems.length,
+          reason: "Order synced and payment completed, skip clear vouchers to avoid duplicate sync"
+        });
+        return;
+      }
       this.logInfo("开始批量更新代金券支付项:", {
         voucherPaymentItems
       });

package/package.json

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