@pisell/pisellos 2.2.63 → 2.2.65

package/dist/solution/Checkout/index.js

@@ -466,24 +466,24 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initWalletData",
     value: function () {
       var _initWalletData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
-        var _this$store$currentOr3, _this$store$currentCu, _this$store$currentOr4, _this$store$currentOr5, _this$store$currentOr6, _this$store$currentOr8;
-        var amountInfo, walletBusinessData, _this$store$currentOr7;
+        var _this$store$currentOr3, _this$store$currentCu, _this$store$currentOr4, _this$store$currentOr5, _this$store$currentOr6, _this$store$currentOr8, amountInfo, walletBusinessData, _this$store$currentOr7;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               this.logInfo('initWalletData called', {
                 params: params
               });
+              _context8.prev = 1;
               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 = 5;
+                _context8.next = 6;
                 break;
               }
               this.logInfo('initWalletData amountInfo not found', {
                 params: params
               });
               return _context8.abrupt("return");
-            case 5:
+            case 6:
               // 准备钱包初始化的业务数据
               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,
@@ -503,25 +503,25 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('开始拉取:initializeWalletDataFromBusinessAsync', {
                 walletBusinessData: walletBusinessData
               });
-              _context8.next = 10;
+              _context8.next = 11;
               return this.payment.wallet.initializeWalletDataFromBusinessAsync(walletBusinessData);
-            case 10:
+            case 11:
               this.logInfo('调用结束:initializeWalletDataFromBusinessAsync', {
                 walletBusinessData: walletBusinessData
               });
 
               // 因为上面是接口 这里最好检查一下还有没有 currentOrder 了，如果没有，则不触发事件
               if (this.store.currentOrder) {
-                _context8.next = 13;
+                _context8.next = 14;
                 break;
               }
               return _context8.abrupt("return");
-            case 13:
+            case 14:
               this.logInfo('initWalletData currentOrder found', {
                 currentOrder: this.store.currentOrder
               });
               // 触发钱包数据初始化完成事件
-              _context8.next = 16;
+              _context8.next = 17;
               return this.core.effects.emit("".concat(this.name, ":onWalletDataInitialized"), {
                 orderUuid: (_this$store$currentOr8 = this.store.currentOrder) === null || _this$store$currentOr8 === void 0 ? void 0 : _this$store$currentOr8.uuid,
                 customerId: walletBusinessData.customer_id,
@@ -532,11 +532,21 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 },
                 timestamp: Date.now()
               });
