@pisell/pisellos 0.0.407 → 0.0.408

package/dist/solution/Checkout/index.js

@@ -2376,7 +2376,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "saveForLaterPaymentAsync",
     value: (function () {
       var _saveForLaterPaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
-        var orderUuid, currentOrderId, allPaymentItems, syncResult, _this$store$currentOr19, errorMessage;
+        var orderUuid, currentOrderId, allPaymentItems, orderPaymentStatus, syncResult, _this$store$currentOr19, errorMessage;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
             case 0:
@@ -2403,9 +2403,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid);
             case 8:
               allPaymentItems = _context23.sent;
-              _context23.next = 11;
-              return this.syncOrderToBackendWithReturn(true, allPaymentItems);
-            case 11:
+              // 保存并稍后支付的订单状态需要特殊处理
+              // 如果当前订单已经有支付项了，则标记为partially_paid 否则标记为 payment_processing
+              orderPaymentStatus = allPaymentItems.filter(function (item) {
+                return item.status !== 'voided';
+              }).length > 0 ? 'partially_paid' : 'payment_processing'; // 调用同步方法，传入过滤后的支付项
+              _context23.next = 12;
+              return this.syncOrderToBackendWithReturn(true, allPaymentItems, orderPaymentStatus);
+            case 12:
               syncResult = _context23.sent;
               this.logInfo('保存订单完成:', {
                 orderUuid: orderUuid,
@@ -2422,8 +2427,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 orderUuid: orderUuid,
                 response: syncResult.response
               });
-            case 16:
-              _context23.prev = 16;
+            case 17:
+              _context23.prev = 17;
               _context23.t0 = _context23["catch"](0);
               this.logError('保存订单失败:', _context23.t0);
               errorMessage = _context23.t0 instanceof Error ? _context23.t0.message : '保存失败';
@@ -2432,11 +2437,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 message: "\u8BA2\u5355\u4FDD\u5B58\u5931\u8D25: ".concat(errorMessage),
                 orderUuid: (_this$store$currentOr19 = this.store.currentOrder) === null || _this$store$currentOr19 === void 0 ? void 0 : _this$store$currentOr19.uuid
               });
-            case 21:
+            case 22:
             case "end":
               return _context23.stop();
           }
-        }, _callee23, this, [[0, 16]]);
+        }, _callee23, this, [[0, 17]]);
       }));
       function saveForLaterPaymentAsync() {
         return _saveForLaterPaymentAsync.apply(this, arguments);
@@ -3752,6 +3757,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           _checkoutResponse4;
         var isManual,
           customPaymentItems,
+          paymentStatus,
           currentOrderId,
           isUpdateOperation,
           paymentItems,
@@ -3759,6 +3765,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           finalDepositAmount,
           manualDepositAmount,
           manualDepositValue,
+          orderPaymentStatus,
+          totalPaidAmount,
           orderParams,
           startTime,
           checkoutResponse,
@@ -3786,12 +3794,13 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 0:
               isManual = _args39.length > 0 && _args39[0] !== undefined ? _args39[0] : false;
               customPaymentItems = _args39.length > 1 ? _args39[1] : undefined;
+              paymentStatus = _args39.length > 2 ? _args39[2] : undefined;
               if (!(!this.store.localOrderData || !this.store.currentOrder)) {
-                _context39.next = 4;
+                _context39.next = 5;
                 break;
               }
               throw new Error('缺少必要的订单数据，无法同步到后端');
-            case 4:
+            case 5:
               this.logInfo('syncOrderToBackendWithReturn called', {
                 isManual: isManual
               });
@@ -3808,14 +3817,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // 获取当前订单的支付项
               _context39.t0 = customPaymentItems;
               if (_context39.t0) {
-                _context39.next = 13;
+                _context39.next = 14;
                 break;
               }
-              _context39.next = 12;
+              _context39.next = 13;
               return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid);
-            case 12:
-              _context39.t0 = _context39.sent;
             case 13:
