@pisell/pisellos 0.0.194 → 0.0.195

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

@@ -2,6 +2,13 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { PaymentModuleAPI, PaymentMethod, PaymentOrder, PaymentItem, PaymentItemInput, PaymentUpdateFields, PushOrderParams, CashPayment, EftposPayment, WalletPayment } from './types';
 export * from './types';
+export { generateRequestUniqueId };
+/**
+ * 生成请求唯一ID
+ * 格式: 年月日时分秒毫秒+4位随机数
+ * 示例: 20241201143025123456
+ */
+declare function generateRequestUniqueId(): string;
 /**
  * 支付模块实现
  *

package/dist/modules/Payment/index.js

@@ -28,6 +28,7 @@ import { EftposPaymentImpl } from "./eftpos";
 import { WalletPaymentImpl } from "./wallet";
 import { Decimal } from 'decimal.js';
 export * from "./types";
+export { generateRequestUniqueId };
 
 /**
  * 格式化金额为保留两位小数的字符串
@@ -42,6 +43,25 @@ function formatAmount(amount) {
   }
 }
 
+/**
+ * 生成请求唯一ID
+ * 格式: 年月日时分秒毫秒+4位随机数
+ * 示例: 20241201143025123456
+ */
+function generateRequestUniqueId() {
+  var now = new Date();
+  var year = now.getFullYear();
+  var month = String(now.getMonth() + 1).padStart(2, '0');
+  var day = String(now.getDate()).padStart(2, '0');
+  var hour = String(now.getHours()).padStart(2, '0');
+  var minute = String(now.getMinutes()).padStart(2, '0');
+  var second = String(now.getSeconds()).padStart(2, '0');
+  var millisecond = String(now.getMilliseconds()).padStart(3, '0');
+  var randomDigits = Math.floor(Math.random() * 9000) + 1000; // 1000-9999的4位随机数
+
+  return "".concat(year).concat(month).concat(day).concat(hour).concat(minute).concat(second).concat(millisecond).concat(randomDigits);
+}
+
 /**
  * 支付模块实现
  *
@@ -219,7 +239,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "registerNetworkHandlers",
     value: function registerNetworkHandlers() {
       var _this2 = this;
-      var network = this.app.usePlugin('network');
+      var network = this.app.plugins.get('network');
       this.logInfo('Registering network status listener');
       network === null || network === void 0 || network.addListener('networkStatusChange', function (status) {
         console.log('网络状态:', status.connected);
@@ -1721,6 +1741,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _runPaymentSyncQueue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
         var _this3 = this;
+        var _queue$tasks, queue;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -1734,8 +1755,20 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.logWarning('TasksManager not initialized, cannot run sync queue');
               return _context25.abrupt("return");
             case 6:
+              // 检查队列里有没有要跑的东西，没有就不 run 了
+              queue = this.app.tasksManager.getTaskQueue({
+                module: 'payment',
+                queueId: 'payment_sync'
+              });
+              if (queue !== null && queue !== void 0 && (_queue$tasks = queue.tasks) !== null && _queue$tasks !== void 0 && _queue$tasks.length) {
+                _context25.next = 10;
+                break;
+              }
+              console.log('[PaymentModule] 支付同步队列无内容，不执行');
+              return _context25.abrupt("return");
+            case 10:
               console.log('[PaymentModule] 开始执行支付同步队列');
-              _context25.next = 9;
+              _context25.next = 13;
               return this.app.tasksManager.run({
                 module: 'payment',
                 queueId: 'payment_sync',
@@ -1750,21 +1783,21 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                   }
                 }
               });
-            case 9:
+            case 13:
               this.logInfo('runPaymentSyncQueue completed successfully');
-              _context25.next = 16;
+              _context25.next = 20;
               break;
-            case 12:
-              _context25.prev = 12;
+            case 16:
+              _context25.prev = 16;
               _context25.t0 = _context25["catch"](1);
               console.error('[PaymentModule] 执行支付同步队列失败', _context25.t0);
               this.logError('runPaymentSyncQueue failed', _context25.t0);
               // 不抛出错误，避免影响主流程
-            case 16:
+            case 20:
             case "end":
               return _context25.stop();
           }
-        }, _callee25, this, [[1, 12]]);
+        }, _callee25, this, [[1, 16]]);
       }));
       function runPaymentSyncQueue() {
         return _runPaymentSyncQueue.apply(this, arguments);
@@ -1782,6 +1815,9 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               _payload$task$payload = payload.task.payload, orderUuid = _payload$task$payload.orderUuid, orderId = _payload$task$payload.orderId, paymentData = _payload$task$payload.paymentData, core = _payload$task$payload.core;
               console.log("[PaymentModule] \u5F00\u59CB\u540E\u53F0\u540C\u6B65\u652F\u4ED8\uFF0C\u8BA2\u5355ID: ".concat(orderId));
 
+              // 生成request_unique: 年月日时分秒毫秒+4位随机数
+              paymentData.request_unique = generateRequestUniqueId();
+
               // 从全局获取必要的实例
               app = window.app;
               logger = app === null || app === void 0 ? void 0 : app.logger; // 记录开始日志
@@ -1797,42 +1833,42 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 });
               }
               if (app) {
-                _context26.next = 7;
+                _context26.next = 8;
                 break;
               }
               throw new Error('App 实例未找到');
-            case 7:
+            case 8:
               request = app.request;
               if (request) {
-                _context26.next = 10;
+                _context26.next = 11;
                 break;
               }
               throw new Error('Request 插件未找到');
-            case 10:
+            case 11:
               dbManager = app.dbManager;
               if (dbManager) {
-                _context26.next = 13;
+                _context26.next = 14;
                 break;
               }
               throw new Error('DBManager 未找到');
-            case 13:
-              _context26.prev = 13;
-              _context26.next = 16;
+            case 14:
+              _context26.prev = 14;
+              _context26.next = 17;
               return request.post("/shop/order/".concat(orderId, "/order-payment"), paymentData, {
                 noToast: true
               });
-            case 16:
+            case 17:
               requestRes = _context26.sent;
               if (!(requestRes.status === true)) {
-                _context26.next = 34;
+                _context26.next = 35;
                 break;
               }
-              _context26.next = 20;
+              _context26.next = 21;
               return dbManager.get('order', orderUuid);
-            case 20:
+            case 21:
               order = _context26.sent;
               if (!order) {
-                _context26.next = 26;
+                _context26.next = 27;
                 break;
               }
               order.payment.forEach(function (payment) {
@@ -1840,19 +1876,19 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 // 清除之前的错误状态
                 delete payment.syncError;
               });
-              _context26.next = 25;
+              _context26.next = 26;
               return dbManager.update('order', order);
-            case 25:
-              console.log("[PaymentModule] \u8BA2\u5355 ".concat(orderUuid, " \u540C\u6B65\u72B6\u6001\u5DF2\u66F4\u65B0"));
             case 26:
+              console.log("[PaymentModule] \u8BA2\u5355 ".concat(orderUuid, " \u540C\u6B65\u72B6\u6001\u5DF2\u66F4\u65B0"));
+            case 27:
               console.log("[PaymentModule] \u8BA2\u5355 ".concat(orderUuid, " \u540E\u53F0\u540C\u6B65\u6210\u529F"));
-              _context26.next = 29;
+              _context26.next = 30;
               return core.effects.emit('payment:onPaymentSyncSuccess', {
                 orderUuid: orderUuid,
                 orderId: orderId,
                 timestamp: Date.now()
               });
-            case 29:
+            case 30:
               console.log("[PaymentModule] \u5DF2\u901A\u8FC7 effects \u901A\u77E5\u524D\u7AEF\u8BA2\u5355 ".concat(orderUuid, " \u540C\u6B65\u6210\u529F"));
 
               // 记录成功日志
@@ -1871,7 +1907,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 orderUuid: orderUuid,
                 orderId: orderId
               });
-            case 34:
+            case 35:
               // 接口返回失败，视为业务错误处理
               console.log("[PaymentModule] \u63A5\u53E3\u8FD4\u56DE\u5931\u8D25\uFF0C\u8BA2\u5355 ".concat(orderUuid, " \u540C\u6B65\u5931\u8D25"));
 
@@ -1883,18 +1919,18 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               businessError.isBusinessError = true;
               businessError.responseData = requestRes;
               throw businessError;
-            case 40:
-              _context26.next = 79;
+            case 41:
+              _context26.next = 80;
               break;
-            case 42:
-              _context26.prev = 42;
-              _context26.t0 = _context26["catch"](13);
+            case 43:
+              _context26.prev = 43;
+              _context26.t0 = _context26["catch"](14);
               console.error('[PaymentModule] 后台同步失败:', _context26.t0);
 
               // 检查是否是网络错误（没有响应码）还是业务错误（有响应码）
               isNetworkError = !_context26.t0.response && !_context26.t0.status && (_context26.t0.code === 'NETWORK_ERROR' || _context26.t0.code === 'ERR_NETWORK' || _context26.t0.code === 'ECONNREFUSED' || _context26.t0.code === 'ENOTFOUND' || _context26.t0.code === 'ETIMEDOUT' || ((_error$message = _context26.t0.message) === null || _error$message === void 0 ? void 0 : _error$message.includes('网络')) || ((_error$message2 = _context26.t0.message) === null || _error$message2 === void 0 ? void 0 : _error$message2.includes('network')) || ((_error$message3 = _context26.t0.message) === null || _error$message3 === void 0 ? void 0 : _error$message3.includes('fetch')));
               if (!isNetworkError) {
-                _context26.next = 52;
+                _context26.next = 53;
                 break;
               }
               // 网络错误：重试
@@ -1914,12 +1950,12 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 });
               }
               throw _context26.t0;
-            case 52:
+            case 53:
               // 业务错误（有响应码）：不标记为已同步，通过 effects 通知前端，但不重试
               console.log("[PaymentModule] \u4E1A\u52A1\u9519\u8BEF\uFF0C\u8BA2\u5355 ".concat(orderUuid, " \u540C\u6B65\u5931\u8D25\uFF0C\u901A\u77E5\u524D\u7AEF"));
-              _context26.prev = 53;
+              _context26.prev = 54;
               if (!(core && core.effects)) {
-                _context26.next = 62;
+                _context26.next = 63;
                 break;
               }
               // 通过 effects 通知前端同步错误
@@ -1936,15 +1972,15 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 // 可以添加更多响应数据
                 errorData.responseData = _context26.t0.responseData;
               }
-              _context26.next = 59;
+              _context26.next = 60;
               return core.effects.emit('payment:onPaymentSyncError', errorData);
-            case 59:
+            case 60:
               console.log("[PaymentModule] \u5DF2\u901A\u8FC7 effects \u901A\u77E5\u524D\u7AEF\u8BA2\u5355 ".concat(orderUuid, " \u540C\u6B65\u9519\u8BEF"));
-              _context26.next = 63;
+              _context26.next = 64;
               break;
-            case 62:
-              console.warn("[PaymentModule] \u65E0\u6CD5\u83B7\u53D6 core \u5B9E\u4F8B\uFF0C\u65E0\u6CD5\u901A\u77E5\u524D\u7AEF\u9519\u8BEF");
             case 63:
+              console.warn("[PaymentModule] \u65E0\u6CD5\u83B7\u53D6 core \u5B9E\u4F8B\uFF0C\u65E0\u6CD5\u901A\u77E5\u524D\u7AEF\u9519\u8BEF");
+            case 64:
               // 记录业务错误日志
               if (logger) {
                 logger.addLog({
@@ -1960,11 +1996,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                   }
                 });
               }
-              _context26.next = 70;
+              _context26.next = 71;
               break;
-            case 66:
-              _context26.prev = 66;
-              _context26.t1 = _context26["catch"](53);
+            case 67:
+              _context26.prev = 67;
+              _context26.t1 = _context26["catch"](54);
               console.error("[PaymentModule] \u901A\u77E5\u524D\u7AEF\u540C\u6B65\u9519\u8BEF\u5931\u8D25:", _context26.t1);
 
               // 记录通知错误日志
@@ -1979,23 +2015,23 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                   }
                 });
               }
-            case 70:
-              _context26.next = 72;
+            case 71:
+              _context26.next = 73;
               return dbManager.get('order', orderUuid);
-            case 72:
+            case 73:
               _order2 = _context26.sent;
               if (!_order2) {
-                _context26.next = 78;
+                _context26.next = 79;
                 break;
               }
               _order2.payment.forEach(function (payment) {
                 payment.isSynced = true;
               });
-              _context26.next = 77;
+              _context26.next = 78;
               return dbManager.update('order', _order2);
-            case 77:
-              console.log("[PaymentModule] \u8BA2\u5355 ".concat(orderUuid, " \u4E1A\u52A1\u9519\u8BEF\uFF0C\u5DF2\u6807\u8BB0\u4E3A\u5DF2\u540C\u6B65"));
             case 78:
+              console.log("[PaymentModule] \u8BA2\u5355 ".concat(orderUuid, " \u4E1A\u52A1\u9519\u8BEF\uFF0C\u5DF2\u6807\u8BB0\u4E3A\u5DF2\u540C\u6B65"));
+            case 79:
               return _context26.abrupt("return", {
                 status: 'completed_with_error',
                 orderUuid: orderUuid,
@@ -2003,11 +2039,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 error: _context26.t0.message || '业务错误',
                 statusCode: ((_error$response3 = _context26.t0.response) === null || _error$response3 === void 0 ? void 0 : _error$response3.status) || _context26.t0.status
               });
-            case 79:
+            case 80:
             case "end":
               return _context26.stop();
           }
-        }, _callee26, null, [[13, 42], [53, 66]]);
+        }, _callee26, null, [[14, 43], [54, 67]]);
       }));
       function syncPaymentTask(_x24) {
         return _syncPaymentTask.apply(this, arguments);

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

@@ -2,6 +2,13 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { PaymentModuleAPI, PaymentMethod, PaymentOrder, PaymentItem, PaymentItemInput, PaymentUpdateFields, PushOrderParams, CashPayment, EftposPayment, WalletPayment } from './types';
 export * from './types';
+export { generateRequestUniqueId };
+/**
+ * 生成请求唯一ID
+ * 格式: 年月日时分秒毫秒+4位随机数
+ * 示例: 20241201143025123456
+ */
+declare function generateRequestUniqueId(): string;
 /**
  * 支付模块实现
  *

package/lib/modules/Payment/index.js

@@ -20,7 +20,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Payment/index.ts
 var Payment_exports = {};
 __export(Payment_exports, {
-  PaymentModule: () => PaymentModule
+  PaymentModule: () => PaymentModule,
+  generateRequestUniqueId: () => generateRequestUniqueId
 });
 module.exports = __toCommonJS(Payment_exports);
 var import_BaseModule = require("../BaseModule");
@@ -40,6 +41,18 @@ function formatAmount(amount) {
     return "0.00";
   }
 }
+function generateRequestUniqueId() {
+  const now = /* @__PURE__ */ new Date();
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, "0");
+  const day = String(now.getDate()).padStart(2, "0");
+  const hour = String(now.getHours()).padStart(2, "0");
+  const minute = String(now.getMinutes()).padStart(2, "0");
+  const second = String(now.getSeconds()).padStart(2, "0");
+  const millisecond = String(now.getMilliseconds()).padStart(3, "0");
+  const randomDigits = Math.floor(Math.random() * 9e3) + 1e3;
+  return `${year}${month}${day}${hour}${minute}${second}${millisecond}${randomDigits}`;
+}
 var PaymentModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -130,7 +143,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    *
    */
   registerNetworkHandlers() {
-    const network = this.app.usePlugin("network");
+    const network = this.app.plugins.get("network");
     this.logInfo("Registering network status listener");
     network == null ? void 0 : network.addListener("networkStatusChange", (status) => {
       console.log("网络状态:", status.connected);
@@ -738,13 +751,18 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     var _a, _b, _c, _d, _e, _f;
     const { orderUuid, orderId, paymentData, core } = payload.task.payload;
     console.log(`[PaymentModule] 开始后台同步支付，订单ID: ${orderId}`);
+    paymentData.request_unique = generateRequestUniqueId();
     const app = window.app;
     const logger = app == null ? void 0 : app.logger;
     if (logger) {
       logger.addLog({
         type: "info",
         title: "[PaymentModule] Starting syncPaymentTask",
-        metadata: { orderUuid, orderId, paymentDataKeys: Object.keys(paymentData) }
+        metadata: {
+          orderUuid,
+          orderId,
+          paymentDataKeys: Object.keys(paymentData)
+        }
       });
     }
     if (!app) {
@@ -878,7 +896,9 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
             payment.isSynced = true;
           });
           await dbManager.update("order", order);
-          console.log(`[PaymentModule] 订单 ${orderUuid} 业务错误，已标记为已同步`);
+          console.log(
+            `[PaymentModule] 订单 ${orderUuid} 业务错误，已标记为已同步`
+          );
         }
         return {
           status: "completed_with_error",
@@ -964,6 +984,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    * 外部可以调用此方法来触发支付同步任务的执行
    */
   async runPaymentSyncQueue() {
+    var _a;
     this.logInfo("Starting runPaymentSyncQueue");
     try {
       if (!this.app.tasksManager) {
@@ -971,6 +992,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         this.logWarning("TasksManager not initialized, cannot run sync queue");
         return;
       }
+      const queue = this.app.tasksManager.getTaskQueue({
+        module: "payment",
+        queueId: "payment_sync"
+      });
+      if (!((_a = queue == null ? void 0 : queue.tasks) == null ? void 0 : _a.length)) {
+        console.log("[PaymentModule] 支付同步队列无内容，不执行");
+        return;
+      }
       console.log("[PaymentModule] 开始执行支付同步队列");
       await this.app.tasksManager.run({
         module: "payment",
@@ -996,5 +1025,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PaymentModule,
+  generateRequestUniqueId,
   ...require("./types")
 });

package/package.json

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