@pisell/pisellos 0.0.443 → 0.0.444

package/dist/solution/Checkout/index.js

@@ -3851,10 +3851,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           _this$otherParams,
           _localOrderData$booki,
           _localOrderData$relat,
-          _checkoutResponse2,
-          _checkoutResponse3,
-          _checkoutResponse7;
-        var orderUuid, paymentOrder, localOrderData, paymentItems, processedPaymentItems, finalDepositAmount, manualDepositAmount, manualDepositValue, orderPaymentStatus, totalPaidAmount, orderParams, currentOrderId, isUpdateOperation, checkoutResponse, _checkoutResponse, responseStatus, isSuccessResponse, _checkoutResponse4, errorMessage, realOrderId, _checkoutResponse5, extractedOrderId, _checkoutResponse6, syncedPaymentUuids, _iterator3, _step3, paymentUuid, latestPaymentStatus;
+          _checkoutResponse4,
+          _checkoutResponse5,
+          _checkoutResponse9;
+        var orderUuid, paymentOrder, localOrderData, paymentItems, processedPaymentItems, finalDepositAmount, manualDepositAmount, manualDepositValue, orderPaymentStatus, totalPaidAmount, orderParams, currentOrderId, isUpdateOperation, startTime, checkoutResponse, submitSuccess, submitError, _checkoutResponse, _checkoutResponse2, _checkoutResponse3, responseStatus, isSuccessResponse, _checkoutResponse6, errorMessage, realOrderId, _checkoutResponse7, extractedOrderId, _checkoutResponse8, syncedPaymentUuids, _iterator3, _step3, paymentUuid, latestPaymentStatus;
         return _regeneratorRuntime().wrap(function _callee40$(_context40) {
           while (1) switch (_context40.prev = _context40.next) {
             case 0:
@@ -3990,41 +3990,66 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isUpdateOperation: isUpdateOperation,
                 paymentItemCount: processedPaymentItems.length
               });
-              _context40.prev = 28;
+
+              // 发送下单接口请求开始事件
+              startTime = Date.now();
+              _context40.next = 31;
+              return this.core.effects.emit("".concat(this.name, ":onOrderSubmitStart"), {
+                orderUuid: orderUuid,
+                operation: isUpdateOperation ? 'update' : 'create',
+                isManual: false,
+                paymentItemCount: processedPaymentItems.length,
+                timestamp: startTime
+              });
+            case 31:
+              submitSuccess = false;
+              _context40.prev = 32;
               this.logError('EFTPOS repair calling backend checkout API', _objectSpread({
                 url: '/order/checkout',
                 isManual: true
               }, orderParams));
-              _context40.next = 32;
+              _context40.next = 36;
               return this.order.createOrderByCheckout(orderParams);
-            case 32:
+            case 36:
               checkoutResponse = _context40.sent;
-              _context40.next = 39;
+              submitSuccess = true;
+              _context40.next = 45;
               break;
-            case 35:
-              _context40.prev = 35;
-              _context40.t0 = _context40["catch"](28);
+            case 40:
+              _context40.prev = 40;
+              _context40.t0 = _context40["catch"](32);
               this.logError('EFTPOS repair checkout API failed', {
                 orderUuid: orderUuid,
                 error: _context40.t0 instanceof Error ? _context40.t0.message : String(_context40.t0)
               });
+              submitError = _context40.t0 instanceof Error ? _context40.t0.message : String(_context40.t0);
               throw _context40.t0;
-            case 39:
-              _context40.prev = 39;
+            case 45:
+              _context40.prev = 45;
               this.logError('EFTPOS repair sync end', {
                 orderUuid: orderUuid,
                 orderId: currentOrderId,
                 responseStatus: (_checkoutResponse = checkoutResponse) === null || _checkoutResponse === void 0 ? void 0 : _checkoutResponse.status
               });
-              return _context40.finish(39);
-            case 42:
-              responseStatus = (_checkoutResponse2 = checkoutResponse) === null || _checkoutResponse2 === void 0 ? void 0 : _checkoutResponse2.status;
-              isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === 'success' || responseStatus === 1 && ((_checkoutResponse3 = checkoutResponse) === null || _checkoutResponse3 === void 0 ? void 0 : _checkoutResponse3.code) === 200;
+              this.core.effects.emit("".concat(this.name, ":onOrderSubmitEnd"), {
+                success: submitSuccess,
+                orderUuid: orderUuid,
+                operation: isUpdateOperation ? 'update' : 'create',
+                isManual: false,
+                orderId: submitSuccess ? ((_checkoutResponse2 = checkoutResponse) === null || _checkoutResponse2 === void 0 || (_checkoutResponse2 = _checkoutResponse2.data) === null || _checkoutResponse2 === void 0 ? void 0 : _checkoutResponse2.order_id) || ((_checkoutResponse3 = checkoutResponse) === null || _checkoutResponse3 === void 0 ? void 0 : _checkoutResponse3.order_id) : undefined,
+                error: submitError,
+                duration: Date.now() - startTime,
+                timestamp: Date.now()
+              });
+              return _context40.finish(45);
+            case 49:
+              responseStatus = (_checkoutResponse4 = checkoutResponse) === null || _checkoutResponse4 === void 0 ? void 0 : _checkoutResponse4.status;
+              isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === 'success' || responseStatus === 1 && ((_checkoutResponse5 = checkoutResponse) === null || _checkoutResponse5 === void 0 ? void 0 : _checkoutResponse5.code) === 200;
               if (isSuccessResponse) {
-                _context40.next = 48;
+                _context40.next = 55;
                 break;
               }
-              errorMessage = ((_checkoutResponse4 = checkoutResponse) === null || _checkoutResponse4 === void 0 ? void 0 : _checkoutResponse4.message) || '订单同步失败，后端返回非成功状态';
+              errorMessage = ((_checkoutResponse6 = checkoutResponse) === null || _checkoutResponse6 === void 0 ? void 0 : _checkoutResponse6.message) || '订单同步失败，后端返回非成功状态';
               this.logError('EFTPOS repair sync failed: api error', {
                 orderUuid: orderUuid,
                 errorMessage: errorMessage,
@@ -4034,76 +4059,76 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 success: false,
                 response: checkoutResponse
               });
-            case 48:
+            case 55:
               realOrderId = currentOrderId;
               if (isUpdateOperation) {
-                _context40.next = 60;
+                _context40.next = 67;
                 break;
               }
-              extractedOrderId = (_checkoutResponse5 = checkoutResponse) === null || _checkoutResponse5 === void 0 || (_checkoutResponse5 = _checkoutResponse5.data) === null || _checkoutResponse5 === void 0 ? void 0 : _checkoutResponse5.order_id;
+              extractedOrderId = (_checkoutResponse7 = checkoutResponse) === null || _checkoutResponse7 === void 0 || (_checkoutResponse7 = _checkoutResponse7.data) === null || _checkoutResponse7 === void 0 ? void 0 : _checkoutResponse7.order_id;
               if (!extractedOrderId) {
-                extractedOrderId = (_checkoutResponse6 = checkoutResponse) === null || _checkoutResponse6 === void 0 ? void 0 : _checkoutResponse6.order_id;
+                extractedOrderId = (_checkoutResponse8 = checkoutResponse) === null || _checkoutResponse8 === void 0 ? void 0 : _checkoutResponse8.order_id;
               }
               if (extractedOrderId !== undefined && extractedOrderId !== null) {
                 extractedOrderId = String(extractedOrderId);
               }
               realOrderId = extractedOrderId;
               if (!realOrderId) {
-                _context40.next = 59;
+                _context40.next = 66;
                 break;
               }
-              _context40.next = 57;
+              _context40.next = 64;
               return this.payment.replaceOrderIdByUuidAsync(orderUuid, realOrderId);
-            case 57:
-              _context40.next = 60;
+            case 64:
+              _context40.next = 67;
               break;
-            case 59:
+            case 66:
               this.logError('EFTPOS repair missing order_id in response', {
                 orderUuid: orderUuid,
                 response: checkoutResponse
               });
-            case 60:
+            case 67:
               syncedPaymentUuids = processedPaymentItems.filter(function (item) {
                 return item.status !== 'voided';
               }).map(function (item) {
                 return item.uuid;
               }).filter(Boolean);
               _iterator3 = _createForOfIteratorHelper(syncedPaymentUuids);
-              _context40.prev = 62;
+              _context40.prev = 69;
               _iterator3.s();
-            case 64:
+            case 71:
               if ((_step3 = _iterator3.n()).done) {
-                _context40.next = 70;
+                _context40.next = 77;
                 break;
               }
               paymentUuid = _step3.value;
-              _context40.next = 68;
+              _context40.next = 75;
               return this.payment.updatePaymentAsync(orderUuid, paymentUuid, {
                 isSynced: true,
                 syncError: undefined
               });
-            case 68:
-              _context40.next = 64;
+            case 75:
+              _context40.next = 71;
               break;
-            case 70:
-              _context40.next = 75;
+            case 77:
+              _context40.next = 82;
               break;
-            case 72:
-              _context40.prev = 72;
-              _context40.t1 = _context40["catch"](62);
+            case 79:
+              _context40.prev = 79;
+              _context40.t1 = _context40["catch"](69);
               _iterator3.e(_context40.t1);
-            case 75:
-              _context40.prev = 75;
+            case 82:
+              _context40.prev = 82;
               _iterator3.f();
-              return _context40.finish(75);
-            case 78:
-              latestPaymentStatus = ((_checkoutResponse7 = checkoutResponse) === null || _checkoutResponse7 === void 0 || (_checkoutResponse7 = _checkoutResponse7.data) === null || _checkoutResponse7 === void 0 ? void 0 : _checkoutResponse7.payment_status) || orderPaymentStatus;
-              _context40.next = 81;
+              return _context40.finish(82);
+            case 85:
+              latestPaymentStatus = ((_checkoutResponse9 = checkoutResponse) === null || _checkoutResponse9 === void 0 || (_checkoutResponse9 = _checkoutResponse9.data) === null || _checkoutResponse9 === void 0 ? void 0 : _checkoutResponse9.payment_status) || orderPaymentStatus;
+              _context40.next = 88;
               return this.payment.updateOrderAsync(orderUuid, {
                 payment_status: latestPaymentStatus
               });
-            case 81:
-              _context40.next = 83;
+            case 88:
+              _context40.next = 90;
               return this.core.effects.emit("".concat(this.name, ":onOrderSynced"), {
                 orderUuid: orderUuid,
                 realOrderId: realOrderId,
@@ -4113,17 +4138,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 response: checkoutResponse,
                 isFormRepair: true
               });
-            case 83:
+            case 90:
               return _context40.abrupt("return", {
                 success: true,
                 orderId: realOrderId,
                 response: checkoutResponse
               });
-            case 84:
+            case 91:
             case "end":
               return _context40.stop();
           }
