@pisell/pisellos 2.1.26 → 2.1.28

package/dist/modules/Payment/walletpass.js

@@ -128,7 +128,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
             case 0:
               startTime = Date.now();
               walletParams = this.generateWalletParams(businessData);
-              if (!(Number((businessData === null || businessData === void 0 || (_businessData$amountI = businessData.amountInfo) === null || _businessData$amountI === void 0 ? void 0 : _businessData$amountI.totalAmount) || 0) < 0 || Number((businessData === null || businessData === void 0 || (_businessData$amountI2 = businessData.amountInfo) === null || _businessData$amountI2 === void 0 ? void 0 : _businessData$amountI2.subTotal) || 0) < 0 || [1, 0].includes(walletParams === null || walletParams === void 0 ? void 0 : walletParams.customer_id))) {
+              if (!(Number((businessData === null || businessData === void 0 || (_businessData$amountI = businessData.amountInfo) === null || _businessData$amountI === void 0 ? void 0 : _businessData$amountI.totalAmount) || 0) < 0 || Number((businessData === null || businessData === void 0 || (_businessData$amountI2 = businessData.amountInfo) === null || _businessData$amountI2 === void 0 ? void 0 : _businessData$amountI2.subTotal) || 0) < 0)) {
                 _context.next = 4;
                 break;
               }

package/dist/solution/Checkout/index.js

@@ -677,7 +677,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _updateLocalOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
         var _params$orderData6, _params$orderData7, _params$cartSummary2, _params$totalInfo5, _params$totalInfo6, _params$totalInfo7, _params$totalInfo8;
-        var validation, amountInfo, customerInfo, allOrders, existingOrder, _updated$payment, totalAmount, activePayments, paidAmount, remaining, _isNeedDeposit, updated, syncedAmount, remainingExpectAmount, isNeedDeposit, created;
+        var validation, amountInfo, customerInfo, allOrders, existingOrder, _updated$payment, totalAmount, activePayments, paidAmount, remaining, _isNeedDeposit, updated, syncedAmount, remainingExpectAmount, depositDiffAmount, isNeedDeposit, created;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -730,7 +730,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 return String(o.id) === String(params.orderId) || String(o.order_id) === String(params.orderId);
               });
               if (!existingOrder) {
-                _context10.next = 42;
+                _context10.next = 44;
                 break;
               }
               // 基于现有支付项计算新的 expect_amount
@@ -798,15 +798,19 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 var rounding = new Decimal(p.rounding_amount || '0').abs();
                 return sum.plus(amt).plus(rounding);
               }, new Decimal(0));
-              remainingExpectAmount = Decimal.max(0, totalAmount.minus(syncedAmount)).toFixed(2);
+              remainingExpectAmount = Decimal.max(0, totalAmount.minus(syncedAmount)).toFixed(2); // 要计算一个总价的差值和一个定金的差值，如果定金的差值>0，则需要使用定金的差值，否则使用总价的差值
+              depositDiffAmount = new Decimal(0).toFixed(2);
+              if (updated.is_deposit === 1) {
+                depositDiffAmount = new Decimal(updated.deposit_amount).minus(syncedAmount).toFixed(2);
+              }
               this.initWalletData({
-                order_wait_pay_amount: Number(remainingExpectAmount)
+                order_wait_pay_amount: Number(depositDiffAmount) > 0 ? Number(depositDiffAmount) : Number(remainingExpectAmount)
               });
               return _context10.abrupt("return", updated);
-            case 42:
+            case 44:
               // 计算是否需要支付定金，如果需要默认切换到定金模式，以及记录定金总金额，并把当前默认待付金额调整为定金总金额
               isNeedDeposit = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 没找到现有订单时，回退为创建逻辑（用于异常兜底）
-              _context10.next = 45;
+              _context10.next = 47;
               return this.payment.createPaymentOrderAsync({
                 order_id: String(params.orderId),
                 total_amount: amountInfo.totalAmount,
@@ -823,12 +827,12 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   amount_breakdown: amountInfo
                 }
               });
-            case 45:
+            case 47:
               created = _context10.sent;
               this.store.currentOrder = created;
               this.initWalletData();
               return _context10.abrupt("return", created);
-            case 49:
+            case 51:
             case "end":
               return _context10.stop();
           }
