@pisell/pisellos 2.1.10 → 2.1.11

package/dist/modules/Payment/index.js

@@ -670,12 +670,18 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return this.dbManager.get('order', params.order_id);
             case 4:
               existingOrder = _context7.sent;
+              this.logInfo('createPaymentOrderAsync existingOrder', {
+                existingOrder: existingOrder
+              });
+              // const existingOrder = existingOrders.find(
+              //   (order: PaymentOrder) => String(order.id) === String(params.order_id),
+              // );
               if (!existingOrder) {
-                _context7.next = 19;
+                _context7.next = 20;
                 break;
               }
               // 如果存在相同 order_id 的订单，更新该订单信息
-              console.log("[PaymentModule] \u53D1\u73B0\u91CD\u590D\u8BA2\u5355 ID: ".concat(params.order_id, "\uFF0C\u66F4\u65B0\u73B0\u6709\u652F\u4ED8\u8BA2\u5355"));
+              this.logInfo("createPaymentOrderAsync found duplicate order ID: ".concat(params.order_id, ", updating existing payment order"));
 
               // const originalOrder = { ...existingOrder };
               existingOrder.order_info = params.order_info;
@@ -687,14 +693,14 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.recalculateOrderAmount(existingOrder);
 
               // 更新到数据库
-              _context7.next = 14;
+              _context7.next = 15;
               return this.dbManager.update('order', existingOrder);
-            case 14:
-              _context7.next = 16;
+            case 15:
+              _context7.next = 17;
               return this.core.effects.emit(PaymentHooks.OnOrderUpdated, existingOrder);
-            case 16:
+            case 17:
               return _context7.abrupt("return", existingOrder);
-            case 19:
+            case 20:
               // 创建新的支付订单
               newOrder = {
                 uuid: getUniqueId('pay_order_'),
@@ -710,31 +716,31 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 is_deposit: params.is_deposit || 0,
                 deposit_amount: params.deposit_amount || '0.00'
               };
-              _context7.next = 22;
+              _context7.next = 23;
               return this.dbManager.add('order', newOrder);
-            case 22:
+            case 23:
               this.core.effects.emit(PaymentHooks.OnOrderAdded, newOrder);
               this.logInfo('createPaymentOrderAsync completed - new payment order created', {
                 orderUuid: newOrder.uuid,
                 orderId: newOrder.id
               });
               return _context7.abrupt("return", newOrder);
-            case 25:
-              _context7.next = 32;
+            case 26:
+              _context7.next = 33;
               break;
-            case 27:
-              _context7.prev = 27;
+            case 28:
+              _context7.prev = 28;
               _context7.t0 = _context7["catch"](1);
               console.error('[PaymentModule] 创建支付订单失败', _context7.t0);
               this.logError('createPaymentOrderAsync failed', _context7.t0, {
                 orderId: params.order_id
               });
               throw _context7.t0;
-            case 32:
+            case 33:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[1, 27]]);
+        }, _callee7, this, [[1, 28]]);
       }));
       function createPaymentOrderAsync(_x6) {
         return _createPaymentOrderAsync.apply(this, arguments);

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

@@ -403,13 +403,19 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
+              this.logInfo('initWalletData called', {
+                params: params
+              });
               amountInfo = (_this$store$currentOr3 = this.store.currentOrder) === null || _this$store$currentOr3 === void 0 || (_this$store$currentOr3 = _this$store$currentOr3.order_info) === null || _this$store$currentOr3 === void 0 ? void 0 : _this$store$currentOr3.amount_breakdown;
               if (amountInfo) {
-                _context8.next = 3;
+                _context8.next = 5;
                 break;
               }
+              this.logInfo('initWalletData amountInfo not found', {
+                params: params
+              });
               return _context8.abrupt("return");
-            case 3:
+            case 5:
               // 准备钱包初始化的业务数据
               walletBusinessData = _objectSpread({
                 customer_id: (_this$store$currentCu = this.store.currentCustomer) !== null && _this$store$currentCu !== void 0 && _this$store$currentCu.customer_id ? Number(this.store.currentCustomer.customer_id) : undefined,
@@ -419,16 +425,28 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 },
                 products: this.getProductListByOrder()
               }, params);
-              _context8.next = 6;
+              this.logInfo('开始拉取:initializeWalletDataFromBusinessAsync', {
+                walletBusinessData: walletBusinessData
+              });
+              _context8.next = 9;
               return this.payment.wallet.initializeWalletDataFromBusinessAsync(walletBusinessData);
-            case 6:
+            case 9:
+              this.logInfo('调用结束:initializeWalletDataFromBusinessAsync', {
+                walletBusinessData: walletBusinessData
+              });
+
+              // 因为上面是接口 这里最好检查一下还有没有 currentOrder 了，如果没有，则不触发事件
               if (this.store.currentOrder) {
-                _context8.next = 8;
+                _context8.next = 12;
                 break;
               }
               return _context8.abrupt("return");
