@pisell/pisellos 0.0.408 → 0.0.410

package/dist/solution/Checkout/index.js

@@ -1239,7 +1239,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "replaceLocalOrderIdAsync",
     value: (function () {
       var _replaceLocalOrderIdAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(newOrderId) {
-        var updatedOrder;
+        var previousOrder, latestPaymentStatus, updatedOrder;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1251,24 +1251,38 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               console.warn('[Checkout] 没有当前订单，无法替换订单ID');
               return _context13.abrupt("return", null);
             case 4:
-              _context13.next = 6;
-              return this.payment.replaceOrderIdByUuidAsync(this.store.currentOrder.uuid, newOrderId);
-            case 6:
+              previousOrder = this.store.currentOrder;
+              latestPaymentStatus = previousOrder.payment_status;
+              _context13.next = 8;
+              return this.payment.replaceOrderIdByUuidAsync(previousOrder.uuid, newOrderId);
+            case 8:
               updatedOrder = _context13.sent;
               if (!updatedOrder) {
-                _context13.next = 15;
+                _context13.next = 20;
                 break;
               }
-              // 更新当前订单引用
-              this.store.currentOrder = updatedOrder;
+              // 🔧 重要：Payment.replaceOrderIdByUuidAsync 返回的是 DB 快照（只保证 order_id 变化）
+              // 这里需要合并到内存态，避免覆盖掉刚刚从后端拿到的 payment_status 等字段
+              this.store.currentOrder = _objectSpread(_objectSpread(_objectSpread({}, previousOrder), updatedOrder), {}, {
+                payment_status: latestPaymentStatus
+              });
 
-              // 触发订单更新事件
-              _context13.next = 11;
+              // 同步更新 Payment 模块 DB，避免后续再次从 DB 读回旧的 payment_status
+              if (!latestPaymentStatus) {
+                _context13.next = 14;
+                break;
+              }
+              _context13.next = 14;
+              return this.payment.updateOrderAsync(previousOrder.uuid, {
+                payment_status: latestPaymentStatus
+              });
+            case 14:
+              _context13.next = 16;
               return this.core.effects.emit("".concat(this.name, ":onOrderCreated"), {
                 order: updatedOrder,
                 timestamp: Date.now()
               });
-            case 11:
+            case 16:
               console.log('[Checkout] 本地订单ID替换成功:', {
                 uuid: updatedOrder.uuid,
                 newOrderId: updatedOrder.id
@@ -1278,23 +1292,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.store.isOrderSynced = true;
 
               // 订单ID替换后更新 stateAmount
-              _context13.next = 15;
+              _context13.next = 20;
               return this.updateStateAmountToRemaining(false);
-            case 15:
+            case 20:
               return _context13.abrupt("return", updatedOrder);
-            case 18:
-              _context13.prev = 18;
+            case 23:
+              _context13.prev = 23;
               _context13.t0 = _context13["catch"](0);
               console.error('[Checkout] 替换订单ID失败:', _context13.t0);
-              _context13.next = 23;
+              _context13.next = 28;
               return this.handleError(_context13.t0, CheckoutErrorType.UnknownError);
-            case 23:
+            case 28:
               return _context13.abrupt("return", null);
-            case 24:
+            case 29:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[0, 18]]);
+        }, _callee13, this, [[0, 23]]);
       }));
       function replaceLocalOrderIdAsync(_x13) {
         return _replaceLocalOrderIdAsync.apply(this, arguments);
@@ -3782,6 +3796,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           _checkoutResponse6,
           extractedOrderId,
           _checkoutResponse7,
+          latestPaymentStatus,
+          previousOrder,
           updatedOrder,
           beforeManualUpdate,
           syncedPaymentUuids,
@@ -3997,18 +4013,19 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 35:
               checkoutResponse = _context39.sent;
               submitSuccess = true;
+              this.store.currentOrder.payment_status = checkoutResponse.data.payment_status;
               this.logInfo('下单接口调用成功', checkoutResponse);
-              _context39.next = 48;
+              _context39.next = 49;
               break;
-            case 40:
-              _context39.prev = 40;
+            case 41:
+              _context39.prev = 41;
               _context39.t1 = _context39["catch"](31);
               submitSuccess = false;
               submitError = _context39.t1 instanceof Error ? _context39.t1.message : String(_context39.t1);
               this.logError('下单接口调用失败:', submitError);
 
               // 发送订单同步失败事件（网络错误或请求失败）
-              _context39.next = 47;
+              _context39.next = 48;
               return this.core.effects.emit("".concat(this.name, ":onOrderSyncFailed"), {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -4018,11 +4035,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 47:
-              throw _context39.t1;
             case 48:
-              _context39.prev = 48;
-              _context39.next = 51;
+              throw _context39.t1;
+            case 49:
+              _context39.prev = 49;
+              _context39.next = 52;
               return this.core.effects.emit("".concat(this.name, ":onOrderSubmitEnd"), {
                 success: submitSuccess,
                 orderUuid: this.store.currentOrder.uuid,
@@ -4033,18 +4050,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 51:
-              return _context39.finish(48);
             case 52:
+              return _context39.finish(49);
+            case 53:
               // 检查响应状态是否为成功状态
               responseStatus = (_checkoutResponse3 = checkoutResponse) === null || _checkoutResponse3 === void 0 ? void 0 : _checkoutResponse3.status;
               isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === 'success' || responseStatus === 1 && ((_checkoutResponse4 = checkoutResponse) === null || _checkoutResponse4 === void 0 ? void 0 : _checkoutResponse4.code) === 200;
               if (isSuccessResponse) {
-                _context39.next = 59;
+                _context39.next = 60;
                 break;
               }
               errorMessage = ((_checkoutResponse5 = checkoutResponse) === null || _checkoutResponse5 === void 0 ? void 0 : _checkoutResponse5.message) || '订单同步失败，后端返回非成功状态'; // 发送订单同步失败事件
-              _context39.next = 58;
+              _context39.next = 59;
               return this.core.effects.emit("".concat(this.name, ":onOrderSyncFailed"), {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -4055,18 +4072,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 58:
-              throw new Error(errorMessage);
             case 59:
+              throw new Error(errorMessage);
+            case 60:
               if (!isUpdateOperation) {
-                _context39.next = 63;
+                _context39.next = 64;
                 break;
               }
               // 更新操作：使用现有的订单ID
               realOrderId = currentOrderId;
-              _context39.next = 82;
+              _context39.next = 97;
               break;
-            case 63:
+            case 64:
               // 创建操作：从响应中提取新的订单ID
               extractedOrderId = (_checkoutResponse6 = checkoutResponse) === null || _checkoutResponse6 === void 0 || (_checkoutResponse6 = _checkoutResponse6.data) === null || _checkoutResponse6 === void 0 ? void 0 : _checkoutResponse6.order_id; // 如果data.order_id不存在，尝试直接从根级获取
               if (!extractedOrderId) {
@@ -4088,91 +4105,113 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 oldOrderId: this.store.currentOrder.order_id,
                 newOrderId: realOrderId
               });
-              _context39.prev = 69;
-              _context39.next = 72;
-              return this.payment.replaceOrderIdByUuidAsync(this.store.currentOrder.uuid, realOrderId);
-            case 72:
+              _context39.prev = 70;
+              latestPaymentStatus = this.store.currentOrder.payment_status;
+              previousOrder = this.store.currentOrder;
+              _context39.next = 75;
+              return this.payment.replaceOrderIdByUuidAsync(previousOrder.uuid, realOrderId);
+            case 75:
               updatedOrder = _context39.sent;
               this.logInfo('Payment模块替换订单ID结果:', {
                 wasSuccessful: !!updatedOrder,
                 returnedOrderId: updatedOrder === null || updatedOrder === void 0 ? void 0 : updatedOrder.order_id,
                 expectedOrderId: realOrderId
               });
-              if (updatedOrder) {
-                this.logInfo('Payment模块返回的更新后订单:', {
-                  uuid: updatedOrder.uuid,
-                  orderId: updatedOrder.order_id,
-                  totalAmount: updatedOrder.total_amount
-                });
-                this.store.currentOrder = updatedOrder;
-                this.logInfo('[Checkout] 订单ID替换成功，当前订单ID:', this.store.currentOrder.order_id);
-              } else {
-                this.logError('[Checkout] Payment模块返回空订单，订单ID替换失败，开始手动替换');
+              if (!updatedOrder) {
+                _context39.next = 86;
+                break;
+              }
+              this.logInfo('Payment模块返回的更新后订单:', {
+                uuid: updatedOrder.uuid,
+                orderId: updatedOrder.order_id,
+                totalAmount: updatedOrder.total_amount
+              });
 
-                // 如果替换失败，手动更新订单ID
-                beforeManualUpdate = this.store.currentOrder.order_id;
-                this.store.currentOrder.order_id = realOrderId;
-                this.logInfo('手动设置订单ID:', {
-                  beforeReplacement: beforeManualUpdate,
-                  afterReplacement: this.store.currentOrder.order_id,
-                  目标ID: realOrderId
-                });
+              // 🔧 合并 DB 快照到内存态，避免覆盖 payment_status（以及其它刚更新过的内存字段）
+              this.store.currentOrder = _objectSpread(_objectSpread(_objectSpread({}, previousOrder), updatedOrder), {}, {
+                payment_status: latestPaymentStatus
+              });
+
+              // 同步更新 Payment 模块 DB，避免后续读取 DB 时又拿回旧状态
+              if (!latestPaymentStatus) {
+                _context39.next = 83;
+                break;
               }
-              _context39.next = 82;
+              _context39.next = 83;
+              return this.payment.updateOrderAsync(previousOrder.uuid, {
+                payment_status: latestPaymentStatus
+              });
+            case 83:
+              this.logInfo('[Checkout] 订单ID替换成功，当前订单ID:', this.store.currentOrder.order_id);
+              _context39.next = 90;
+              break;
+            case 86:
+              this.logError('[Checkout] Payment模块返回空订单，订单ID替换失败，开始手动替换');
+
+              // 如果替换失败，手动更新订单ID
+              beforeManualUpdate = this.store.currentOrder.order_id;
+              this.store.currentOrder.order_id = realOrderId;
+              this.logInfo('手动设置订单ID:', {
+                beforeReplacement: beforeManualUpdate,
+                afterReplacement: this.store.currentOrder.order_id,
+                目标ID: realOrderId
+              });
+            case 90:
+              _context39.next = 97;
               break;
-            case 77:
-              _context39.prev = 77;
-              _context39.t2 = _context39["catch"](69);
+            case 92:
+              _context39.prev = 92;
+              _context39.t2 = _context39["catch"](70);
               this.logError('调用Payment模块替换订单ID时发生错误:', _context39.t2);
 
               // 发生错误时也进行手动替换
               this.store.currentOrder.order_id = realOrderId;
               this.logInfo('错误恢复：手动设置订单ID:', realOrderId);
-            case 82:
-              _context39.prev = 82;
+            case 97:
+              _context39.prev = 97;
               syncedPaymentUuids = processedPaymentItems.filter(function (item) {
                 return item.status !== 'voided';
               }).map(function (item) {
                 return item.uuid;
               }).filter(Boolean);
               _iterator3 = _createForOfIteratorHelper(syncedPaymentUuids);
-              _context39.prev = 85;
+              _context39.prev = 100;
               _iterator3.s();
-            case 87:
+            case 102:
               if ((_step3 = _iterator3.n()).done) {
-                _context39.next = 93;
+                _context39.next = 108;
                 break;
               }
               paymentUuid = _step3.value;
-              _context39.next = 91;
+              _context39.next = 106;
               return this.payment.updatePaymentAsync(this.store.currentOrder.uuid, paymentUuid, {
                 isSynced: true,
                 syncError: undefined
               });
-            case 91:
-              _context39.next = 87;
+            case 106:
+              _context39.next = 102;
               break;
-            case 93:
-              _context39.next = 98;
+            case 108:
+              _context39.next = 113;
               break;
-            case 95:
-              _context39.prev = 95;
-              _context39.t3 = _context39["catch"](85);
+            case 110:
+              _context39.prev = 110;
+              _context39.t3 = _context39["catch"](100);
               _iterator3.e(_context39.t3);
-            case 98:
-              _context39.prev = 98;
+            case 113:
+              _context39.prev = 113;
               _iterator3.f();
-              return _context39.finish(98);
-            case 101:
-              _context39.next = 106;
+              return _context39.finish(113);
+            case 116:
+              _context39.next = 121;
               break;
-            case 103:
-              _context39.prev = 103;
-              _context39.t4 = _context39["catch"](82);
+            case 118:
+              _context39.prev = 118;
+              _context39.t4 = _context39["catch"](97);
               this.logWarning('标记支付项已同步失败（不阻塞主流程）', {
                 error: _context39.t4
               });
-            case 106:
+            case 121:
               // 标记订单已同步
               this.store.isOrderSynced = true;
 
@@ -4180,7 +4219,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.clearCalculationCache();
 
               // 触发订单同步完成事件
-              _context39.next = 110;
+              _context39.next = 125;
               return this.core.effects.emit("".concat(this.name, ":onOrderSynced"), {
                 orderUuid: this.store.currentOrder.uuid,
                 realOrderId: realOrderId,
@@ -4189,18 +4228,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isManual: isManual,
                 response: checkoutResponse
               });
-            case 110:
+            case 125:
               return _context39.abrupt("return", {
                 success: true,
                 orderId: realOrderId,
                 orderUuid: this.store.currentOrder.uuid,
                 response: checkoutResponse
               });
-            case 111:
+            case 126:
             case "end":
               return _context39.stop();
           }
-        }, _callee39, this, [[31, 40, 48, 52], [69, 77], [82, 103], [85, 95, 98, 101]]);
+        }, _callee39, this, [[31, 41, 49, 53], [70, 92], [97, 118], [100, 110, 113, 116]]);
       }));
       function syncOrderToBackendWithReturn() {
         return _syncOrderToBackendWithReturn.apply(this, arguments);

package/lib/solution/Checkout/index.js

@@ -859,12 +859,22 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         console.warn("[Checkout] 没有当前订单，无法替换订单ID");
         return null;
       }