@@ -1675,7 +1679,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               console.log('[Checkout] 定金状态无变化，跳过更新');
               return _context19.abrupt("return");
             case 10:
-              deposit_amount = newDepositValue === 1 ? this.store.currentOrder.deposit_amount : '0.00'; // 如果原来没有 deposit_amount，则默认把待付金额置为 deposit_amount
+              deposit_amount = this.store.currentOrder.deposit_amount || '0.00'; // 如果原来没有 deposit_amount，则默认把待付金额置为 deposit_amount
               if (!deposit_amount || Number(deposit_amount) === 0) {
                 deposit_amount = this.store.currentOrder.expect_amount;
               }
@@ -3268,6 +3272,35 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   reason: '手动设置和计算值均为0'
                 });
               }
+              // 如果此时是普通支付状态，并且要同步的支付项里一个定金支付的都没有，则 is_deposit 和 deposit_amount 都置为 0
+              if (this.store.currentOrder.is_deposit === 0 && processedPaymentItems.every(function (item) {
+                return item.order_payment_type !== 'deposit';
+              })) {
+                finalDepositAmount = '0.00';
+                this.store.currentOrder.is_deposit = 0;
+              }
+              // 如果此时是普通支付，并且有普通支付项进来了，则提交给后端的 deposit_amount 只能是支付项里已经支付的order_payment_type = deposit 的金额
+              if (this.store.currentOrder.is_deposit === 0 && processedPaymentItems.some(function (item) {
+                return item.order_payment_type === 'deposit';
+              })) {
+                finalDepositAmount = processedPaymentItems.filter(function (item) {
+                  return item.status !== 'voided' && item.order_payment_type === 'deposit';
+                }).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)).toFixed(2);
+              }
+              // 如果当前是定金支付，并且定金额度已经大于等于了订单总计，则 finalDepositAmount 为实际付出去的定金金额
+              if (this.store.currentOrder.is_deposit === 1 && new Decimal(finalDepositAmount).gte(new Decimal(this.store.currentOrder.total_amount))) {
+                finalDepositAmount = processedPaymentItems.filter(function (item) {
+                  return item.status !== 'voided' && item.order_payment_type === 'deposit';
+                }).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)).toFixed(2);
+              }
               this.logInfo('定金金额确定结果', {
                 depositPaymentItemsCount: processedPaymentItems.length,
                 depositPaymentItems: processedPaymentItems.map(function (item) {
@@ -3335,7 +3368,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 发送下单接口请求开始事件
               startTime = Date.now();
-              _context36.next = 24;
+              _context36.next = 27;
               return this.core.effects.emit(CheckoutHooks.OnOrderSubmitStart, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3343,9 +3376,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 paymentItemCount: paymentItems.length,
                 timestamp: startTime
               });
-            case 24:
+            case 27:
               submitSuccess = false;
-              _context36.prev = 25;
+              _context36.prev = 28;
               // 记录接口调用参数
               this.logInfo('Calling backend checkout API', _objectSpread({
                 url: '/order/checkout',
@@ -3353,23 +3386,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }, orderParams));
 
               // 调用 Order 模块的专用 createOrderByCheckout 方法
-              _context36.next = 29;
+              _context36.next = 32;
               return this.order.createOrderByCheckout(orderParams);
-            case 29:
+            case 32:
               checkoutResponse = _context36.sent;
               submitSuccess = true;
               this.logInfo('下单接口调用成功', checkoutResponse);
-              _context36.next = 42;
+              _context36.next = 45;
               break;
-            case 34:
-              _context36.prev = 34;
-              _context36.t1 = _context36["catch"](25);
+            case 37:
+              _context36.prev = 37;
+              _context36.t1 = _context36["catch"](28);
               submitSuccess = false;
               submitError = _context36.t1 instanceof Error ? _context36.t1.message : String(_context36.t1);
               this.logError('下单接口调用失败:', submitError);
 
               // 发送订单同步失败事件（网络错误或请求失败）
-              _context36.next = 41;
+              _context36.next = 44;
               return this.core.effects.emit(CheckoutHooks.OnOrderSyncFailed, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3379,11 +3412,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 41:
+            case 44:
               throw _context36.t1;
-            case 42:
-              _context36.prev = 42;
-              _context36.next = 45;
+            case 45:
+              _context36.prev = 45;
+              _context36.next = 48;
               return this.core.effects.emit(CheckoutHooks.OnOrderSubmitEnd, {
                 success: submitSuccess,
                 orderUuid: this.store.currentOrder.uuid,
@@ -3394,18 +3427,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 45:
-              return _context36.finish(42);
-            case 46:
+            case 48:
+              return _context36.finish(45);
+            case 49:
               // 检查响应状态是否为成功状态
               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) {
-                _context36.next = 53;
+                _context36.next = 56;
                 break;
               }
               errorMessage = ((_checkoutResponse5 = checkoutResponse) === null || _checkoutResponse5 === void 0 ? void 0 : _checkoutResponse5.message) || '订单同步失败，后端返回非成功状态'; // 发送订单同步失败事件
-              _context36.next = 52;
+              _context36.next = 55;
               return this.core.effects.emit(CheckoutHooks.OnOrderSyncFailed, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3416,18 +3449,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 52:
+            case 55:
               throw new Error(errorMessage);
-            case 53:
+            case 56:
               if (!isUpdateOperation) {
-                _context36.next = 57;
+                _context36.next = 60;
                 break;
               }
               // 更新操作：使用现有的订单ID
               realOrderId = currentOrderId;
-              _context36.next = 76;
+              _context36.next = 79;
               break;
-            case 57:
+            case 60:
               // 创建操作：从响应中提取新的订单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) {
@@ -3449,10 +3482,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 oldOrderId: this.store.currentOrder.order_id,
                 newOrderId: realOrderId
               });
-              _context36.prev = 63;
-              _context36.next = 66;
+              _context36.prev = 66;
+              _context36.next = 69;
               return this.payment.replaceOrderIdByUuidAsync(this.store.currentOrder.uuid, realOrderId);
-            case 66:
+            case 69:
               updatedOrder = _context36.sent;
               this.logInfo('Payment模块替换订单ID结果:', {
                 wasSuccessful: !!updatedOrder,
@@ -3479,66 +3512,66 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   目标ID: realOrderId
                 });
               }
-              _context36.next = 76;
+              _context36.next = 79;
               break;
-            case 71:
-              _context36.prev = 71;
-              _context36.t2 = _context36["catch"](63);
+            case 74:
+              _context36.prev = 74;
+              _context36.t2 = _context36["catch"](66);
               this.logError('调用Payment模块替换订单ID时发生错误:', _context36.t2);
 
               // 发生错误时也进行手动替换
               this.store.currentOrder.order_id = realOrderId;
               this.logInfo('错误恢复：手动设置订单ID:', realOrderId);
-            case 76:
-              _context36.prev = 76;
+            case 79:
+              _context36.prev = 79;
               syncedPaymentUuids = processedPaymentItems.filter(function (item) {
                 return item.status !== 'voided';
               }).map(function (item) {
                 return item.uuid;
               }).filter(Boolean);
               _iterator3 = _createForOfIteratorHelper(syncedPaymentUuids);
-              _context36.prev = 79;
+              _context36.prev = 82;
               _iterator3.s();
-            case 81:
+            case 84:
               if ((_step3 = _iterator3.n()).done) {
-                _context36.next = 87;
+                _context36.next = 90;
                 break;
               }
               paymentUuid = _step3.value;
-              _context36.next = 85;
+              _context36.next = 88;
               return this.payment.updatePaymentAsync(this.store.currentOrder.uuid, paymentUuid, {
                 isSynced: true,
                 syncError: undefined
               });
-            case 85:
-              _context36.next = 81;
+            case 88:
+              _context36.next = 84;
               break;
-            case 87:
-              _context36.next = 92;
+            case 90:
+              _context36.next = 95;
               break;
-            case 89:
-              _context36.prev = 89;
-              _context36.t3 = _context36["catch"](79);
-              _iterator3.e(_context36.t3);
             case 92:
               _context36.prev = 92;
-              _iterator3.f();
-              return _context36.finish(92);
+              _context36.t3 = _context36["catch"](82);
+              _iterator3.e(_context36.t3);
             case 95:
-              _context36.next = 100;
+              _context36.prev = 95;
+              _iterator3.f();
+              return _context36.finish(95);
+            case 98:
+              _context36.next = 103;
               break;
-            case 97:
-              _context36.prev = 97;
-              _context36.t4 = _context36["catch"](76);
+            case 100:
+              _context36.prev = 100;
+              _context36.t4 = _context36["catch"](79);
               this.logWarning('标记支付项已同步失败（不阻塞主流程）', {
                 error: _context36.t4
               });
-            case 100:
+            case 103:
               // 标记订单已同步
               this.store.isOrderSynced = true;
 
               // 触发订单同步完成事件
-              _context36.next = 103;
+              _context36.next = 106;
               return this.core.effects.emit(CheckoutHooks.OnOrderSynced, {
                 orderUuid: this.store.currentOrder.uuid,
                 realOrderId: realOrderId,
@@ -3547,18 +3580,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isManual: isManual,
                 response: checkoutResponse
               });
-            case 103:
+            case 106:
               return _context36.abrupt("return", {
                 success: true,
                 orderId: realOrderId,
                 orderUuid: this.store.currentOrder.uuid,
                 response: checkoutResponse
               });
-            case 104:
+            case 107:
             case "end":
               return _context36.stop();
           }
-        }, _callee36, this, [[25, 34, 42, 46], [63, 71], [76, 97], [79, 89, 92, 95]]);
+        }, _callee36, this, [[28, 37, 45, 49], [66, 74], [79, 100], [82, 92, 95, 98]]);
       }));
       function syncOrderToBackendWithReturn() {
         return _syncOrderToBackendWithReturn.apply(this, arguments);

package/lib/modules/Payment/walletpass.js

@@ -99,7 +99,7 @@ var WalletPassPaymentImpl = class {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const startTime = Date.now();
     const walletParams = this.generateWalletParams(businessData);
-    if (Number(((_a = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _a.totalAmount) || 0) < 0 || Number(((_b = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _b.subTotal) || 0) < 0 || [1, 0].includes(walletParams == null ? void 0 : walletParams.customer_id)) {
+    if (Number(((_a = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _a.totalAmount) || 0) < 0 || Number(((_b = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _b.subTotal) || 0) < 0) {
       return {
         walletRecommendList: [],
         userIdentificationCodes: []

package/lib/solution/Checkout/index.js

@@ -530,8 +530,12 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       const remainingExpectAmount = import_decimal.default.max(0, totalAmount.minus(syncedAmount)).toFixed(
         2
       );
+      let depositDiffAmount = new import_decimal.default(0).toFixed(2);
+      if (updated.is_deposit === 1) {
+        depositDiffAmount = new import_decimal.default(updated.deposit_amount).minus(syncedAmount).toFixed(2);
+      }
       this.initWalletData({
-        order_wait_pay_amount: Number(remainingExpectAmount)
+        order_wait_pay_amount: Number(depositDiffAmount) > 0 ? Number(depositDiffAmount) : Number(remainingExpectAmount)
       });
       return updated;
     }
@@ -1094,7 +1098,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         console.log("[Checkout] 定金状态无变化，跳过更新");
         return;
       }
-      let deposit_amount = newDepositValue === 1 ? this.store.currentOrder.deposit_amount : "0.00";
+      let deposit_amount = this.store.currentOrder.deposit_amount || "0.00";
       if (!deposit_amount || Number(deposit_amount) === 0) {
         deposit_amount = this.store.currentOrder.expect_amount;
       }
@@ -2024,6 +2028,24 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         reason: "手动设置和计算值均为0"
       });
     }
+    if (this.store.currentOrder.is_deposit === 0 && processedPaymentItems.every((item) => item.order_payment_type !== "deposit")) {
+      finalDepositAmount = "0.00";
+      this.store.currentOrder.is_deposit = 0;
+    }
+    if (this.store.currentOrder.is_deposit === 0 && processedPaymentItems.some((item) => item.order_payment_type === "deposit")) {
+      finalDepositAmount = processedPaymentItems.filter((item) => item.status !== "voided" && item.order_payment_type === "deposit").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)).toFixed(2);
+    }
+    if (this.store.currentOrder.is_deposit === 1 && new import_decimal.default(finalDepositAmount).gte(new import_decimal.default(this.store.currentOrder.total_amount))) {
+      finalDepositAmount = processedPaymentItems.filter((item) => item.status !== "voided" && item.order_payment_type === "deposit").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)).toFixed(2);
+    }
     this.logInfo("定金金额确定结果", {
       depositPaymentItemsCount: processedPaymentItems.length,
       depositPaymentItems: processedPaymentItems.map((item) => ({

package/package.json

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