+              _context39.t0 = _context39.sent;
+            case 14:
               paymentItems = _context39.t0;
               // 处理支付项数据，确保包含完整的 metadata
               processedPaymentItems = paymentItems.map(function (item) {
@@ -3890,8 +3899,33 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isDeposit: ((_this$store$currentOr25 = this.store.currentOrder) === null || _this$store$currentOr25 === void 0 ? void 0 : _this$store$currentOr25.is_deposit) || 0
               });
 
+              // 计算订单状态，优先读取外面传递的，如果没有则根据订单支付数据来
+              // paid 已全额付款
+              // partially_paid 部分付款
+              // unpaid 未支付（弃单状态）
+              // payment_processing 待支付
+              orderPaymentStatus = paymentStatus;
+              if (!orderPaymentStatus) {
+                // 判断当前支付项里的数据是否已经满足订单的金额
+                totalPaidAmount = processedPaymentItems.filter(function (item) {
+                  return item.status !== 'voided';
+                }).reduce(function (sum, item) {
+                  var amt = new Decimal(item.amount || '0');
+                  var rounding = new Decimal(item.rounding_amount || '0');
+                  return sum.plus(amt).sub(rounding);
+                }, new Decimal(0));
+                if (totalPaidAmount.gte(new Decimal(this.store.currentOrder.total_amount))) {
+                  orderPaymentStatus = 'paid';
+                } else if (totalPaidAmount.gt(0)) {
+                  orderPaymentStatus = 'partially_paid';
+                } else {
+                  orderPaymentStatus = 'unpaid';
+                }
+              }
+
               // 构造订单参数，直接使用 localOrderData 中已处理好的数据
               orderParams = _objectSpread(_objectSpread({}, this.store.localOrderData), {}, {
+                payment_status: orderPaymentStatus,
                 type: this.store.localOrderData.type,
                 platform: this.store.localOrderData.platform,
                 payments: processedPaymentItems,
@@ -3940,7 +3974,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 发送下单接口请求开始事件
               startTime = Date.now();
-              _context39.next = 27;
+              _context39.next = 30;
               return this.core.effects.emit("".concat(this.name, ":onOrderSubmitStart"), {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3948,9 +3982,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 paymentItemCount: paymentItems.length,
                 timestamp: startTime
               });
-            case 27:
+            case 30:
               submitSuccess = false;
-              _context39.prev = 28;
+              _context39.prev = 31;
               // 记录接口调用参数
               this.logInfo('Calling backend checkout API', _objectSpread({
                 url: '/order/checkout',
@@ -3958,23 +3992,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }, orderParams));
 
               // 调用 Order 模块的专用 createOrderByCheckout 方法
-              _context39.next = 32;
+              _context39.next = 35;
               return this.order.createOrderByCheckout(orderParams);
-            case 32:
+            case 35:
               checkoutResponse = _context39.sent;
               submitSuccess = true;
               this.logInfo('下单接口调用成功', checkoutResponse);
-              _context39.next = 45;
+              _context39.next = 48;
               break;
-            case 37:
-              _context39.prev = 37;
-              _context39.t1 = _context39["catch"](28);
+            case 40:
+              _context39.prev = 40;
+              _context39.t1 = _context39["catch"](31);
               submitSuccess = false;
               submitError = _context39.t1 instanceof Error ? _context39.t1.message : String(_context39.t1);
               this.logError('下单接口调用失败:', submitError);
 
               // 发送订单同步失败事件（网络错误或请求失败）
-              _context39.next = 44;
+              _context39.next = 47;
               return this.core.effects.emit("".concat(this.name, ":onOrderSyncFailed"), {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3984,11 +4018,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 44:
+            case 47:
               throw _context39.t1;
-            case 45:
-              _context39.prev = 45;
-              _context39.next = 48;
+            case 48:
+              _context39.prev = 48;
+              _context39.next = 51;
               return this.core.effects.emit("".concat(this.name, ":onOrderSubmitEnd"), {
                 success: submitSuccess,
                 orderUuid: this.store.currentOrder.uuid,
@@ -3999,18 +4033,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 48:
-              return _context39.finish(45);
-            case 49:
+            case 51:
+              return _context39.finish(48);
+            case 52:
               // 检查响应状态是否为成功状态
               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 = 56;
+                _context39.next = 59;
                 break;
               }
               errorMessage = ((_checkoutResponse5 = checkoutResponse) === null || _checkoutResponse5 === void 0 ? void 0 : _checkoutResponse5.message) || '订单同步失败，后端返回非成功状态'; // 发送订单同步失败事件
-              _context39.next = 55;
+              _context39.next = 58;
               return this.core.effects.emit("".concat(this.name, ":onOrderSyncFailed"), {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -4021,18 +4055,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 55:
+            case 58:
               throw new Error(errorMessage);
-            case 56:
+            case 59:
               if (!isUpdateOperation) {
-                _context39.next = 60;
+                _context39.next = 63;
                 break;
               }
               // 更新操作：使用现有的订单ID
               realOrderId = currentOrderId;
-              _context39.next = 79;
+              _context39.next = 82;
               break;
-            case 60:
+            case 63:
               // 创建操作：从响应中提取新的订单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) {
@@ -4054,10 +4088,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 oldOrderId: this.store.currentOrder.order_id,
                 newOrderId: realOrderId
               });
-              _context39.prev = 66;
-              _context39.next = 69;
+              _context39.prev = 69;
+              _context39.next = 72;
               return this.payment.replaceOrderIdByUuidAsync(this.store.currentOrder.uuid, realOrderId);
-            case 69:
+            case 72:
               updatedOrder = _context39.sent;
               this.logInfo('Payment模块替换订单ID结果:', {
                 wasSuccessful: !!updatedOrder,
@@ -4084,61 +4118,61 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   目标ID: realOrderId
                 });
               }
-              _context39.next = 79;
+              _context39.next = 82;
               break;
-            case 74:
-              _context39.prev = 74;
-              _context39.t2 = _context39["catch"](66);
+            case 77:
+              _context39.prev = 77;
+              _context39.t2 = _context39["catch"](69);
               this.logError('调用Payment模块替换订单ID时发生错误:', _context39.t2);
 
               // 发生错误时也进行手动替换
               this.store.currentOrder.order_id = realOrderId;
               this.logInfo('错误恢复：手动设置订单ID:', realOrderId);
-            case 79:
-              _context39.prev = 79;
+            case 82:
+              _context39.prev = 82;
               syncedPaymentUuids = processedPaymentItems.filter(function (item) {
                 return item.status !== 'voided';
               }).map(function (item) {
                 return item.uuid;
               }).filter(Boolean);
               _iterator3 = _createForOfIteratorHelper(syncedPaymentUuids);
-              _context39.prev = 82;
+              _context39.prev = 85;
               _iterator3.s();
-            case 84:
+            case 87:
               if ((_step3 = _iterator3.n()).done) {
-                _context39.next = 90;
+                _context39.next = 93;
                 break;
               }
               paymentUuid = _step3.value;
-              _context39.next = 88;
+              _context39.next = 91;
               return this.payment.updatePaymentAsync(this.store.currentOrder.uuid, paymentUuid, {
                 isSynced: true,
                 syncError: undefined
               });
-            case 88:
-              _context39.next = 84;
+            case 91:
+              _context39.next = 87;
               break;
-            case 90:
-              _context39.next = 95;
+            case 93:
+              _context39.next = 98;
               break;
-            case 92:
-              _context39.prev = 92;
-              _context39.t3 = _context39["catch"](82);
-              _iterator3.e(_context39.t3);
             case 95:
               _context39.prev = 95;
-              _iterator3.f();
-              return _context39.finish(95);
+              _context39.t3 = _context39["catch"](85);
+              _iterator3.e(_context39.t3);
             case 98:
-              _context39.next = 103;
+              _context39.prev = 98;
+              _iterator3.f();
+              return _context39.finish(98);
+            case 101:
+              _context39.next = 106;
               break;
-            case 100:
-              _context39.prev = 100;
-              _context39.t4 = _context39["catch"](79);
+            case 103:
+              _context39.prev = 103;
+              _context39.t4 = _context39["catch"](82);
               this.logWarning('标记支付项已同步失败（不阻塞主流程）', {
                 error: _context39.t4
               });
-            case 103:
+            case 106:
               // 标记订单已同步
               this.store.isOrderSynced = true;
 
@@ -4146,7 +4180,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.clearCalculationCache();
 
               // 触发订单同步完成事件
-              _context39.next = 107;
+              _context39.next = 110;
               return this.core.effects.emit("".concat(this.name, ":onOrderSynced"), {
                 orderUuid: this.store.currentOrder.uuid,
                 realOrderId: realOrderId,
@@ -4155,18 +4189,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isManual: isManual,
                 response: checkoutResponse
               });
-            case 107:
+            case 110:
               return _context39.abrupt("return", {
                 success: true,
                 orderId: realOrderId,
                 orderUuid: this.store.currentOrder.uuid,
                 response: checkoutResponse
               });
-            case 108:
+            case 111:
             case "end":
               return _context39.stop();
           }
-        }, _callee39, this, [[28, 37, 45, 49], [66, 74], [79, 100], [82, 92, 95, 98]]);
+        }, _callee39, this, [[31, 40, 48, 52], [69, 77], [82, 103], [85, 95, 98, 101]]);
       }));
       function syncOrderToBackendWithReturn() {
         return _syncOrderToBackendWithReturn.apply(this, arguments);

package/lib/solution/Checkout/index.js

@@ -1623,9 +1623,11 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       const allPaymentItems = await this.payment.getPaymentItemsAsync(
         this.store.currentOrder.uuid
       );
+      const orderPaymentStatus = allPaymentItems.filter((item) => item.status !== "voided").length > 0 ? "partially_paid" : "payment_processing";
       const syncResult = await this.syncOrderToBackendWithReturn(
         true,
-        allPaymentItems
+        allPaymentItems,
+        orderPaymentStatus
       );
       this.logInfo("保存订单完成:", {
         orderUuid,
@@ -2356,7 +2358,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @param customPaymentItems 自定义支付项列表，如果提供则使用此列表而不是从数据库获取
    * @returns 包含订单ID、UUID和完整后端响应的对象
    */
-  async syncOrderToBackendWithReturn(isManual = false, customPaymentItems) {
+  async syncOrderToBackendWithReturn(isManual = false, customPaymentItems, paymentStatus) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     if (!this.store.localOrderData || !this.store.currentOrder) {
       throw new Error("缺少必要的订单数据，无法同步到后端");
@@ -2431,8 +2433,24 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       finalDepositAmount,
       isDeposit: ((_b = this.store.currentOrder) == null ? void 0 : _b.is_deposit) || 0
     });
+    let orderPaymentStatus = paymentStatus;
+    if (!orderPaymentStatus) {
+      const totalPaidAmount = processedPaymentItems.filter((item) => item.status !== "voided").reduce((sum, item) => {
+        const amt = new import_decimal.default(item.amount || "0");
+        const rounding = new import_decimal.default(item.rounding_amount || "0");
+        return sum.plus(amt).sub(rounding);
+      }, new import_decimal.default(0));
+      if (totalPaidAmount.gte(new import_decimal.default(this.store.currentOrder.total_amount))) {
+        orderPaymentStatus = "paid";
+      } else if (totalPaidAmount.gt(0)) {
+        orderPaymentStatus = "partially_paid";
+      } else {
+        orderPaymentStatus = "unpaid";
+      }
+    }
     const orderParams = {
       ...this.store.localOrderData,
+      payment_status: orderPaymentStatus,
       type: this.store.localOrderData.type,
       platform: this.store.localOrderData.platform,
       payments: processedPaymentItems,

package/package.json

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