@pisell/pisellos 0.0.283 → 0.0.285

package/dist/modules/Cart/utils/cartResource.js

@@ -80,6 +80,8 @@ export var formatResourceToCartItemOrigin = function formatResourceToCartItemOri
     origin.end_date = null;
     origin.end_time = null;
   }
+  origin.relation_type = '';
+  origin.relation_id = 0;
   return origin;
 };
 

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, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/Checkout/index.js

@@ -1080,25 +1080,17 @@ 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 = 16;
+              _context15.next = 15;
               return this.updateStateAmountToRemaining();
-            case 16:
-              _context15.next = 18;
+            case 15:
+              _context15.next = 17;
               return this.calculateRemainingAmountAsync();
-            case 18:
+            case 17:
               remainingAmount = _context15.sent;
               if (!(Number(remainingAmount) > 0)) {
-                _context15.next = 39;
+                _context15.next = 38;
                 break;
               }
               this.logInfo('订单金额还有待付的，同步 EFTPOS 支付');
@@ -1113,30 +1105,38 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 currentOrderSynced: this.store.isOrderSynced
               });
               if (!(isEftposPayment || _isCashPayment || isCustomePayment)) {
-                _context15.next = 39;
+                _context15.next = 38;
                 break;
               }
               this.logInfo('检测到 EFTPOS 支付，立即同步订单到后端...');
-              _context15.prev = 27;
-              _context15.next = 30;
+              _context15.prev = 26;
+              _context15.next = 29;
               return this.syncOrderToBackendWithReturn(true);
-            case 30:
+            case 29:
               syncResult = _context15.sent;
               this.logInfo('EFTPOS 支付后订单同步完成 (已标记为手动同步):', {
                 orderId: syncResult.orderId,
                 isOrderSynced: this.store.isOrderSynced,
                 backendResponse: syncResult.response
               });
-              _context15.next = 39;
+              _context15.next = 38;
               break;
-            case 34:
-              _context15.prev = 34;
-              _context15.t0 = _context15["catch"](27);
+            case 33:
+              _context15.prev = 33;
+              _context15.t0 = _context15["catch"](26);
               this.logError('EFTPOS 支付后订单同步失败:', _context15.t0);
               // 不抛出错误，避免影响支付流程，但记录错误
-              _context15.next = 39;
+              _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 39:
+            case 38:
+              // 触发支付项添加事件（可以复用支付开始事件）
+              this.core.effects.emit(CheckoutHooks.OnPaymentItemAdded, {
+                orderUuid: this.store.currentOrder.uuid,
+                paymentMethodCode: paymentItem.code,
+                paymentMethodName: paymentItem.name,
+                amount: String(paymentItem.amount),
+                timestamp: Date.now()
+              });
               _context15.next = 47;
               break;
             case 41:
@@ -1151,7 +1151,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[1, 41], [27, 34]]);
+        }, _callee15, this, [[1, 41], [26, 33]]);
       }));
       function addPaymentItemAsync(_x14) {
         return _addPaymentItemAsync.apply(this, arguments);

package/lib/modules/Cart/utils/cartResource.js

@@ -107,6 +107,8 @@ var formatResourceToCartItemOrigin = (params) => {
     origin.end_date = null;
     origin.end_time = null;
   }
+  origin.relation_type = "";
+  origin.relation_id = 0;
   return origin;
 };
 var deleteResourceFromCartItem = (cartItem) => {

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, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/Checkout/index.js

@@ -654,13 +654,6 @@ 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) {
@@ -694,6 +687,13 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           }
         }
       }
+      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.283",
+  "version": "0.0.285",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",