@pisell/pisellos 2.1.17 → 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

@@ -1264,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, expectAmount, warningMessage, existingVoucherItems, _iterator5, _step5, voucherItem, _iterator6, _step6, _voucherItem, updatedOrder;
+        var order, existingVoucherItems, _iterator5, _step5, voucherItem, _iterator6, _step6, _voucherItem, updatedOrder;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -1291,43 +1291,6 @@ 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';
@@ -1347,96 +1310,96 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               // 2. 删除所有现有的代金券支付项
               _iterator5 = _createForOfIteratorHelper(existingVoucherItems);
-              _context15.prev = 20;
+              _context15.prev = 10;
               _iterator5.s();
-            case 22:
+            case 12:
               if ((_step5 = _iterator5.n()).done) {
-                _context15.next = 29;
+                _context15.next = 19;
                 break;
               }
               voucherItem = _step5.value;
               console.log("[PaymentModule] \u5220\u9664\u73B0\u6709\u4EE3\u91D1\u5238\u652F\u4ED8\u9879: ".concat(voucherItem.uuid));
-              _context15.next = 27;
+              _context15.next = 17;
               return this.deletePaymentAsync(orderUuid, voucherItem.uuid);
-            case 27:
-              _context15.next = 22;
+            case 17:
+              _context15.next = 12;
               break;
-            case 29:
-              _context15.next = 34;
+            case 19:
+              _context15.next = 24;
               break;
-            case 31:
-              _context15.prev = 31;
-              _context15.t0 = _context15["catch"](20);
+            case 21:
+              _context15.prev = 21;
+              _context15.t0 = _context15["catch"](10);
               _iterator5.e(_context15.t0);
-            case 34:
-              _context15.prev = 34;
+            case 24:
+              _context15.prev = 24;
               _iterator5.f();
-              return _context15.finish(34);
-            case 37:
+              return _context15.finish(24);
+            case 27:
               // 3. 添加新的代金券支付项
               console.log('[PaymentModule] 添加新的代金券支付项:', {
                 orderUuid: orderUuid,
                 newItemCount: voucherPaymentItems.length
               });
               _iterator6 = _createForOfIteratorHelper(voucherPaymentItems);
-              _context15.prev = 39;
+              _context15.prev = 29;
               _iterator6.s();
-            case 41:
+            case 31:
               if ((_step6 = _iterator6.n()).done) {
-                _context15.next = 50;
+                _context15.next = 40;
                 break;
               }
               _voucherItem = _step6.value;
               if (_voucherItem.voucher_id) {
-                _context15.next = 45;
+                _context15.next = 35;
                 break;
               }
               throw new Error("\u4EE3\u91D1\u5238\u652F\u4ED8\u9879\u7F3A\u5C11 voucher_id: ".concat(JSON.stringify(_voucherItem)));
-            case 45:
+            case 35:
               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 = 48;
+              _context15.next = 38;
               return this.addPaymentItemAsync(orderUuid, _voucherItem);
-            case 48:
-              _context15.next = 41;
+            case 38:
+              _context15.next = 31;
               break;
-            case 50:
-              _context15.next = 55;
+            case 40:
+              _context15.next = 45;
               break;
-            case 52:
-              _context15.prev = 52;
-              _context15.t1 = _context15["catch"](39);
+            case 42:
+              _context15.prev = 42;
+              _context15.t1 = _context15["catch"](29);
               _iterator6.e(_context15.t1);
-            case 55:
-              _context15.prev = 55;
+            case 45:
+              _context15.prev = 45;
               _iterator6.f();
-              return _context15.finish(55);
-            case 58:
-              _context15.next = 60;
+              return _context15.finish(45);
+            case 48:
+              _context15.next = 50;
               return this.getPaymentOrderByUuidAsync(orderUuid);
-            case 60:
+            case 50:
               updatedOrder = _context15.sent;
-              _context15.next = 63;
+              _context15.next = 53;
               return this.core.effects.emit(PaymentHooks.OnPaymentAdded, {
                 orderUuid: orderUuid,
                 order: updatedOrder,
                 payment: null // 批量操作不提供单个支付项
               });
-            case 63:
+            case 53:
               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 = 71;
+              _context15.next = 61;
               break;
-            case 66:
-              _context15.prev = 66;
+            case 56:
+              _context15.prev = 56;
               _context15.t2 = _context15["catch"](1);
               console.error('[PaymentModule] 批量更新代金券支付项失败:', _context15.t2);
               this.logError('updateVoucherPaymentItemsAsync failed', _context15.t2, {
@@ -1444,11 +1407,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 voucherPaymentItems: voucherPaymentItems
               });
               throw _context15.t2;
