@pisell/pisellos 0.0.279 → 0.0.281

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

@@ -2783,6 +2783,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var hasCapacityIssue = false;
         var resourceCapacityInfo = [];
 
+        // 用于跟踪已处理的商品，避免重复添加
+        var processedCartItemIds = new Set();
+
         // 先检查所有资源类型，收集可用数量信息
         var _loop3 = function _loop3() {
             var _resourceTypeConfig;
@@ -2912,17 +2915,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               };
             }
 
-            // 使用第一个公共可用时间段
+            // 使用第一个公共可用时间段，但只处理未处理过的商品
             var firstCommonSlot = commonTimeSlots[0];
             console.log("\u4F7F\u7528\u516C\u5171\u65F6\u95F4\u6BB5: ".concat(firstCommonSlot.startTime, " - ").concat(firstCommonSlot.endTime));
             items.forEach(function (cartItem) {
-              var processedItem = _objectSpread(_objectSpread({}, cartItem), {}, {
-                start_date: dateRange[0].date,
-                start_time: firstCommonSlot.startTime,
-                end_time: firstCommonSlot.endTime,
-                end_date: dateRange[0].date
-              });
-              processedItemsWithoutTime.push(processedItem);
+              // 只处理未处理过的商品，避免重复添加
+              if (!processedCartItemIds.has(cartItem._id)) {
+                processedCartItemIds.add(cartItem._id);
+                var processedItem = _objectSpread(_objectSpread({}, cartItem), {}, {
+                  start_date: dateRange[0].date,
+                  start_time: firstCommonSlot.startTime,
+                  end_time: firstCommonSlot.endTime,
+                  end_date: dateRange[0].date
+                });
+                processedItemsWithoutTime.push(processedItem);
+              }
             });
           },
           _ret3;
@@ -2970,7 +2977,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         }
         cartItemsByTimeSlot[timeSlotKey].push(cartItem);
       });
-
       // 检查每个时间段是否有足够的资源容量
       var _loop4 = function _loop4() {
           var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),

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

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

@@ -1950,6 +1950,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
       let hasCapacityIssue = false;
       const resourceCapacityInfo = [];
+      const processedCartItemIds = /* @__PURE__ */ new Set();
       for (const [resourceCode, items] of Object.entries(itemsByResourceType)) {
         const targetFormId = resourceCodeToFormIdMap[resourceCode];
         if (!targetFormId) {
@@ -2028,14 +2029,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         const firstCommonSlot = commonTimeSlots[0];
         console.log(`使用公共时间段: ${firstCommonSlot.startTime} - ${firstCommonSlot.endTime}`);
         items.forEach((cartItem) => {
-          const processedItem = {
-            ...cartItem,
-            start_date: dateRange[0].date,
-            start_time: firstCommonSlot.startTime,
-            end_time: firstCommonSlot.endTime,
-            end_date: dateRange[0].date
-          };
-          processedItemsWithoutTime.push(processedItem);
+          if (!processedCartItemIds.has(cartItem._id)) {
+            processedCartItemIds.add(cartItem._id);
+            const processedItem = {
+              ...cartItem,
+              start_date: dateRange[0].date,
+              start_time: firstCommonSlot.startTime,
+              end_time: firstCommonSlot.endTime,
+              end_date: dateRange[0].date
+            };
+            processedItemsWithoutTime.push(processedItem);
+          }
         });
       }
       if (hasCapacityIssue) {

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

package/package.json

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