-            case 16:
+            case 17:
+              _context8.next = 23;
+              break;
+            case 19:
+              _context8.prev = 19;
+              _context8.t0 = _context8["catch"](1);
+              this.logError('initWalletData error', {
+                error: _context8.t0 instanceof Error ? _context8.t0.message : String(_context8.t0)
+              });
+              throw _context8.t0;
+            case 23:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this);
+        }, _callee8, this, [[1, 19]]);
       }));
       function initWalletData(_x10) {
         return _initWalletData.apply(this, arguments);
@@ -4746,12 +4756,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context42.prev = _context42.next) {
             case 0:
               _ref5 = _args42.length > 1 && _args42[1] !== undefined ? _args42[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$cover;
+              this.logInfo('setOtherParams called', {
+                metadata: {
+                  params: params,
+                  cover: cover
+                }
+              });
               if (cover) {
                 this.otherParams = params;
               } else {
                 this.otherParams = _objectSpread(_objectSpread({}, this.otherParams), params);
               }
-            case 2:
+            case 3:
             case "end":
               return _context42.stop();
           }

package/lib/solution/Checkout/index.js

@@ -291,55 +291,62 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     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
+    try {
+      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 = {
+        customer_id: ((_c = this.store.currentCustomer) == null ? void 0 : _c.customer_id) ? Number(this.store.currentCustomer.customer_id) : void 0,
+        holder: (_f = (_e = (_d = this.store.currentOrder) == null ? void 0 : _d.order_info) == null ? void 0 : _e.original_order_data) == null ? void 0 : _f.holder,
+        amountInfo: {
+          totalAmount: amountInfo.totalAmount,
+          subTotal: amountInfo.subTotal,
+          depositAmount: (_g = this.store.currentOrder) == null ? void 0 : _g.deposit_amount,
+          isDeposit: (_h = this.store.currentOrder) == null ? void 0 : _h.is_deposit
+        },
+        products: this.getProductListByOrder(),
+        is_price_include_tax: this.otherParams.is_price_include_tax,
+        // core 有
+        ...params
+      };
+      if (this.store.isOrderSynced) {
+        walletBusinessData.payment_order_id = (_i = this.store.currentOrder) == null ? void 0 : _i.order_id;
+      }
+      this.logInfo("开始拉取:initializeWalletDataFromBusinessAsync", {
+        walletBusinessData
       });
-      return;
-    }
-    const walletBusinessData = {
-      customer_id: ((_c = this.store.currentCustomer) == null ? void 0 : _c.customer_id) ? Number(this.store.currentCustomer.customer_id) : void 0,
-      holder: (_f = (_e = (_d = this.store.currentOrder) == null ? void 0 : _d.order_info) == null ? void 0 : _e.original_order_data) == null ? void 0 : _f.holder,
-      amountInfo: {
-        totalAmount: amountInfo.totalAmount,
-        subTotal: amountInfo.subTotal,
-        depositAmount: (_g = this.store.currentOrder) == null ? void 0 : _g.deposit_amount,
-        isDeposit: (_h = this.store.currentOrder) == null ? void 0 : _h.is_deposit
-      },
-      products: this.getProductListByOrder(),
-      is_price_include_tax: this.otherParams.is_price_include_tax,
-      // core 有
-      ...params
-    };
-    if (this.store.isOrderSynced) {
-      walletBusinessData.payment_order_id = (_i = this.store.currentOrder) == null ? void 0 : _i.order_id;
-    }
-    this.logInfo("开始拉取:initializeWalletDataFromBusinessAsync", {
-      walletBusinessData
-    });
-    await this.payment.wallet.initializeWalletDataFromBusinessAsync(
-      walletBusinessData
-    );
-    this.logInfo("调用结束:initializeWalletDataFromBusinessAsync", {
-      walletBusinessData
-    });
-    if (!this.store.currentOrder) {
-      return;
+      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(`${this.name}:onWalletDataInitialized`, {
+        orderUuid: (_j = this.store.currentOrder) == null ? void 0 : _j.uuid,
+        customerId: walletBusinessData.customer_id,
+        walletBusinessData: {
+          customer_id: walletBusinessData.customer_id,
+          amountInfo: walletBusinessData.amountInfo,
+          order_wait_pay_amount: params == null ? void 0 : params.order_wait_pay_amount
+        },
+        timestamp: Date.now()
+      });
+    } catch (error) {
+      this.logError("initWalletData error", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
     }
-    this.logInfo("initWalletData currentOrder found", {
-      currentOrder: this.store.currentOrder
-    });
-    await this.core.effects.emit(`${this.name}:onWalletDataInitialized`, {
-      orderUuid: (_j = this.store.currentOrder) == null ? void 0 : _j.uuid,
-      customerId: walletBusinessData.customer_id,
-      walletBusinessData: {
-        customer_id: walletBusinessData.customer_id,
-        amountInfo: walletBusinessData.amountInfo,
-        order_wait_pay_amount: params == null ? void 0 : params.order_wait_pay_amount
-      },
-      timestamp: Date.now()
-    });
   }
   checkIsNeedDepositAsync(bookings, relationProducts) {
     const summaryDeposit = {
@@ -3001,6 +3008,12 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async setOtherParams(params, { cover = false } = {}) {
+    this.logInfo("setOtherParams called", {
+      metadata: {
+        params,
+        cover
+      }
+    });
     if (cover) {
       this.otherParams = params;
     } else {

package/package.json

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