@pisell/pisellos 2.2.7 → 2.2.9

package/dist/solution/Checkout/index.js

@@ -371,10 +371,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return initializeCheckoutAsync;
     }())
+  }, {
+    key: "getHolderIdFromBooking",
+    value: function getHolderIdFromBooking(obj) {
+      var _obj$holder;
+      if (!obj) return undefined;
+      var ret = obj.holder_id || ((_obj$holder = obj.holder) === null || _obj$holder === void 0 ? void 0 : _obj$holder.form_record);
+      if (Array.isArray(ret)) {
+        return ret.length > 0 ? Number(ret[0]) : undefined;
+      }
+      return Number(ret) || undefined;
+    }
   }, {
     key: "getProductListByOrder",
     value: function getProductListByOrder() {
-      var _this$store$currentOr, _this$store$currentOr2;
+      var _this$store$currentOr,
+        _this3 = this,
+        _this$store$currentOr2;
       if (!this.store.currentOrder) {
         return [];
       }
@@ -388,7 +401,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           product_id: item.product.product_id,
           product_variant_id: item.product.product_variant_id,
           quantity: item.product.num,
-          selling_price: item.product.calculated_selling_price
+          selling_price: item.product.calculated_selling_price,
+          holder_id: _this3.getHolderIdFromBooking(item)
         };
       })) || [];
       var relationProducts = ((_this$store$currentOr2 = this.store.currentOrder.order_info) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.original_order_data) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.relation_products) === null || _this$store$currentOr2 === void 0 ? void 0 : _this$store$currentOr2.map(function (item) {
@@ -405,8 +419,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initWalletData",
     value: function () {
       var _initWalletData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
-        var _this$store$currentOr3, _this$store$currentCu, _this$store$currentOr4, _this$store$currentOr5, _this$store$currentOr7;
-        var amountInfo, walletBusinessData, _this$store$currentOr6;
+        var _this$store$currentOr3, _this$store$currentCu, _this$store$currentOr4, _this$store$currentOr5, _this$store$currentOr6, _this$store$currentOr8;
+        var amountInfo, walletBusinessData, _this$store$currentOr7;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -426,16 +440,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // 准备钱包初始化的业务数据
               walletBusinessData = _objectSpread({
                 customer_id: (_this$store$currentCu = this.store.currentCustomer) !== null && _this$store$currentCu !== void 0 && _this$store$currentCu.customer_id ? Number(this.store.currentCustomer.customer_id) : undefined,
+                holder: (_this$store$currentOr4 = this.store.currentOrder) === null || _this$store$currentOr4 === void 0 || (_this$store$currentOr4 = _this$store$currentOr4.order_info) === null || _this$store$currentOr4 === void 0 || (_this$store$currentOr4 = _this$store$currentOr4.original_order_data) === null || _this$store$currentOr4 === void 0 ? void 0 : _this$store$currentOr4.holder,
                 amountInfo: {
                   totalAmount: amountInfo.totalAmount,
                   subTotal: amountInfo.subTotal,
-                  depositAmount: (_this$store$currentOr4 = this.store.currentOrder) === null || _this$store$currentOr4 === void 0 ? void 0 : _this$store$currentOr4.deposit_amount,
-                  isDeposit: (_this$store$currentOr5 = this.store.currentOrder) === null || _this$store$currentOr5 === void 0 ? void 0 : _this$store$currentOr5.is_deposit
+                  depositAmount: (_this$store$currentOr5 = this.store.currentOrder) === null || _this$store$currentOr5 === void 0 ? void 0 : _this$store$currentOr5.deposit_amount,
+                  isDeposit: (_this$store$currentOr6 = this.store.currentOrder) === null || _this$store$currentOr6 === void 0 ? void 0 : _this$store$currentOr6.is_deposit
                 },
                 products: this.getProductListByOrder()
               }, params); // 判断订单是否已经同步，如果是则追加payment_order_id参数
               if (this.store.isOrderSynced) {
-                walletBusinessData.payment_order_id = (_this$store$currentOr6 = this.store.currentOrder) === null || _this$store$currentOr6 === void 0 ? void 0 : _this$store$currentOr6.order_id;
+                walletBusinessData.payment_order_id = (_this$store$currentOr7 = this.store.currentOrder) === null || _this$store$currentOr7 === void 0 ? void 0 : _this$store$currentOr7.order_id;
               }
               this.logInfo('开始拉取:initializeWalletDataFromBusinessAsync', {
                 walletBusinessData: walletBusinessData
@@ -460,7 +475,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // 触发钱包数据初始化完成事件
               _context8.next = 16;
               return this.core.effects.emit("".concat(this.name, ":onWalletDataInitialized"), {
-                orderUuid: (_this$store$currentOr7 = this.store.currentOrder) === null || _this$store$currentOr7 === void 0 ? void 0 : _this$store$currentOr7.uuid,
+                orderUuid: (_this$store$currentOr8 = this.store.currentOrder) === null || _this$store$currentOr8 === void 0 ? void 0 : _this$store$currentOr8.uuid,
                 customerId: walletBusinessData.customer_id,
                 walletBusinessData: {
                   customer_id: walletBusinessData.customer_id,
@@ -693,7 +708,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, depositDiffAmount, isNeedDeposit, created;
+        var validation, amountInfo, customerInfo, allOrders, existingOrder, _updated$payment2, _existingOrder$paymen, _updated$payment, currentTime, formattedExistPayments, _isNeedDeposit, _updated, syncedPayments, _syncedAmount, _totalAmount, _remainingExpectAmount, _depositDiffAmount, totalAmount, activePayments, paidAmount, remaining, _isNeedDeposit2, updated, syncedAmount, remainingExpectAmount, depositDiffAmount, isNeedDeposit, created, _syncedPayments, _syncedAmount2;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -746,10 +761,104 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 return String(o.id) === String(params.orderId) || String(o.order_id) === String(params.orderId);
               });
               if (!existingOrder) {
-                _context10.next = 44;
+                _context10.next = 71;
+                break;
+              }
+              if (!(params.existPayment && params.existPayment.length > 0)) {
+                _context10.next = 47;
+                break;
+              }
+              this.logInfo('检测到云端支付项，将替换本地订单的支付项列表', {
+                orderId: params.orderId,
+                existingPaymentCount: ((_existingOrder$paymen = existingOrder.payment) === null || _existingOrder$paymen === void 0 ? void 0 : _existingOrder$paymen.length) || 0,
+                newPaymentCount: params.existPayment.length
+              });
+
+              // 标记订单已同步（因为支付项来自云端）
+              this.store.isOrderSynced = true;
+
+              // 格式化云端支付项（添加时间戳、标记已同步）
+              currentTime = formatDateTime(new Date());
+              formattedExistPayments = params.existPayment.map(function (payment) {
+                return _objectSpread(_objectSpread({}, payment), {}, {
+                  isSynced: true,
+                  // 标记为已同步
+                  status: payment.status || 'active',
+                  created_at: payment.created_at || currentTime,
+                  updated_at: payment.updated_at || currentTime
+                });
+              }); // 计算是否需要支付定金
+              _isNeedDeposit = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 更新订单，替换支付项列表
+              _context10.next = 28;
+              return this.payment.updateOrderAsync(existingOrder.uuid, {
+                total_amount: amountInfo.totalAmount,
+                is_deposit: _isNeedDeposit.hasDeposit ? 1 : 0,
+                deposit_amount: _isNeedDeposit.total ? _isNeedDeposit.total.toString() : '0.00',
+                payment: formattedExistPayments,
+                // 🔧 替换支付项列表
+                order_info: {
+                  original_order_data: params.orderData,
+                  cart_summary: params.cartSummary,
+                  created_at: new Date().toISOString(),
+                  platform: params.orderData.platform,
+                  type: params.orderData.type,
+                  schedule_date: params.orderData.schedule_date,
+                  shop_note: params.orderData.shop_note,
+                  amount_breakdown: amountInfo
+                }
+              });
+            case 28:
+              _context10.next = 30;
+              return this.payment.getPaymentOrderByUuidAsync(existingOrder.uuid);
+            case 30:
+              _updated = _context10.sent;
+              if (_updated) {
+                _context10.next = 33;
                 break;
               }
-              // 基于现有支付项计算新的 expect_amount
+              throw createCheckoutError(CheckoutErrorType.UnknownError, '订单更新失败');
+            case 33:
+              this.store.currentOrder = _updated;
+              _context10.next = 36;
+              return this.updateStateAmountToRemaining(false);
+            case 36:
+              this.logInfo('本地订单更新成功(已替换云端支付项):', {
+                orderId: params.orderId,
+                uuid: _updated.uuid,
+                payments: ((_updated$payment = _updated.payment) === null || _updated$payment === void 0 ? void 0 : _updated$payment.length) || 0,
+                totalAmount: _updated.total_amount,
+                expectAmount: _updated.expect_amount,
+                isOrderSynced: true
+              });
+
+              // 事件通知
+              _context10.next = 39;
+              return this.core.effects.emit("".concat(this.name, ":onOrderCreated"), {
+                order: _updated,
+                timestamp: Date.now()
+              });
+            case 39:
+              // 计算已同步的支付金额
+              syncedPayments = _updated.payment.filter(function (p) {
+                return p.isSynced && p.status !== 'voided';
+              });
+              _syncedAmount = syncedPayments.reduce(function (sum, p) {
+                var amt = new Decimal(p.amount || '0');
+                var rounding = new Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || '0').abs();
+                return sum.plus(amt).plus(rounding);
+              }, new Decimal(0));
+              _totalAmount = new Decimal(amountInfo.totalAmount || '0');
+              _remainingExpectAmount = Decimal.max(0, _totalAmount.minus(_syncedAmount)).toFixed(2); // 计算定金差值
+              _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(_depositDiffAmount) > 0 ? Number(_depositDiffAmount) : Number(_remainingExpectAmount)
+              });
+              return _context10.abrupt("return", _updated);
+            case 47:
+              // 原有逻辑：保留现有支付项
               totalAmount = new Decimal(amountInfo.totalAmount || '0');
               activePayments = (existingOrder.payment || []).filter(function (p) {
                 return p.status !== 'voided';
@@ -760,12 +869,12 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 return sum.plus(amt).plus(rounding);
               }, new Decimal(0));
               remaining = Decimal.max(0, totalAmount.minus(paidAmount)).toFixed(2); // 计算是否需要支付定金，如果需要默认切换到定金模式，以及记录定金总金额，并把当前默认待付金额调整为定金总金额
-              _isNeedDeposit = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 更新到支付模块（使用 uuid，不修改 payment 列表）
-              _context10.next = 27;
+              _isNeedDeposit2 = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 更新到支付模块（使用 uuid，不修改 payment 列表）
+              _context10.next = 54;
               return this.payment.updateOrderAsync(existingOrder.uuid, {
                 total_amount: amountInfo.totalAmount,
-                is_deposit: _isNeedDeposit.hasDeposit ? 1 : 0,
-                deposit_amount: _isNeedDeposit.total ? _isNeedDeposit.total.toString() : '0.00',
+                is_deposit: _isNeedDeposit2.hasDeposit ? 1 : 0,
+                deposit_amount: _isNeedDeposit2.total ? _isNeedDeposit2.total.toString() : '0.00',
                 expect_amount: remaining,
                 order_info: {
                   original_order_data: params.orderData,
@@ -778,36 +887,36 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   amount_breakdown: amountInfo
                 }
               });
-            case 27:
-              _context10.next = 29;
+            case 54:
+              _context10.next = 56;
               return this.payment.getPaymentOrderByUuidAsync(existingOrder.uuid);
-            case 29:
+            case 56:
               updated = _context10.sent;
               if (updated) {
-                _context10.next = 32;
+                _context10.next = 59;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.UnknownError, '订单更新失败');
-            case 32:
+            case 59:
               this.store.currentOrder = updated;
-              _context10.next = 35;
+              _context10.next = 62;
               return this.updateStateAmountToRemaining(false);
-            case 35:
+            case 62:
               this.logInfo('本地订单更新成功(保留支付项):', {
                 orderId: params.orderId,
                 uuid: updated.uuid,
-                payments: ((_updated$payment = updated.payment) === null || _updated$payment === void 0 ? void 0 : _updated$payment.length) || 0,
+                payments: ((_updated$payment2 = updated.payment) === null || _updated$payment2 === void 0 ? void 0 : _updated$payment2.length) || 0,
                 totalAmount: updated.total_amount,
                 expectAmount: updated.expect_amount
               });
 
               // 事件通知（复用创建事件，便于上层监听刷新）
-              _context10.next = 38;
+              _context10.next = 65;
               return this.core.effects.emit("".concat(this.name, ":onOrderCreated"), {
                 order: updated,
                 timestamp: Date.now()
               });
-            case 38:
+            case 65:
               // 需要减去已经同步给后端的支付过的钱
               syncedAmount = activePayments.reduce(function (sum, p) {
                 var amt = new Decimal(p.amount || '0');
@@ -823,15 +932,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 order_wait_pay_amount: Number(depositDiffAmount) > 0 ? Number(depositDiffAmount) : Number(remainingExpectAmount)
               });
               return _context10.abrupt("return", updated);
-            case 44:
+            case 71:
               // 计算是否需要支付定金，如果需要默认切换到定金模式，以及记录定金总金额，并把当前默认待付金额调整为定金总金额
               isNeedDeposit = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 没找到现有订单时，回退为创建逻辑（用于异常兜底）
-              _context10.next = 47;
+              _context10.next = 74;
               return this.payment.createPaymentOrderAsync({
                 order_id: String(params.orderId),
                 total_amount: amountInfo.totalAmount,
                 is_deposit: isNeedDeposit.hasDeposit ? 1 : 0,
                 deposit_amount: isNeedDeposit.total ? isNeedDeposit.total.toString() : '0.00',
+                existPayment: params.existPayment,
+                // 🔧 新增: 传递云端支付项
                 order_info: {
                   original_order_data: params.orderData,
                   cart_summary: params.cartSummary,
@@ -843,12 +954,43 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   amount_breakdown: amountInfo
                 }
               });
-            case 47:
+            case 74:
               created = _context10.sent;
               this.store.currentOrder = created;
-              this.initWalletData();
+
+              // 🔧 新增: 如果有云端支付项，需要计算正确的待付金额
+              if (params.existPayment && params.existPayment.length > 0) {
+                // 标记订单已同步（因为订单和支付项都来自云端）
+                this.store.isOrderSynced = true;
+
+                // 计算已同步的支付金额
+                _syncedPayments = created.payment.filter(function (p) {
+                  return p.isSynced && p.status !== 'voided';
+                });
+                _syncedAmount2 = _syncedPayments.reduce(function (sum, p) {
+                  var amt = new Decimal(p.amount || '0');
+                  var rounding = new Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || '0').abs();
+                  return sum.plus(amt).plus(rounding);
+                }, new Decimal(0));
+                this.logInfo('云端订单初始化钱包数据', {
+                  orderId: params.orderId,
+                  totalAmount: created.total_amount,
+                  expectAmount: created.expect_amount,
+                  syncedAmount: _syncedAmount2.toFixed(2),
+                  syncedPaymentCount: _syncedPayments.length,
+                  isOrderSynced: true
+                });
+
+                // 初始化钱包数据，使用系统计算的待付金额
+                this.initWalletData({
+                  order_wait_pay_amount: Number(created.expect_amount)
+                });
+              } else {
+                // 没有云端支付项，正常初始化
+                this.initWalletData();
+              }
               return _context10.abrupt("return", created);
-            case 51:
+            case 78:
             case "end":
               return _context10.stop();
           }
@@ -931,8 +1073,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderOriginalData",
     value: function getOrderOriginalData() {
-      var _this$store$currentOr8;
-      return (_this$store$currentOr8 = this.store.currentOrder) === null || _this$store$currentOr8 === void 0 ? void 0 : _this$store$currentOr8.order_info;
+      var _this$store$currentOr9;
+      return (_this$store$currentOr9 = this.store.currentOrder) === null || _this$store$currentOr9 === void 0 ? void 0 : _this$store$currentOr9.order_info;
     }
 
     /**
@@ -1542,7 +1684,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateVoucherPaymentItemsAsync",
     value: (function () {
       var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(voucherPaymentItems) {
-        var _this3 = this;
+        var _this4 = this;
         var paymentItems, allPaymentItemsSynced, remainingAmount, remainingValue, isOrderSynced, orderPaymentType, voucherPaymentItemsWithType, currentOrderId, isCurrentOrderReal, updatedOrder;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
@@ -1594,8 +1736,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
                 // 从 otherParams 获取 metadata 字段
                 var metadata = _objectSpread(_objectSpread({}, item.metadata), {}, {
-                  rounding_rule: _this3.otherParams.order_rounding_setting,
-                  shop_wallet_pass_id: _this3.otherParams.shop_wallet_pass_id
+                  rounding_rule: _this4.otherParams.order_rounding_setting,
+                  shop_wallet_pass_id: _this4.otherParams.shop_wallet_pass_id
                 });
                 return _objectSpread(_objectSpread({}, item), {}, {
                   order_payment_type: orderPaymentType,
@@ -1781,7 +1923,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDepositAmountAsync",
     value: (function () {
       var _setDepositAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(depositAmount) {
-        var _this$store$currentOr9, _this$store$currentOr10;
+        var _this$store$currentOr10, _this$store$currentOr11;
         var depositValue, formattedDepositAmount, oldDepositAmount, updateParams;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
@@ -1789,8 +1931,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('setDepositAmountAsync called', {
                 depositAmount: depositAmount,
                 hasCurrentOrder: !!this.store.currentOrder,
-                currentOrderId: (_this$store$currentOr9 = this.store.currentOrder) === null || _this$store$currentOr9 === void 0 ? void 0 : _this$store$currentOr9.order_id,
-                currentTotalAmount: (_this$store$currentOr10 = this.store.currentOrder) === null || _this$store$currentOr10 === void 0 ? void 0 : _this$store$currentOr10.total_amount
+                currentOrderId: (_this$store$currentOr10 = this.store.currentOrder) === null || _this$store$currentOr10 === void 0 ? void 0 : _this$store$currentOr10.order_id,
+                currentTotalAmount: (_this$store$currentOr11 = this.store.currentOrder) === null || _this$store$currentOr11 === void 0 ? void 0 : _this$store$currentOr11.total_amount
               });
               _context20.prev = 1;
               // 验证定金金额格式
@@ -1910,17 +2052,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "manualSyncOrderAsync",
     value: (function () {
       var _manualSyncOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
-        var _this$store$currentOr11, _this$store$currentOr12, _this$store$currentOr13;
-        var _this$store$currentOr14, orderUuid, oldOrderId, syncResult, finalOrderId, finalIsVirtual, newRes, _this$store$currentOr15, errorMessage;
+        var _this$store$currentOr12, _this$store$currentOr13, _this$store$currentOr14;
+        var _this$store$currentOr15, orderUuid, oldOrderId, syncResult, finalOrderId, finalIsVirtual, newRes, _this$store$currentOr16, errorMessage;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
               console.log('manualSyncOrderAsync called');
               this.logInfo('manualSyncOrderAsync called', {
                 hasCurrentOrder: !!this.store.currentOrder,
-                currentOrderId: (_this$store$currentOr11 = this.store.currentOrder) === null || _this$store$currentOr11 === void 0 ? void 0 : _this$store$currentOr11.order_id,
-                orderUuid: (_this$store$currentOr12 = this.store.currentOrder) === null || _this$store$currentOr12 === void 0 ? void 0 : _this$store$currentOr12.uuid,
-                totalAmount: (_this$store$currentOr13 = this.store.currentOrder) === null || _this$store$currentOr13 === void 0 ? void 0 : _this$store$currentOr13.total_amount,
+                currentOrderId: (_this$store$currentOr12 = this.store.currentOrder) === null || _this$store$currentOr12 === void 0 ? void 0 : _this$store$currentOr12.order_id,
+                orderUuid: (_this$store$currentOr13 = this.store.currentOrder) === null || _this$store$currentOr13 === void 0 ? void 0 : _this$store$currentOr13.uuid,
+                totalAmount: (_this$store$currentOr14 = this.store.currentOrder) === null || _this$store$currentOr14 === void 0 ? void 0 : _this$store$currentOr14.total_amount,
                 isOrderSynced: this.store.isOrderSynced,
                 isVirtualOrderId: this.store.currentOrder ? isVirtualOrderId(this.store.currentOrder.order_id) : false
               });
@@ -1980,7 +2122,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 this.logError('[Checkout] 严重警告：返回的订单ID与存储的订单ID不一致！');
               }
               newRes = _objectSpread(_objectSpread({}, syncResult), {}, {
-                is_deposit: ((_this$store$currentOr14 = this.store.currentOrder) === null || _this$store$currentOr14 === void 0 ? void 0 : _this$store$currentOr14.is_deposit) || 0
+                is_deposit: ((_this$store$currentOr15 = this.store.currentOrder) === null || _this$store$currentOr15 === void 0 ? void 0 : _this$store$currentOr15.is_deposit) || 0
               });
               _context21.next = 30;
               return this.updateStateAmountToRemaining(false);
@@ -1994,7 +2136,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return _context21.abrupt("return", {
                 success: false,
                 message: "\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(errorMessage),
-                orderUuid: (_this$store$currentOr15 = this.store.currentOrder) === null || _this$store$currentOr15 === void 0 ? void 0 : _this$store$currentOr15.uuid
+                orderUuid: (_this$store$currentOr16 = this.store.currentOrder) === null || _this$store$currentOr16 === void 0 ? void 0 : _this$store$currentOr16.uuid
               });
             case 38:
             case "end":
@@ -2071,15 +2213,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "cancelCurrentOrderAsync",
     value: (function () {
       var _cancelCurrentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(cancelReason) {
-        var _this$store$currentOr16, _this$store$currentOr17, currentOrderUuid, currentOrderId, isOrderSynced, errorMessage;
+        var _this$store$currentOr17, _this$store$currentOr18, currentOrderUuid, currentOrderId, isOrderSynced, errorMessage;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
               _context22.prev = 0;
               this.logInfo('开始取消当前本地订单:', {
                 hasCurrentOrder: !!this.store.currentOrder,
-                orderUuid: (_this$store$currentOr16 = this.store.currentOrder) === null || _this$store$currentOr16 === void 0 ? void 0 : _this$store$currentOr16.uuid,
-                orderId: (_this$store$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.order_id,
+                orderUuid: (_this$store$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.uuid,
+                orderId: (_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.order_id,
                 isOrderSynced: this.store.isOrderSynced,
                 cancelReason: cancelReason
               });
@@ -2190,7 +2332,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$currentOr18, errorMessage;
+        var orderUuid, currentOrderId, allPaymentItems, syncResult, _this$store$currentOr19, errorMessage;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
             case 0:
@@ -2244,7 +2386,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return _context23.abrupt("return", {
                 success: false,
                 message: "\u8BA2\u5355\u4FDD\u5B58\u5931\u8D25: ".concat(errorMessage),
-                orderUuid: (_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.uuid
+                orderUuid: (_this$store$currentOr19 = this.store.currentOrder) === null || _this$store$currentOr19 === void 0 ? void 0 : _this$store$currentOr19.uuid
               });
             case 21:
             case "end":
@@ -2267,7 +2409,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderNoteAsync",
     value: (function () {
       var _updateOrderNoteAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(note) {
-        var _this$store$currentOr19, _this$store$currentOr20, oldNote, orderInPayment;
+        var _this$store$currentOr20, _this$store$currentOr21, oldNote, orderInPayment;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
@@ -2279,7 +2421,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '没有本地订单数据，无法更新备注');
             case 3:
               console.log('[Checkout] 更新订单备注:', {
-                orderUuid: (_this$store$currentOr19 = this.store.currentOrder) === null || _this$store$currentOr19 === void 0 ? void 0 : _this$store$currentOr19.uuid,
+                orderUuid: (_this$store$currentOr20 = this.store.currentOrder) === null || _this$store$currentOr20 === void 0 ? void 0 : _this$store$currentOr20.uuid,
                 oldNote: this.store.localOrderData.shop_note,
                 newNote: note
               });
@@ -2312,7 +2454,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 17:
               _context24.next = 19;
               return this.core.effects.emit("".concat(this.name, ":onOrderNoteChanged"), {
-                orderUuid: (_this$store$currentOr20 = this.store.currentOrder) === null || _this$store$currentOr20 === void 0 ? void 0 : _this$store$currentOr20.uuid,
+                orderUuid: (_this$store$currentOr21 = this.store.currentOrder) === null || _this$store$currentOr21 === void 0 ? void 0 : _this$store$currentOr21.uuid,
                 oldNote: oldNote,
                 newNote: note,
                 timestamp: Date.now()
@@ -2384,7 +2526,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "handlePaymentSuccess",
     value: (function () {
       var _handlePaymentSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(data) {
-        var _this$store$currentOr21;
+        var _this$store$currentOr22;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -2395,7 +2537,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit("".concat(this.name, ":onPaymentSuccess"), {
                 orderUuid: data.orderUuid,
                 paymentMethodCode: '',
-                amount: ((_this$store$currentOr21 = this.store.currentOrder) === null || _this$store$currentOr21 === void 0 ? void 0 : _this$store$currentOr21.total_amount) || '0',
+                amount: ((_this$store$currentOr22 = this.store.currentOrder) === null || _this$store$currentOr22 === void 0 ? void 0 : _this$store$currentOr22.total_amount) || '0',
                 timestamp: data.timestamp
               });
             case 4:
@@ -2420,7 +2562,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "handlePaymentError",
     value: (function () {
       var _handlePaymentError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(data) {
-        var _this$store$currentOr22;
+        var _this$store$currentOr23;
         var error;
         return _regeneratorRuntime().wrap(function _callee27$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
@@ -2433,7 +2575,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit("".concat(this.name, ":onPaymentFailed"), {
                 orderUuid: data.orderUuid,
                 paymentMethodCode: '',
-                amount: ((_this$store$currentOr22 = this.store.currentOrder) === null || _this$store$currentOr22 === void 0 ? void 0 : _this$store$currentOr22.total_amount) || '0',
+                amount: ((_this$store$currentOr23 = this.store.currentOrder) === null || _this$store$currentOr23 === void 0 ? void 0 : _this$store$currentOr23.total_amount) || '0',
                 timestamp: data.timestamp
               });
             case 5:
@@ -3140,7 +3282,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateStateAmountToRemaining",
     value: (function () {
       var _updateStateAmountToRemaining = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36() {
-        var _this4 = this;
+        var _this5 = this;
         var checkOrder,
           _yield$this$fetchOrde3,
           paymentItems,
@@ -3191,8 +3333,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 depositPaidAmount = paymentItems.filter(function (item) {
                   return item.order_payment_type === 'deposit' && item.status !== 'voided';
                 }).reduce(function (sum, item) {
-                  // 如果是 wallet，并且还没同步到后端，则不计入这一部分金额
-                  if (item.voucher_id && !item.isSynced) {
+                  // 如果是 wallet，并且还没同步到后端，且此时还没有其他类型的支付项（现金，eftpos，标记支付）,不计入已付金额
+                  // 如果有其他支付项了，代表此时处于马上要同步的状态，所以计入
+                  if (item.voucher_id && !item.isSynced && paymentItems.filter(function (item) {
+                    return !item.voucher_id;
+                  }).length === 0) {
                     return sum;
                   }
                   var amount = new Decimal(item.amount || '0');
@@ -3233,7 +3378,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 hasStateChanged = true;
                 setTimeout(function () {
                   // 发出 stateAmount 变更事件
-                  _this4.core.effects.emit("".concat(_this4.name, ":onStateAmountChanged"), {
+                  _this5.core.effects.emit("".concat(_this5.name, ":onStateAmountChanged"), {
                     oldAmount: currentStateAmount,
                     newAmount: remainingAmount,
                     timestamp: Date.now(),
@@ -3254,7 +3399,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
                 // 发出 balanceDueAmount 变更事件
                 setTimeout(function () {
-                  _this4.core.effects.emit("".concat(_this4.name, ":onBalanceDueAmountChanged"), {
+                  _this5.core.effects.emit("".concat(_this5.name, ":onBalanceDueAmountChanged"), {
                     oldAmount: currentBalanceDueAmount,
                     newAmount: remainingAmount,
                     timestamp: Date.now(),
@@ -3552,11 +3697,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncOrderToBackendWithReturn",
     value: (function () {
       var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39() {
-        var _this5 = this,
-          _this$store$currentOr23,
+        var _this6 = this,
           _this$store$currentOr24,
-          _this$store$currentCu2,
           _this$store$currentOr25,
+          _this$store$currentCu2,
+          _this$store$currentOr26,
           _this$store$localOrde,
           _this$store$localOrde2,
           _checkoutResponse3,
@@ -3633,12 +3778,12 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 var _item$metadata, _item$metadata2;
                 return _objectSpread(_objectSpread({}, item), {}, {
                   metadata: _objectSpread(_objectSpread({}, item.metadata), {}, {
-                    rounding_rule: ((_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.rounding_rule) || _this5.otherParams.order_rounding_setting,
-                    shop_wallet_pass_id: ((_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.shop_wallet_pass_id) || _this5.otherParams.shop_wallet_pass_id
+                    rounding_rule: ((_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.rounding_rule) || _this6.otherParams.order_rounding_setting,
+                    shop_wallet_pass_id: ((_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.shop_wallet_pass_id) || _this6.otherParams.shop_wallet_pass_id
                   })
                 });
               }); // 确定最终的定金金额：优先使用手动设置的值，否则从支付项中计算
-              manualDepositAmount = ((_this$store$currentOr23 = this.store.currentOrder) === null || _this$store$currentOr23 === void 0 ? void 0 : _this$store$currentOr23.deposit_amount) || '0.00'; // 优先级逻辑：手动设置的定金金额 > 从支付项计算的金额
+              manualDepositAmount = ((_this$store$currentOr24 = this.store.currentOrder) === null || _this$store$currentOr24 === void 0 ? void 0 : _this$store$currentOr24.deposit_amount) || '0.00'; // 优先级逻辑：手动设置的定金金额 > 从支付项计算的金额
               manualDepositValue = new Decimal(manualDepositAmount);
               if (manualDepositValue.gt(0)) {
                 // 如果手动设置了定金金额且大于0，使用手动设置的值
@@ -3698,7 +3843,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 }),
                 manualDepositAmount: manualDepositAmount,
                 finalDepositAmount: finalDepositAmount,
-                isDeposit: ((_this$store$currentOr24 = this.store.currentOrder) === null || _this$store$currentOr24 === void 0 ? void 0 : _this$store$currentOr24.is_deposit) || 0
+                isDeposit: ((_this$store$currentOr25 = this.store.currentOrder) === null || _this$store$currentOr25 === void 0 ? void 0 : _this$store$currentOr25.is_deposit) || 0
               });
 
               // 构造订单参数，直接使用 localOrderData 中已处理好的数据
@@ -3720,7 +3865,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 currency_code: this.otherParams.currency_code,
                 currency_symbol: this.otherParams.currency_symbol,
                 currency_format: this.otherParams.currency_format,
-                is_deposit: ((_this$store$currentOr25 = this.store.currentOrder) !== null && _this$store$currentOr25 !== void 0 && _this$store$currentOr25.is_deposit || Number(finalDepositAmount) > 0 ? 1 : 0) || 0,
+                is_deposit: ((_this$store$currentOr26 = this.store.currentOrder) !== null && _this$store$currentOr26 !== void 0 && _this$store$currentOr26.is_deposit || Number(finalDepositAmount) > 0 ? 1 : 0) || 0,
                 deposit_amount: finalDepositAmount,
                 // 使用最终确定的定金金额（手动设置优先）
                 product_tax_fee: this.store.localOrderData.tax_fee,
@@ -4341,7 +4486,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "resetStoreState",
     value: function resetStoreState() {
-      var _this6 = this;
+      var _this7 = this;
       try {
         var prevOrderInfo = this.store.currentOrder ? {
           uuid: this.store.currentOrder.uuid,
@@ -4376,7 +4521,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
         // 使用 setTimeout 确保事件处理不会阻塞状态重置
         if (prevOrderInfo) {
           setTimeout(function () {
-            _this6.core.effects.emit("".concat(_this6.name, ":onOrderCleared"), {
+            _this7.core.effects.emit("".concat(_this7.name, ":onOrderCleared"), {
               previousOrder: prevOrderInfo,
               timestamp: Date.now()
             });

package/dist/solution/Checkout/types.d.ts

@@ -103,6 +103,8 @@ export interface UpdateLocalOrderParams {
     cartSummary: CartSummaryItem[];
     /** total 信息（用于拆解金额） */
     totalInfo: any;
+    /** 云端已存在的支付项（可选，用于处理订单在其他设备或云端生成的场景） */
+    existPayment?: PaymentItem[];
 }
 /**
  * 本地订单数据结构 (基于 appointmentDemo.json)

package/dist/solution/ShopDiscount/index.d.ts

@@ -19,6 +19,9 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private registerDependentModules;
     private registerEventListeners;
     setCustomer(customer: Customer): Promise<void>;
+    setHolders(holders: {
+        form_record_id: number;
+    }[]): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];