-            case 71:
+            case 61:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[1, 66], [20, 31, 34, 37], [39, 52, 55, 58]]);
+        }, _callee15, this, [[1, 56], [10, 21, 24, 27], [29, 42, 45, 48]]);
       }));
       function updateVoucherPaymentItemsAsync(_x18, _x19) {
         return _updateVoucherPaymentItemsAsync.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 remainingAmount, remainingValue, 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:
@@ -1300,19 +1302,21 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 5:
               remainingAmount = _context17.sent;
               remainingValue = new Decimal(remainingAmount);
-              if (!remainingValue.lte(0)) {
-                _context17.next = 10;
+              isOrderSynced = this.store.isOrderSynced;
+              if (!(remainingValue.lte(0) && isOrderSynced && voucherPaymentItems.length === 0)) {
+                _context17.next = 11;
                 break;
               }
-              this.logInfo('订单已完成支付且修改代金券，跳过操作避免重复同步:', {
+              this.logInfo('订单已同步且支付完成，跳过清空代金券操作避免重复同步:', {
                 orderUuid: this.store.currentOrder.uuid,
                 orderId: this.store.currentOrder.order_id,
                 remainingAmount: remainingAmount,
+                isOrderSynced: isOrderSynced,
                 voucherPaymentItemsCount: voucherPaymentItems.length,
-                reason: 'Order payment completed, skip clear vouchers'
+                reason: 'Order synced and payment completed, skip clear vouchers to avoid duplicate sync'
               });
               return _context17.abrupt("return");
-            case 10:
+            case 11:
               this.logInfo('开始批量更新代金券支付项:', {
                 voucherPaymentItems: voucherPaymentItems
               });
@@ -1334,15 +1338,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   metadata: metadata
                 });
               }); // 调用 Payment 模块的批量更新方法
-              _context17.next = 15;
+              _context17.next = 16;
               return this.payment.updateVoucherPaymentItemsAsync(this.store.currentOrder.uuid, voucherPaymentItemsWithType);
-            case 15:
+            case 16:
               // 重新从Payment模块获取最新的订单数据，确保支付项同步
               currentOrderId = this.store.currentOrder.order_id; // 保存当前的订单ID
               isCurrentOrderReal = currentOrderId && !isVirtualOrderId(currentOrderId);
-              _context17.next = 19;
+              _context17.next = 20;
               return this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
-            case 19:
+            case 20:
               updatedOrder = _context17.sent;
               if (updatedOrder) {
                 // 如果当前订单ID是真实ID，但获取到的订单ID是虚拟ID，需要保护真实ID
@@ -1357,10 +1361,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 更新 stateAmount 为剩余未支付金额
-              _context17.next = 23;
+              _context17.next = 24;
               return this.updateStateAmountToRemaining();
-            case 23:
-              _context17.next = 25;
+            case 24:
+              _context17.next = 26;
               return this.core.effects.emit(CheckoutHooks.OnPaymentStarted, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: 'VOUCHER_BATCH',
@@ -1369,23 +1373,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 }, 0).toFixed(2),
                 timestamp: Date.now()
               });
-            case 25:
+            case 26:
               this.logInfo('代金券支付项批量更新成功');
-              _context17.next = 34;
+              _context17.next = 35;
               break;
-            case 28:
-              _context17.prev = 28;
+            case 29:
+              _context17.prev = 29;
               _context17.t0 = _context17["catch"](0);
               this.logError('[Checkout] 批量更新代金券支付项失败:', _context17.t0);
-              _context17.next = 33;
+              _context17.next = 34;
               return this.handleError(_context17.t0, CheckoutErrorType.PaymentFailed);
-            case 33:
-              throw _context17.t0;
             case 34:
+              throw _context17.t0;
+            case 35:
             case "end":
               return _context17.stop();
           }
-        }, _callee17, this, [[0, 28]]);
+        }, _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

@@ -670,36 +670,6 @@ 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/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);
@@ -794,13 +796,15 @@ 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("订单已完成支付且修改代金券，跳过操作避免重复同步:", {
+      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 payment completed, skip clear vouchers"
+          reason: "Order synced and payment completed, skip clear vouchers to avoid duplicate sync"
         });
         return;
       }

package/package.json

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