-            case 8:
-              _context8.next = 10;
+            case 12:
+              this.logInfo('initWalletData currentOrder found', {
+                currentOrder: this.store.currentOrder
+              });
+              // 触发钱包数据初始化完成事件
+              _context8.next = 15;
               return this.core.effects.emit(CheckoutHooks.OnWalletDataInitialized, {
                 orderUuid: (_this$store$currentOr4 = this.store.currentOrder) === null || _this$store$currentOr4 === void 0 ? void 0 : _this$store$currentOr4.uuid,
                 customerId: walletBusinessData.customer_id,
@@ -439,7 +457,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 },
                 timestamp: Date.now()
               });
-            case 10:
+            case 15:
             case "end":
               return _context8.stop();
           }
@@ -540,7 +558,6 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 21:
               paymentOrder = _context9.sent;
               this.store.currentOrder = paymentOrder;
-              this.initWalletData();
 
               // 如果设置了自动支付，直接跳转到支付步骤
               if (params.autoPayment) {
@@ -552,9 +569,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 自动设置 stateAmount 为剩余未支付金额
-              _context9.next = 28;
+              _context9.next = 27;
               return this.updateStateAmountToRemaining();
-            case 28:
+            case 27:
               this.logInfo('本地订单创建成功:', {
                 localOrderId: localOrderId,
                 uuid: paymentOrder.uuid,
@@ -563,6 +580,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 taxAmount: amountInfo.taxAmount,
                 stateAmount: this.store.stateAmount
               });
+              this.initWalletData();
               return _context9.abrupt("return", paymentOrder);
             case 32:
               _context9.prev = 32;
@@ -570,12 +588,13 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               _context9.next = 36;
               return this.handleError(_context9.t0, CheckoutErrorType.OrderCreationFailed);
             case 36:
+              this.logError('本地订单创建失败:', _context9.t0);
               this.core.effects.emit(CheckoutHooks.OnOrderCreationFailed, {
                 error: this.store.lastError,
                 timestamp: Date.now()
               });
               throw _context9.t0;
-            case 38:
+            case 39:
             case "end":
               return _context9.stop();
           }

package/lib/modules/Payment/index.js

@@ -324,9 +324,12 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     });
     try {
       const existingOrder = await this.dbManager.get("order", params.order_id);
+      this.logInfo("createPaymentOrderAsync existingOrder", {
+        existingOrder
+      });
       if (existingOrder) {
-        console.log(
-          `[PaymentModule] 发现重复订单 ID: ${params.order_id}，更新现有支付订单`
+        this.logInfo(
+          `createPaymentOrderAsync found duplicate order ID: ${params.order_id}, updating existing payment order`
         );
         existingOrder.order_info = params.order_info;
         existingOrder.total_amount = params.total_amount;

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

@@ -222,8 +222,14 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
   }
   async initWalletData(params) {
     var _a, _b, _c, _d;
+    this.logInfo("initWalletData called", {
+      params
+    });
     const amountInfo = (_b = (_a = this.store.currentOrder) == null ? void 0 : _a.order_info) == null ? void 0 : _b.amount_breakdown;
     if (!amountInfo) {
+      this.logInfo("initWalletData amountInfo not found", {
+        params
+      });
       return;
     }
     const walletBusinessData = {
@@ -235,12 +241,21 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       products: this.getProductListByOrder(),
       ...params
     };
+    this.logInfo("开始拉取:initializeWalletDataFromBusinessAsync", {
+      walletBusinessData
+    });
     await this.payment.wallet.initializeWalletDataFromBusinessAsync(
       walletBusinessData
     );
+    this.logInfo("调用结束:initializeWalletDataFromBusinessAsync", {
+      walletBusinessData
+    });
     if (!this.store.currentOrder) {
       return;
     }
+    this.logInfo("initWalletData currentOrder found", {
+      currentOrder: this.store.currentOrder
+    });
     await this.core.effects.emit(import_types.CheckoutHooks.OnWalletDataInitialized, {
       orderUuid: (_d = this.store.currentOrder) == null ? void 0 : _d.uuid,
       customerId: walletBusinessData.customer_id,
@@ -318,7 +333,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }
       });
       this.store.currentOrder = paymentOrder;
-      this.initWalletData();
       if (params.autoPayment) {
       }
       this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreated, {
@@ -334,12 +348,14 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         taxAmount: amountInfo.taxAmount,
         stateAmount: this.store.stateAmount
       });
+      this.initWalletData();
       return paymentOrder;
     } catch (error) {
       await this.handleError(
         error,
         import_types.CheckoutErrorType.OrderCreationFailed
       );
+      this.logError("本地订单创建失败:", error);
       this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreationFailed, {
         error: this.store.lastError,
         timestamp: Date.now()

package/package.json

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