-        }, _callee40, this, [[28, 35, 39, 42], [62, 72, 75, 78]]);
+        }, _callee40, this, [[32, 40, 45, 49], [69, 79, 82, 85]]);
       }));
       function syncOrderToBackendFromIndexDbAsync(_x31) {
         return _syncOrderToBackendFromIndexDbAsync.apply(this, arguments);
@@ -4148,8 +4173,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           _this$store$currentOr27,
           _this$store$localOrde,
           _this$store$localOrde2,
-          _checkoutResponse10,
-          _checkoutResponse11;
+          _checkoutResponse12,
+          _checkoutResponse13;
         var isManual,
           customPaymentItems,
           paymentStatus,
@@ -4167,16 +4192,16 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           checkoutResponse,
           submitSuccess,
           submitError,
-          _checkoutResponse8,
-          _checkoutResponse9,
+          _checkoutResponse10,
+          _checkoutResponse11,
           responseStatus,
           isSuccessResponse,
-          _checkoutResponse12,
+          _checkoutResponse14,
           errorMessage,
           realOrderId,
-          _checkoutResponse13,
+          _checkoutResponse15,
           extractedOrderId,
-          _checkoutResponse14,
+          _checkoutResponse16,
           latestPaymentStatus,
           previousOrder,
           updatedOrder,
@@ -4426,7 +4451,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
                 isManual: isManual,
-                orderId: submitSuccess ? ((_checkoutResponse8 = checkoutResponse) === null || _checkoutResponse8 === void 0 || (_checkoutResponse8 = _checkoutResponse8.data) === null || _checkoutResponse8 === void 0 ? void 0 : _checkoutResponse8.order_id) || ((_checkoutResponse9 = checkoutResponse) === null || _checkoutResponse9 === void 0 ? void 0 : _checkoutResponse9.order_id) : undefined,
+                orderId: submitSuccess ? ((_checkoutResponse10 = checkoutResponse) === null || _checkoutResponse10 === void 0 || (_checkoutResponse10 = _checkoutResponse10.data) === null || _checkoutResponse10 === void 0 ? void 0 : _checkoutResponse10.order_id) || ((_checkoutResponse11 = checkoutResponse) === null || _checkoutResponse11 === void 0 ? void 0 : _checkoutResponse11.order_id) : undefined,
                 error: submitError,
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
@@ -4435,13 +4460,13 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return _context41.finish(49);
             case 53:
               // 检查响应状态是否为成功状态
-              responseStatus = (_checkoutResponse10 = checkoutResponse) === null || _checkoutResponse10 === void 0 ? void 0 : _checkoutResponse10.status;
-              isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === 'success' || responseStatus === 1 && ((_checkoutResponse11 = checkoutResponse) === null || _checkoutResponse11 === void 0 ? void 0 : _checkoutResponse11.code) === 200;
+              responseStatus = (_checkoutResponse12 = checkoutResponse) === null || _checkoutResponse12 === void 0 ? void 0 : _checkoutResponse12.status;
+              isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === 'success' || responseStatus === 1 && ((_checkoutResponse13 = checkoutResponse) === null || _checkoutResponse13 === void 0 ? void 0 : _checkoutResponse13.code) === 200;
               if (isSuccessResponse) {
                 _context41.next = 60;
                 break;
               }
-              errorMessage = ((_checkoutResponse12 = checkoutResponse) === null || _checkoutResponse12 === void 0 ? void 0 : _checkoutResponse12.message) || '订单同步失败，后端返回非成功状态'; // 发送订单同步失败事件
+              errorMessage = ((_checkoutResponse14 = checkoutResponse) === null || _checkoutResponse14 === void 0 ? void 0 : _checkoutResponse14.message) || '订单同步失败，后端返回非成功状态'; // 发送订单同步失败事件
               _context41.next = 59;
               return this.core.effects.emit("".concat(this.name, ":onOrderSyncFailed"), {
                 orderUuid: this.store.currentOrder.uuid,
@@ -4466,9 +4491,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               break;
             case 64:
               // 创建操作：从响应中提取新的订单ID
-              extractedOrderId = (_checkoutResponse13 = checkoutResponse) === null || _checkoutResponse13 === void 0 || (_checkoutResponse13 = _checkoutResponse13.data) === null || _checkoutResponse13 === void 0 ? void 0 : _checkoutResponse13.order_id; // 如果data.order_id不存在，尝试直接从根级获取
+              extractedOrderId = (_checkoutResponse15 = checkoutResponse) === null || _checkoutResponse15 === void 0 || (_checkoutResponse15 = _checkoutResponse15.data) === null || _checkoutResponse15 === void 0 ? void 0 : _checkoutResponse15.order_id; // 如果data.order_id不存在，尝试直接从根级获取
               if (!extractedOrderId) {
-                extractedOrderId = (_checkoutResponse14 = checkoutResponse) === null || _checkoutResponse14 === void 0 ? void 0 : _checkoutResponse14.order_id;
+                extractedOrderId = (_checkoutResponse16 = checkoutResponse) === null || _checkoutResponse16 === void 0 ? void 0 : _checkoutResponse16.order_id;
               }
 
               // 确保转换为字符串类型

package/lib/solution/Checkout/index.js

@@ -2413,7 +2413,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     await this.syncOrderToBackendFromIndexDbAsync({ orderUuid });
   }
   async syncOrderToBackendFromIndexDbAsync(params) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const { orderUuid } = params;
     const paymentOrder = await this.payment.getPaymentOrderByUuidAsync(orderUuid);
     if (!paymentOrder) {
@@ -2534,7 +2534,17 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       isUpdateOperation,
       paymentItemCount: processedPaymentItems.length
     });
+    const startTime = Date.now();
+    await this.core.effects.emit(`${this.name}:onOrderSubmitStart`, {
+      orderUuid,
+      operation: isUpdateOperation ? "update" : "create",
+      isManual: false,
+      paymentItemCount: processedPaymentItems.length,
+      timestamp: startTime
+    });
     let checkoutResponse;
+    let submitSuccess = false;
+    let submitError;
     try {
       this.logError("EFTPOS repair calling backend checkout API", {
         url: "/order/checkout",
@@ -2542,11 +2552,13 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         ...orderParams
       });
       checkoutResponse = await this.order.createOrderByCheckout(orderParams);
+      submitSuccess = true;
     } catch (error) {
       this.logError("EFTPOS repair checkout API failed", {
         orderUuid,
         error: error instanceof Error ? error.message : String(error)
       });
+      submitError = error instanceof Error ? error.message : String(error);
       throw error;
     } finally {
       this.logError("EFTPOS repair sync end", {
@@ -2554,6 +2566,16 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         orderId: currentOrderId,
         responseStatus: checkoutResponse == null ? void 0 : checkoutResponse.status
       });
+      this.core.effects.emit(`${this.name}:onOrderSubmitEnd`, {
+        success: submitSuccess,
+        orderUuid,
+        operation: isUpdateOperation ? "update" : "create",
+        isManual: false,
+        orderId: submitSuccess ? ((_f = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _f.order_id) || (checkoutResponse == null ? void 0 : checkoutResponse.order_id) : void 0,
+        error: submitError,
+        duration: Date.now() - startTime,
+        timestamp: Date.now()
+      });
     }
     const responseStatus = checkoutResponse == null ? void 0 : checkoutResponse.status;
     const isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === "success" || responseStatus === 1 && (checkoutResponse == null ? void 0 : checkoutResponse.code) === 200;
@@ -2568,7 +2590,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     }
     let realOrderId = currentOrderId;
     if (!isUpdateOperation) {
-      let extractedOrderId = (_f = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _f.order_id;
+      let extractedOrderId = (_g = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _g.order_id;
       if (!extractedOrderId) {
         extractedOrderId = checkoutResponse == null ? void 0 : checkoutResponse.order_id;
       }
@@ -2592,7 +2614,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         syncError: void 0
       });
     }
-    const latestPaymentStatus = ((_g = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _g.payment_status) || orderPaymentStatus;
+    const latestPaymentStatus = ((_h = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _h.payment_status) || orderPaymentStatus;
     await this.payment.updateOrderAsync(orderUuid, {
       payment_status: latestPaymentStatus
     });

package/package.json

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