@pisell/pisellos 0.0.255 → 0.0.257

package/dist/modules/Order/index.js

@@ -354,21 +354,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.post('/order/checkout', orderData);
             case 11:
               response = _context3.sent;
+              this.logInfo('Order API called successfully', {
+                response: response
+              });
               console.log('[Order] 订单创建成功，后端响应:', {
                 success: !!response,
                 hasOrderId: !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.order_id || response !== null && response !== void 0 && response.order_id)
               });
               return _context3.abrupt("return", response);
-            case 16:
-              _context3.prev = 16;
+            case 17:
+              _context3.prev = 17;
               _context3.t0 = _context3["catch"](2);
               console.error('[Order] createOrderByCheckout 创建订单失败:', _context3.t0);
+              this.logInfo('Order API called failed', {
+                error: _context3.t0 instanceof Error ? _context3.t0.message : String(_context3.t0)
+              });
               throw _context3.t0;
-            case 20:
+            case 22:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[2, 16]]);
+        }, _callee3, this, [[2, 17]]);
       }));
       function createOrderByCheckout(_x4) {
         return _createOrderByCheckout.apply(this, arguments);

package/dist/modules/Payment/index.d.ts

@@ -23,6 +23,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     private store;
     private dbManager;
     private logger;
+    protected otherParams: any;
     cash: CashPayment;
     eftpos: EftposPayment;
     wallet: WalletPassPayment;
@@ -31,19 +32,19 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     /**
      * 记录信息日志
      */
-    private logInfo;
+    logInfo(title: string, metadata?: any): void;
     /**
      * 记录警告日志
      */
-    private logWarning;
+    logWarning(title: string, metadata?: any): void;
     /**
      * 记录错误日志
      */
-    private logError;
+    logError(title: string, error?: any, metadata?: any): void;
     /**
      * 记录调试日志
      */
-    private logDebug;
+    logDebug(title: string, metadata?: any): void;
     /**
      * 网络恢复以后，尝试执行队列
      *

package/dist/modules/Payment/index.js

@@ -85,6 +85,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     // IndexDBManager 实例
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
     // LoggerManager 实例
+    _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     // 支付方式实例
     _defineProperty(_assertThisInitialized(_this), "cash", void 0);
     _defineProperty(_assertThisInitialized(_this), "eftpos", void 0);
@@ -104,34 +105,35 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core = core;
               this.store = options.store;
+              this.otherParams = options.otherParams || {};
 
               // 获取依赖的插件
               this.request = core.getPlugin('request');
               appPlugin = core.getPlugin('app');
               if (this.request) {
-                _context.next = 6;
+                _context.next = 7;
                 break;
               }
               throw new Error('支付模块需要 request 插件支持');
-            case 6:
+            case 7:
               if (appPlugin) {
-                _context.next = 8;
+                _context.next = 9;
                 break;
               }
               throw new Error('支付模块需要 app 插件支持');
-            case 8:
+            case 9:
               this.app = appPlugin.getApp();
               this.dbManager = this.app.dbManager;
               this.logger = this.app.logger;
 
               // 确保支付模块所需的对象存储已创建
-              _context.next = 13;
+              _context.next = 14;
               return this.ensurePaymentTables();
-            case 13:
+            case 14:
               this.registerNetworkHandlers();
               console.log('[PaymentModule] 初始化完成');
               this.logInfo('PaymentModule initialized successfully');
-            case 16:
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -148,6 +150,15 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "logInfo",
     value: function logInfo(title, metadata) {
+      var _this$otherParams;
+      if ((_this$otherParams = this.otherParams) !== null && _this$otherParams !== void 0 && _this$otherParams.fatherModule) {
+        var _this$otherParams2;
+        var fatherModule = this.core.getModule((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.fatherModule);
+        if (fatherModule) {
+          fatherModule.logInfo("".concat(title), metadata);
+          return;
+        }
+      }
       if (this.logger) {
         this.logger.addLog({
           type: 'info',
@@ -646,7 +657,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "createPaymentOrderAsync",
     value: (function () {
       var _createPaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
-        var existingOrders, existingOrder, originalOrder, newOrder;
+        var existingOrder, newOrder;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -656,19 +667,17 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               });
               _context7.prev = 1;
               _context7.next = 4;
-              return this.dbManager.getAll('order');
+              return this.dbManager.get('order', params.order_id);
             case 4:
-              existingOrders = _context7.sent;
-              existingOrder = existingOrders.find(function (order) {
-                return String(order.id) === String(params.order_id);
-              });
+              existingOrder = _context7.sent;
               if (!existingOrder) {
-                _context7.next = 21;
+                _context7.next = 19;
                 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"));
-              originalOrder = _objectSpread({}, existingOrder);
+
+              // const originalOrder = { ...existingOrder };
               existingOrder.order_info = params.order_info;
               existingOrder.total_amount = params.total_amount;
               existingOrder.is_deposit = params.is_deposit || 0;
@@ -678,14 +687,14 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.recalculateOrderAmount(existingOrder);
 
               // 更新到数据库
-              _context7.next = 16;
+              _context7.next = 14;
               return this.dbManager.update('order', existingOrder);
-            case 16:
-              _context7.next = 18;
+            case 14:
+              _context7.next = 16;
               return this.core.effects.emit(PaymentHooks.OnOrderUpdated, existingOrder);
-            case 18:
+            case 16:
               return _context7.abrupt("return", existingOrder);
-            case 21:
+            case 19:
               // 创建新的支付订单
               newOrder = {
                 uuid: getUniqueId('pay_order_'),
@@ -701,33 +710,31 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 is_deposit: params.is_deposit || 0,
                 deposit_amount: params.deposit_amount || '0.00'
               };
-              _context7.next = 24;
+              _context7.next = 22;
               return this.dbManager.add('order', newOrder);
-            case 24:
-              _context7.next = 26;
-              return this.core.effects.emit(PaymentHooks.OnOrderAdded, newOrder);
-            case 26:
+            case 22:
+              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 28:
-              _context7.next = 35;
+            case 25:
+              _context7.next = 32;
               break;
-            case 30:
-              _context7.prev = 30;
+            case 27:
+              _context7.prev = 27;
               _context7.t0 = _context7["catch"](1);
               console.error('[PaymentModule] 创建支付订单失败', _context7.t0);
               this.logError('createPaymentOrderAsync failed', _context7.t0, {
                 orderId: params.order_id
               });
               throw _context7.t0;
-            case 35:
+            case 32:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[1, 30]]);
+        }, _callee7, this, [[1, 27]]);
       }));
       function createPaymentOrderAsync(_x6) {
         return _createPaymentOrderAsync.apply(this, arguments);