+      const previousOrder = this.store.currentOrder;
+      const latestPaymentStatus = previousOrder.payment_status;
       const updatedOrder = await this.payment.replaceOrderIdByUuidAsync(
-        this.store.currentOrder.uuid,
+        previousOrder.uuid,
         newOrderId
       );
       if (updatedOrder) {
-        this.store.currentOrder = updatedOrder;
+        this.store.currentOrder = {
+          ...previousOrder,
+          ...updatedOrder,
+          payment_status: latestPaymentStatus
+        };
+        if (latestPaymentStatus)
+          await this.payment.updateOrderAsync(previousOrder.uuid, {
+            payment_status: latestPaymentStatus
+          });
         await this.core.effects.emit(`${this.name}:onOrderCreated`, {
           order: updatedOrder,
           timestamp: Date.now()
@@ -2521,6 +2531,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       });
       checkoutResponse = await this.order.createOrderByCheckout(orderParams);
       submitSuccess = true;
+      this.store.currentOrder.payment_status = checkoutResponse.data.payment_status;
       this.logInfo("下单接口调用成功", checkoutResponse);
     } catch (error) {
       submitSuccess = false;
@@ -2585,8 +2596,10 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         newOrderId: realOrderId
       });
       try {
+        const latestPaymentStatus = this.store.currentOrder.payment_status;
+        const previousOrder = this.store.currentOrder;
         const updatedOrder = await this.payment.replaceOrderIdByUuidAsync(
-          this.store.currentOrder.uuid,
+          previousOrder.uuid,
           realOrderId
         );
         this.logInfo("Payment模块替换订单ID结果:", {
@@ -2600,7 +2613,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
             orderId: updatedOrder.order_id,
             totalAmount: updatedOrder.total_amount
           });
-          this.store.currentOrder = updatedOrder;
+          this.store.currentOrder = {
+            ...previousOrder,
+            ...updatedOrder,
+            payment_status: latestPaymentStatus
+          };
+          if (latestPaymentStatus)
+            await this.payment.updateOrderAsync(previousOrder.uuid, {
+              payment_status: latestPaymentStatus
+            });
           this.logInfo(
             "[Checkout] 订单ID替换成功，当前订单ID:",
             this.store.currentOrder.order_id

package/package.json

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