@pisell/pisellos 0.0.281 → 0.0.283

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<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/BookingTicket/index.d.ts

@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/Checkout/index.js

@@ -1080,17 +1080,25 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.payment.addPaymentItemAsync(this.store.currentOrder.uuid, paymentItemWithType);
             case 12:
               this.logInfo('支付项添加成功');
+              // 触发支付项添加事件（可以复用支付开始事件）
+              this.core.effects.emit(CheckoutHooks.OnPaymentItemAdded, {
+                orderUuid: this.store.currentOrder.uuid,
+                paymentMethodCode: paymentItem.code,
+                paymentMethodName: paymentItem.name,
+                amount: String(paymentItem.amount),
+                timestamp: Date.now()
+              });
 
               // 支付项添加后，更新 stateAmount 为剩余未支付金额
-              _context15.next = 15;
+              _context15.next = 16;
               return this.updateStateAmountToRemaining();
-            case 15:
-              _context15.next = 17;
+            case 16:
+              _context15.next = 18;
               return this.calculateRemainingAmountAsync();
-            case 17:
+            case 18:
               remainingAmount = _context15.sent;
               if (!(Number(remainingAmount) > 0)) {
-                _context15.next = 38;
+                _context15.next = 39;
                 break;
               }
               this.logInfo('订单金额还有待付的，同步 EFTPOS 支付');
@@ -1105,54 +1113,45 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 currentOrderSynced: this.store.isOrderSynced
               });
               if (!(isEftposPayment || _isCashPayment || isCustomePayment)) {
-                _context15.next = 38;
+                _context15.next = 39;
                 break;
               }
               this.logInfo('检测到 EFTPOS 支付，立即同步订单到后端...');
-              _context15.prev = 26;
-              _context15.next = 29;
+              _context15.prev = 27;
+              _context15.next = 30;
               return this.syncOrderToBackendWithReturn(true);
-            case 29:
+            case 30:
               syncResult = _context15.sent;
               this.logInfo('EFTPOS 支付后订单同步完成 (已标记为手动同步):', {
                 orderId: syncResult.orderId,
                 isOrderSynced: this.store.isOrderSynced,
                 backendResponse: syncResult.response
               });
-              _context15.next = 38;
+              _context15.next = 39;
               break;
-            case 33:
-              _context15.prev = 33;
-              _context15.t0 = _context15["catch"](26);
+            case 34:
+              _context15.prev = 34;
+              _context15.t0 = _context15["catch"](27);
               this.logError('EFTPOS 支付后订单同步失败:', _context15.t0);
               // 不抛出错误，避免影响支付流程，但记录错误
-              _context15.next = 38;
+              _context15.next = 39;
               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,
-                paymentMethodName: paymentItem.name,
-                amount: String(paymentItem.amount),
-                timestamp: Date.now()
-              });
-            case 40:
-              _context15.next = 48;
+            case 39:
+              _context15.next = 47;
               break;
-            case 42:
-              _context15.prev = 42;
+            case 41:
+              _context15.prev = 41;
               _context15.t1 = _context15["catch"](1);
               this.logError('添加支付项失败:', _context15.t1);
-              _context15.next = 47;
+              _context15.next = 46;
               return this.handleError(_context15.t1, CheckoutErrorType.PaymentFailed);
-            case 47:
+            case 46:
               throw _context15.t1;
-            case 48:
+            case 47:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[1, 42], [26, 33]]);
+        }, _callee15, this, [[1, 41], [27, 34]]);
       }));
       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<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/BookingTicket/index.d.ts

@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/Checkout/index.js

@@ -654,6 +654,13 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         paymentItemWithType
       );
       this.logInfo("支付项添加成功");
+      this.core.effects.emit(import_types.CheckoutHooks.OnPaymentItemAdded, {
+        orderUuid: this.store.currentOrder.uuid,
+        paymentMethodCode: paymentItem.code,
+        paymentMethodName: paymentItem.name,
+        amount: String(paymentItem.amount),
+        timestamp: Date.now()
+      });
       await this.updateStateAmountToRemaining();
       const remainingAmount = await this.calculateRemainingAmountAsync();
       if (Number(remainingAmount) > 0) {
@@ -687,13 +694,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           }
         }
       }
-      await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentItemAdded, {
-        orderUuid: this.store.currentOrder.uuid,
-        paymentMethodCode: paymentItem.code,
-        paymentMethodName: paymentItem.name,
-        amount: String(paymentItem.amount),
-        timestamp: Date.now()
-      });
     } catch (error) {
       this.logError("添加支付项失败:", error);
       await this.handleError(error, import_types.CheckoutErrorType.PaymentFailed);

package/package.json

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