@pisell/pisellos 0.0.245 → 0.0.247

package/dist/modules/Payment/index.js

@@ -1037,7 +1037,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('Starting addPaymentItemAsync', {
                 orderUuid: orderUuid,
                 paymentAmount: paymentItem.amount,
-                paymentCode: paymentItem.code
+                paymentCode: paymentItem.code,
+                orderPaymentType: paymentItem.order_payment_type
               });
               _context13.prev = 1;
               _context13.next = 4;
@@ -1063,6 +1064,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 service_charge: paymentItem.service_charge,
                 status: 'active',
                 // 新支付项默认为活跃状态
+                order_payment_type: paymentItem.order_payment_type || 'normal',
+                // 默认为正常支付
                 metadata: {
                   unique_payment_number: paymentUuid // 设置唯一支付号为支付项的 uuid
                 }
@@ -1230,7 +1233,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                   return {
                     code: item.code,
                     amount: item.amount,
-                    voucher_id: item.voucher_id
+                    voucher_id: item.voucher_id,
+                    order_payment_type: item.order_payment_type
                   };
                 })
               });
@@ -1313,7 +1317,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               console.log("[PaymentModule] \u6DFB\u52A0\u4EE3\u91D1\u5238\u652F\u4ED8\u9879:", {
                 code: _voucherItem.code,
                 amount: _voucherItem.amount,
-                voucher_id: _voucherItem.voucher_id
+                voucher_id: _voucherItem.voucher_id,
+                order_payment_type: _voucherItem.order_payment_type
               });
               _context15.next = 38;
               return this.addPaymentItemAsync(orderUuid, _voucherItem);

package/dist/modules/Payment/types.d.ts

@@ -123,6 +123,8 @@ export interface PaymentItem {
     status?: 'active' | 'voided';
     /** 原始金额（用于记录撤销前的金额） */
     origin_amount?: string;
+    /** 订单支付类型 */
+    order_payment_type?: 'normal' | 'deposit';
 }
 /**
  * 订单信息
@@ -218,6 +220,8 @@ export interface PaymentItemInput {
     };
     /** 舍入金额 */
     rounding_amount?: string;
+    /** 订单支付类型 */
+    order_payment_type?: 'normal' | 'deposit';
 }
 /**
  * 推送支付项参数

package/dist/solution/Checkout/index.js

@@ -1,4 +1,3 @@
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -343,7 +342,7 @@ 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;
+        var _this$store$currentOr3, _this$store$currentCu, _this$store$currentOr4;
         var amountInfo, walletBusinessData;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
@@ -367,6 +366,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               _context8.next = 6;
               return this.payment.wallet.initializeWalletDataFromBusinessAsync(walletBusinessData);
             case 6:
+              _context8.next = 8;
+              return this.core.effects.emit(CheckoutHooks.OnWalletDataInitialized, {
+                orderUuid: (_this$store$currentOr4 = this.store.currentOrder) === null || _this$store$currentOr4 === void 0 ? void 0 : _this$store$currentOr4.uuid,
+                customerId: walletBusinessData.customer_id,
+                walletBusinessData: {
+                  customer_id: walletBusinessData.customer_id,
+                  amountInfo: walletBusinessData.amountInfo,
+                  order_wait_pay_amount: params === null || params === void 0 ? void 0 : params.order_wait_pay_amount
+                },
+                timestamp: Date.now()
+              });
+            case 8:
             case "end":
               return _context8.stop();
           }
@@ -981,12 +992,12 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getCheckoutSummaryAsync",
     value: (function () {
       var _getCheckoutSummaryAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-        var _this$store$currentOr4, _this$store$currentOr5;
+        var _this$store$currentOr5, _this$store$currentOr6;
         var totalAmount, paidAmount, remainingAmount;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              totalAmount = ((_this$store$currentOr4 = this.store.currentOrder) === null || _this$store$currentOr4 === void 0 ? void 0 : _this$store$currentOr4.total_amount) || '0.00';
+              totalAmount = ((_this$store$currentOr5 = this.store.currentOrder) === null || _this$store$currentOr5 === void 0 ? void 0 : _this$store$currentOr5.total_amount) || '0.00';
               _context15.next = 3;
               return this.calculatePaidAmountAsync();
             case 3:
@@ -1000,7 +1011,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 totalAmount: totalAmount,
                 paidAmount: paidAmount,
                 remainingAmount: remainingAmount,
-                paymentStatus: ((_this$store$currentOr5 = this.store.currentOrder) === null || _this$store$currentOr5 === void 0 ? void 0 : _this$store$currentOr5.payment_status) || PaymentStatus.Processing,
+                paymentStatus: ((_this$store$currentOr6 = this.store.currentOrder) === null || _this$store$currentOr6 === void 0 ? void 0 : _this$store$currentOr6.payment_status) || PaymentStatus.Processing,
                 availablePaymentMethods: this.store.paymentMethods
               });
             case 8:
@@ -1087,8 +1098,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderOriginalData",
     value: function getOrderOriginalData() {
-      var _this$store$currentOr6;
-      return (_this$store$currentOr6 = this.store.currentOrder) === null || _this$store$currentOr6 === void 0 ? void 0 : _this$store$currentOr6.order_info;
+      var _this$store$currentOr7;
+      return (_this$store$currentOr7 = this.store.currentOrder) === null || _this$store$currentOr7 === void 0 ? void 0 : _this$store$currentOr7.order_info;
     }
 
     /**
@@ -1649,7 +1660,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(paymentItem) {
-        var _paymentItem$type, _paymentItem$code, isEftposPayment;
+        var _paymentItem$type, _paymentItem$code, orderPaymentType, paymentItemWithType, isEftposPayment;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -1660,23 +1671,31 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '未找到当前订单，无法添加支付项');
             case 3:
+              // 根据当前订单的定金状态设置订单支付类型
+              orderPaymentType = this.store.currentOrder.is_deposit === 1 ? 'deposit' : 'normal'; // 设置支付项的订单支付类型
+              paymentItemWithType = _objectSpread(_objectSpread({}, paymentItem), {}, {
+                order_payment_type: orderPaymentType
+              });
               console.log('[Checkout] 为当前订单添加支付项:', {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentItem: {
-                  code: paymentItem.code,
-                  name: paymentItem.name,
-                  type: paymentItem.type,
-                  amount: paymentItem.amount,
-                  service_charge: paymentItem.service_charge,
-                  rounding_amount: paymentItem.rounding_amount,
-                  voucher_id: paymentItem.voucher_id
-                }
+                  code: paymentItemWithType.code,
+                  name: paymentItemWithType.name,
+                  type: paymentItemWithType.type,
+                  amount: paymentItemWithType.amount,
+                  service_charge: paymentItemWithType.service_charge,
+                  rounding_amount: paymentItemWithType.rounding_amount,
+                  voucher_id: paymentItemWithType.voucher_id,
+                  order_payment_type: paymentItemWithType.order_payment_type
+                },
+                orderDepositStatus: this.store.currentOrder.is_deposit,
+                calculatedOrderPaymentType: orderPaymentType
               });
 
               // 添加支付项到订单
-              _context25.next = 6;
-              return this.payment.addPaymentItemAsync(this.store.currentOrder.uuid, paymentItem);
-            case 6:
+              _context25.next = 8;
+              return this.payment.addPaymentItemAsync(this.store.currentOrder.uuid, paymentItemWithType);
+            case 8:
               console.log('[Checkout] 支付项添加成功');
 
               // 检查是否是 EFTPOS 支付，如果是则立即同步订单
@@ -1688,54 +1707,54 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 currentOrderSynced: this.store.isOrderSynced
               });
               if (!isEftposPayment) {
-                _context25.next = 22;
+                _context25.next = 24;
                 break;
               }
               console.log('[Checkout] 检测到 EFTPOS 支付，立即同步订单到后端...');
-              _context25.prev = 11;
-              _context25.next = 14;
+              _context25.prev = 13;
+              _context25.next = 16;
               return this.syncOrderToBackendWithReturn(true);
-            case 14:
+            case 16:
               console.log('[Checkout] EFTPOS 支付后订单同步完成 (已标记为手动同步):', {
                 订单ID: this.store.currentOrder.order_id,
                 是否已同步: this.store.isOrderSynced
               });
-              _context25.next = 22;
+              _context25.next = 24;
               break;
-            case 17:
-              _context25.prev = 17;
-              _context25.t0 = _context25["catch"](11);
+            case 19:
+              _context25.prev = 19;
+              _context25.t0 = _context25["catch"](13);
               console.error('[Checkout] EFTPOS 支付后订单同步失败:', _context25.t0);
               // 不抛出错误，避免影响支付流程，但记录错误
-              _context25.next = 22;
-              return this.handleError(new Error("EFTPOS \u652F\u4ED8\u540E\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(_context25.t0 instanceof Error ? _context25.t0.message : String(_context25.t0))), CheckoutErrorType.OrderCreationFailed);
-            case 22:
               _context25.next = 24;
-              return this.updateStateAmountToRemaining();
+              return this.handleError(new Error("EFTPOS \u652F\u4ED8\u540E\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(_context25.t0 instanceof Error ? _context25.t0.message : String(_context25.t0))), CheckoutErrorType.OrderCreationFailed);
             case 24:
               _context25.next = 26;
+              return this.updateStateAmountToRemaining();
+            case 26:
+              _context25.next = 28;
               return this.core.effects.emit(CheckoutHooks.OnPaymentStarted, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: paymentItem.code,
                 amount: String(paymentItem.amount),
                 timestamp: Date.now()
               });
-            case 26:
-              _context25.next = 34;
-              break;
             case 28:
-              _context25.prev = 28;
+              _context25.next = 36;
+              break;
+            case 30:
+              _context25.prev = 30;
               _context25.t1 = _context25["catch"](0);
               console.error('[Checkout] 添加支付项失败:', _context25.t1);
-              _context25.next = 33;
+              _context25.next = 35;
               return this.handleError(_context25.t1, CheckoutErrorType.PaymentFailed);
-            case 33:
+            case 35:
               throw _context25.t1;
-            case 34:
+            case 36:
             case "end":
               return _context25.stop();
           }
-        }, _callee25, this, [[0, 28], [11, 17]]);
+        }, _callee25, this, [[0, 30], [13, 19]]);
       }));
       function addPaymentItemAsync(_x16) {
         return _addPaymentItemAsync.apply(this, arguments);
@@ -1870,7 +1889,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateVoucherPaymentItemsAsync",
     value: (function () {
       var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(voucherPaymentItems) {
-        var _iterator, _step, item, currentOrderId, isCurrentOrderReal, updatedOrder, voucherItems;
+        var orderPaymentType, voucherPaymentItemsWithType, currentOrderId, isCurrentOrderReal, updatedOrder, voucherItems;
         return _regeneratorRuntime().wrap(function _callee27$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
             case 0:
@@ -1887,47 +1906,34 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 voucherPaymentItems: voucherPaymentItems
               });
 
-              // 验证所有支付项都包含 voucher_id
-              _iterator = _createForOfIteratorHelper(voucherPaymentItems);
-              _context27.prev = 5;
-              _iterator.s();
-            case 7:
-              if ((_step = _iterator.n()).done) {
-                _context27.next = 13;
-                break;
-              }
-              item = _step.value;
-              if (item.voucher_id) {
-                _context27.next = 11;
-                break;
-              }
-              throw createCheckoutError(CheckoutErrorType.ValidationFailed, "\u4EE3\u91D1\u5238\u652F\u4ED8\u9879\u7F3A\u5C11 voucher_id: ".concat(JSON.stringify(item)));
-            case 11:
-              _context27.next = 7;
-              break;
-            case 13:
-              _context27.next = 18;
-              break;
-            case 15:
-              _context27.prev = 15;
-              _context27.t0 = _context27["catch"](5);
-              _iterator.e(_context27.t0);
-            case 18:
-              _context27.prev = 18;
-              _iterator.f();
-              return _context27.finish(18);
-            case 21:
-              _context27.next = 23;
-              return this.payment.updateVoucherPaymentItemsAsync(this.store.currentOrder.uuid, voucherPaymentItems);
-            case 23:
+              // 根据当前订单的定金状态设置订单支付类型
+              orderPaymentType = this.store.currentOrder.is_deposit === 1 ? 'deposit' : 'normal'; // 验证所有支付项都包含 voucher_id，并设置 order_payment_type
+              voucherPaymentItemsWithType = voucherPaymentItems.map(function (item) {
+                if (!item.voucher_id) {
+                  throw createCheckoutError(CheckoutErrorType.ValidationFailed, "\u4EE3\u91D1\u5238\u652F\u4ED8\u9879\u7F3A\u5C11 voucher_id: ".concat(JSON.stringify(item)));
+                }
+                return _objectSpread(_objectSpread({}, item), {}, {
+                  order_payment_type: orderPaymentType
+                });
+              });
+              console.log('[Checkout] 代金券支付项订单支付类型设置:', {
+                orderDepositStatus: this.store.currentOrder.is_deposit,
+                calculatedOrderPaymentType: orderPaymentType,
+                itemsCount: voucherPaymentItemsWithType.length
+              });
+
+              // 调用 Payment 模块的批量更新方法
+              _context27.next = 9;
+              return this.payment.updateVoucherPaymentItemsAsync(this.store.currentOrder.uuid, voucherPaymentItemsWithType);
+            case 9:
               console.log('[Checkout] Payment模块批量更新完成');
 
               // 重新从Payment模块获取最新的订单数据，确保支付项同步
               currentOrderId = this.store.currentOrder.order_id; // 保存当前的订单ID
               isCurrentOrderReal = currentOrderId && !this.isVirtualOrderId(currentOrderId);
-              _context27.next = 28;
+              _context27.next = 14;
               return this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
-            case 28:
+            case 14:
               updatedOrder = _context27.sent;
               if (updatedOrder) {
                 // 如果当前订单ID是真实ID，但获取到的订单ID是虚拟ID，需要保护真实ID
@@ -1959,10 +1965,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 更新 stateAmount 为剩余未支付金额
-              _context27.next = 32;
+              _context27.next = 18;
               return this.updateStateAmountToRemaining();
-            case 32:
-              _context27.next = 34;
+            case 18:
+              _context27.next = 20;
               return this.core.effects.emit(CheckoutHooks.OnPaymentStarted, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: 'VOUCHER_BATCH',
@@ -1971,23 +1977,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 }, 0).toFixed(2),
                 timestamp: Date.now()
               });
-            case 34:
+            case 20:
               console.log('[Checkout] 代金券支付项批量更新成功');
-              _context27.next = 43;
+              _context27.next = 29;
               break;
-            case 37:
-              _context27.prev = 37;
-              _context27.t1 = _context27["catch"](0);
-              console.error('[Checkout] 批量更新代金券支付项失败:', _context27.t1);
-              _context27.next = 42;
-              return this.handleError(_context27.t1, CheckoutErrorType.PaymentFailed);
-            case 42:
-              throw _context27.t1;
-            case 43:
+            case 23:
+              _context27.prev = 23;
+              _context27.t0 = _context27["catch"](0);
+              console.error('[Checkout] 批量更新代金券支付项失败:', _context27.t0);
+              _context27.next = 28;
+              return this.handleError(_context27.t0, CheckoutErrorType.PaymentFailed);
+            case 28:
+              throw _context27.t0;
+            case 29:
             case "end":
               return _context27.stop();
           }
-        }, _callee27, this, [[0, 37], [5, 15, 18, 21]]);
+        }, _callee27, this, [[0, 23]]);
       }));
       function updateVoucherPaymentItemsAsync(_x18) {
         return _updateVoucherPaymentItemsAsync.apply(this, arguments);
@@ -2250,7 +2256,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "manualSyncOrderAsync",
     value: (function () {
       var _manualSyncOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31() {
-        var orderUuid, oldOrderId, realOrderId, finalOrderId, finalIsVirtual, _this$store$currentOr7, errorMessage;
+        var orderUuid, oldOrderId, realOrderId, finalOrderId, finalIsVirtual, _this$store$currentOr8, errorMessage;
         return _regeneratorRuntime().wrap(function _callee31$(_context31) {
           while (1) switch (_context31.prev = _context31.next) {
             case 0:
@@ -2326,7 +2332,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return _context31.abrupt("return", {
                 success: false,
                 message: "\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(errorMessage),
-                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
               });
             case 32:
             case "end":
@@ -2403,15 +2409,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "cancelCurrentOrderAsync",
     value: (function () {
       var _cancelCurrentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(cancelReason) {
-        var _this$store$currentOr8, _this$store$currentOr9, currentOrderUuid, currentOrderId, isOrderSynced, errorMessage;
+        var _this$store$currentOr9, _this$store$currentOr10, currentOrderUuid, currentOrderId, isOrderSynced, errorMessage;
         return _regeneratorRuntime().wrap(function _callee32$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
               _context32.prev = 0;
               console.log('[Checkout] 开始取消当前本地订单:', {
                 hasCurrentOrder: !!this.store.currentOrder,
-                orderUuid: (_this$store$currentOr8 = this.store.currentOrder) === null || _this$store$currentOr8 === void 0 ? void 0 : _this$store$currentOr8.uuid,
-                orderId: (_this$store$currentOr9 = this.store.currentOrder) === null || _this$store$currentOr9 === void 0 ? void 0 : _this$store$currentOr9.order_id,
+                orderUuid: (_this$store$currentOr9 = this.store.currentOrder) === null || _this$store$currentOr9 === void 0 ? void 0 : _this$store$currentOr9.uuid,
+                orderId: (_this$store$currentOr10 = this.store.currentOrder) === null || _this$store$currentOr10 === void 0 ? void 0 : _this$store$currentOr10.order_id,
                 isOrderSynced: this.store.isOrderSynced,
                 cancelReason: cancelReason
               });
@@ -2525,7 +2531,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "saveForLaterPaymentAsync",
     value: (function () {
       var _saveForLaterPaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33() {
-        var orderUuid, currentOrderId, allPaymentItems, filteredPaymentItems, voucherItems, realOrderId, finalOrderId, _this$store$currentOr10, errorMessage;
+        var orderUuid, currentOrderId, allPaymentItems, filteredPaymentItems, voucherItems, realOrderId, finalOrderId, _this$store$currentOr11, errorMessage;
         return _regeneratorRuntime().wrap(function _callee33$(_context33) {
           while (1) switch (_context33.prev = _context33.next) {
             case 0:
@@ -2615,7 +2621,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return _context33.abrupt("return", {
                 success: false,
                 message: "\u8BA2\u5355\u4FDD\u5B58\u5931\u8D25: ".concat(errorMessage),
-                orderUuid: (_this$store$currentOr10 = this.store.currentOrder) === null || _this$store$currentOr10 === void 0 ? void 0 : _this$store$currentOr10.uuid
+                orderUuid: (_this$store$currentOr11 = this.store.currentOrder) === null || _this$store$currentOr11 === void 0 ? void 0 : _this$store$currentOr11.uuid
               });
             case 26:
             case "end":
@@ -2666,14 +2672,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateShopDiscountAsync",
     value: (function () {
       var _updateShopDiscountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(discountAmount) {
-        var _this$store$currentOr11, _this$store$currentOr12, oldDiscount, shopDiscountItem, updatedAmountInfo;
+        var _this$store$currentOr12, _this$store$currentOr13, oldDiscount, shopDiscountItem, updatedAmountInfo;
         return _regeneratorRuntime().wrap(function _callee34$(_context34) {
           while (1) switch (_context34.prev = _context34.next) {
             case 0:
               _context34.prev = 0;
               oldDiscount = this.getShopDiscount();
               console.log('[Checkout] 更新商店折扣:', {
-                orderUuid: (_this$store$currentOr11 = this.store.currentOrder) === null || _this$store$currentOr11 === void 0 ? void 0 : _this$store$currentOr11.uuid,
+                orderUuid: (_this$store$currentOr12 = this.store.currentOrder) === null || _this$store$currentOr12 === void 0 ? void 0 : _this$store$currentOr12.uuid,
                 oldDiscount: oldDiscount,
                 newDiscount: discountAmount
               });
@@ -2723,7 +2729,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 8:
               _context34.next = 10;
               return this.core.effects.emit(CheckoutHooks.OnShopDiscountChanged, {
-                orderUuid: (_this$store$currentOr12 = this.store.currentOrder) === null || _this$store$currentOr12 === void 0 ? void 0 : _this$store$currentOr12.uuid,
+                orderUuid: (_this$store$currentOr13 = this.store.currentOrder) === null || _this$store$currentOr13 === void 0 ? void 0 : _this$store$currentOr13.uuid,
                 oldDiscount: oldDiscount,
                 newDiscount: discountAmount,
                 timestamp: Date.now()
@@ -2764,7 +2770,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderNoteAsync",
     value: (function () {
       var _updateOrderNoteAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(note) {
-        var _this$store$currentOr13, _this$store$currentOr14, oldNote, orderInPayment;
+        var _this$store$currentOr14, _this$store$currentOr15, oldNote, orderInPayment;
         return _regeneratorRuntime().wrap(function _callee35$(_context35) {
           while (1) switch (_context35.prev = _context35.next) {
             case 0:
@@ -2776,7 +2782,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '没有本地订单数据，无法更新备注');
             case 3:
               console.log('[Checkout] 更新订单备注:', {
-                orderUuid: (_this$store$currentOr13 = this.store.currentOrder) === null || _this$store$currentOr13 === void 0 ? void 0 : _this$store$currentOr13.uuid,
+                orderUuid: (_this$store$currentOr14 = this.store.currentOrder) === null || _this$store$currentOr14 === void 0 ? void 0 : _this$store$currentOr14.uuid,
                 oldNote: this.store.localOrderData.shop_note,
                 newNote: note
               });
@@ -2809,7 +2815,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 17:
               _context35.next = 19;
               return this.core.effects.emit(CheckoutHooks.OnOrderNoteChanged, {
-                orderUuid: (_this$store$currentOr14 = this.store.currentOrder) === null || _this$store$currentOr14 === void 0 ? void 0 : _this$store$currentOr14.uuid,
+                orderUuid: (_this$store$currentOr15 = this.store.currentOrder) === null || _this$store$currentOr15 === void 0 ? void 0 : _this$store$currentOr15.uuid,
                 oldNote: oldNote,
                 newNote: note,
                 timestamp: Date.now()
@@ -2949,7 +2955,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "handlePaymentSuccess",
     value: (function () {
       var _handlePaymentSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(data) {
-        var _this$store$currentOr15;
+        var _this$store$currentOr16;
         return _regeneratorRuntime().wrap(function _callee39$(_context39) {
           while (1) switch (_context39.prev = _context39.next) {
             case 0:
@@ -2963,7 +2969,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit(CheckoutHooks.OnPaymentSuccess, {
                 orderUuid: data.orderUuid,
                 paymentMethodCode: '',
-                amount: ((_this$store$currentOr15 = this.store.currentOrder) === null || _this$store$currentOr15 === void 0 ? void 0 : _this$store$currentOr15.total_amount) || '0',
+                amount: ((_this$store$currentOr16 = this.store.currentOrder) === null || _this$store$currentOr16 === void 0 ? void 0 : _this$store$currentOr16.total_amount) || '0',
                 timestamp: data.timestamp
               });
             case 6:
@@ -2988,7 +2994,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "handlePaymentError",
     value: (function () {
       var _handlePaymentError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(data) {
-        var _this$store$currentOr16;
+        var _this$store$currentOr17;
         var error;
         return _regeneratorRuntime().wrap(function _callee40$(_context40) {
           while (1) switch (_context40.prev = _context40.next) {
@@ -3001,7 +3007,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit(CheckoutHooks.OnPaymentFailed, {
                 orderUuid: data.orderUuid,
                 paymentMethodCode: '',
-                amount: ((_this$store$currentOr16 = this.store.currentOrder) === null || _this$store$currentOr16 === void 0 ? void 0 : _this$store$currentOr16.total_amount) || '0',
+                amount: ((_this$store$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.total_amount) || '0',
                 timestamp: data.timestamp
               });
             case 5:
@@ -3320,7 +3326,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateBalanceDueAmount",
     value: (function () {
       var _updateBalanceDueAmount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee44() {
-        var _this$store$currentOr17, remainingAmount, currentBalanceDueAmount;
+        var _this$store$currentOr18, remainingAmount, currentBalanceDueAmount;
         return _regeneratorRuntime().wrap(function _callee44$(_context44) {
           while (1) switch (_context44.prev = _context44.next) {
             case 0:
@@ -3334,7 +3340,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 calculatedRemainingAmount: remainingAmount,
                 currentBalanceDueAmount: currentBalanceDueAmount,
                 needsUpdate: remainingAmount !== currentBalanceDueAmount,
-                orderUuid: (_this$store$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.uuid
+                orderUuid: (_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.uuid
               });
 
               // 只有当剩余金额与当前 balanceDueAmount 不同时才更新
@@ -3389,7 +3395,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateStateAmountToRemaining",
     value: (function () {
       var _updateStateAmountToRemaining = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee45() {
-        var _this$store$currentOr18, remainingAmount, currentStateAmount;
+        var _this$store$currentOr19, remainingAmount, currentStateAmount;
         return _regeneratorRuntime().wrap(function _callee45$(_context45) {
           while (1) switch (_context45.prev = _context45.next) {
             case 0:
@@ -3403,7 +3409,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 calculatedRemainingAmount: remainingAmount,
                 currentStateAmount: currentStateAmount,
                 needsUpdate: remainingAmount !== currentStateAmount,
-                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
               });
 
               // 只有当剩余金额与当前 stateAmount 不同时才更新
@@ -3646,7 +3652,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncOrderToBackendWithReturn",
     value: (function () {
       var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee47() {
-        var _this$store$currentCu2, _this$store$currentOr19, _this$store$currentOr20, _checkoutResponse3, _checkoutResponse4, _checkoutResponse5, _checkoutResponse6, _checkoutResponse7, _checkoutResponse8;
+        var _this$store$currentCu2, _this$store$currentOr20, _this$store$currentOr21, _checkoutResponse3, _checkoutResponse4, _checkoutResponse5, _checkoutResponse6, _checkoutResponse7, _checkoutResponse8;
         var isManual,
           customPaymentItems,
           syncType,
@@ -3752,7 +3758,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                     code: p.code,
                     amount: p.amount,
                     uniquePaymentNumber: (_p$metadata = p.metadata) === null || _p$metadata === void 0 ? void 0 : _p$metadata.unique_payment_number,
-                    voucherId: p.voucher_id
+                    voucherId: p.voucher_id,
+                    orderPaymentType: p.order_payment_type
                   };
                 })
               });
@@ -3776,8 +3783,8 @@ 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$currentOr19 = this.store.currentOrder) === null || _this$store$currentOr19 === void 0 ? void 0 : _this$store$currentOr19.is_deposit) || 0,
-                deposit_amount: ((_this$store$currentOr20 = this.store.currentOrder) === null || _this$store$currentOr20 === void 0 ? void 0 : _this$store$currentOr20.deposit_amount) || '0.00',
+                is_deposit: ((_this$store$currentOr20 = this.store.currentOrder) === null || _this$store$currentOr20 === void 0 ? void 0 : _this$store$currentOr20.is_deposit) || 0,
+                deposit_amount: ((_this$store$currentOr21 = this.store.currentOrder) === null || _this$store$currentOr21 === void 0 ? void 0 : _this$store$currentOr21.deposit_amount) || '0.00',
                 // surcharge_fee: this.otherParams.surcharge_fee,
                 // surcharges: ,
                 note: this.store.localOrderData.shop_note

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

@@ -403,7 +403,9 @@ export declare enum CheckoutHooks {
     /** 下单接口请求开始 */
     OnOrderSubmitStart = "checkout:onOrderSubmitStart",
     /** 下单接口请求完成 */
-    OnOrderSubmitEnd = "checkout:onOrderSubmitEnd"
+    OnOrderSubmitEnd = "checkout:onOrderSubmitEnd",
+    /** 钱包数据初始化完成 */
+    OnWalletDataInitialized = "checkout:onWalletDataInitialized"
 }
 /**
  * 结账状态数据
@@ -897,4 +899,21 @@ export interface CheckoutEventData {
         duration?: number;
         timestamp: number;
     };
+    /** 钱包数据初始化完成事件 */
+    walletDataInitialized: {
+        /** 订单UUID */
+        orderUuid?: string;
+        /** 客户ID */
+        customerId?: number;
+        /** 钱包业务数据 */
+        walletBusinessData: {
+            customer_id?: number;
+            amountInfo: {
+                totalAmount: string;
+                subTotal: string;
+            };
+            order_wait_pay_amount?: number;
+        };
+        timestamp: number;
+    };
 }

package/dist/solution/Checkout/types.js

@@ -123,6 +123,7 @@ export var CheckoutHooks = /*#__PURE__*/function (CheckoutHooks) {
   CheckoutHooks["OnOrderCleared"] = "checkout:onOrderCleared";
   CheckoutHooks["OnOrderSubmitStart"] = "checkout:onOrderSubmitStart";
   CheckoutHooks["OnOrderSubmitEnd"] = "checkout:onOrderSubmitEnd";
+  CheckoutHooks["OnWalletDataInitialized"] = "checkout:onWalletDataInitialized";
   return CheckoutHooks;
 }({});
 

package/lib/modules/Payment/index.js

@@ -508,7 +508,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.logInfo("Starting addPaymentItemAsync", {
       orderUuid,
       paymentAmount: paymentItem.amount,
-      paymentCode: paymentItem.code
+      paymentCode: paymentItem.code,
+      orderPaymentType: paymentItem.order_payment_type
     });
     try {
       const order = await this.getPaymentOrderByUuidAsync(orderUuid);
@@ -528,6 +529,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         service_charge: paymentItem.service_charge,
         status: "active",
         // 新支付项默认为活跃状态
+        order_payment_type: paymentItem.order_payment_type || "normal",
+        // 默认为正常支付
         metadata: {
           unique_payment_number: paymentUuid
           // 设置唯一支付号为支付项的 uuid
@@ -622,7 +625,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       voucherItems: voucherPaymentItems.map((item) => ({
         code: item.code,
         amount: item.amount,
-        voucher_id: item.voucher_id
+        voucher_id: item.voucher_id,
+        order_payment_type: item.order_payment_type
       }))
     });
     try {
@@ -658,7 +662,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         console.log(`[PaymentModule] 添加代金券支付项:`, {
           code: voucherItem.code,
           amount: voucherItem.amount,
-          voucher_id: voucherItem.voucher_id
+          voucher_id: voucherItem.voucher_id,
+          order_payment_type: voucherItem.order_payment_type
         });
         await this.addPaymentItemAsync(orderUuid, voucherItem);
       }

package/lib/modules/Payment/types.d.ts

@@ -123,6 +123,8 @@ export interface PaymentItem {
     status?: 'active' | 'voided';
     /** 原始金额（用于记录撤销前的金额） */
     origin_amount?: string;
+    /** 订单支付类型 */
+    order_payment_type?: 'normal' | 'deposit';
 }
 /**
  * 订单信息
@@ -218,6 +220,8 @@ export interface PaymentItemInput {
     };
     /** 舍入金额 */
     rounding_amount?: string;
+    /** 订单支付类型 */
+    order_payment_type?: 'normal' | 'deposit';
 }
 /**
  * 推送支付项参数

package/lib/solution/Checkout/index.js

@@ -164,7 +164,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     return [...productList, ...relationProducts];
   }
   async initWalletData(params) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const amountInfo = (_b = (_a = this.store.currentOrder) == null ? void 0 : _a.order_info) == null ? void 0 : _b.amount_breakdown;
     if (!amountInfo) {
       return;
@@ -181,6 +181,16 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     await this.payment.wallet.initializeWalletDataFromBusinessAsync(
       walletBusinessData
     );
+    await this.core.effects.emit(import_types.CheckoutHooks.OnWalletDataInitialized, {
+      orderUuid: (_d = this.store.currentOrder) == null ? void 0 : _d.uuid,
+      customerId: walletBusinessData.customer_id,
+      walletBusinessData: {
+        customer_id: walletBusinessData.customer_id,
+        amountInfo: walletBusinessData.amountInfo,
+        order_wait_pay_amount: params == null ? void 0 : params.order_wait_pay_amount
+      },
+      timestamp: Date.now()
+    });
   }
   /**
    * 创建本地订单 (前端模拟下单流程)
@@ -929,21 +939,29 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           "未找到当前订单，无法添加支付项"
         );
       }
+      const orderPaymentType = this.store.currentOrder.is_deposit === 1 ? "deposit" : "normal";
+      const paymentItemWithType = {
+        ...paymentItem,
+        order_payment_type: orderPaymentType
+      };
       console.log("[Checkout] 为当前订单添加支付项:", {
         orderUuid: this.store.currentOrder.uuid,
         paymentItem: {
-          code: paymentItem.code,
-          name: paymentItem.name,
-          type: paymentItem.type,
-          amount: paymentItem.amount,
-          service_charge: paymentItem.service_charge,
-          rounding_amount: paymentItem.rounding_amount,
-          voucher_id: paymentItem.voucher_id
-        }
+          code: paymentItemWithType.code,
+          name: paymentItemWithType.name,
+          type: paymentItemWithType.type,
+          amount: paymentItemWithType.amount,
+          service_charge: paymentItemWithType.service_charge,
+          rounding_amount: paymentItemWithType.rounding_amount,
+          voucher_id: paymentItemWithType.voucher_id,
+          order_payment_type: paymentItemWithType.order_payment_type
+        },
+        orderDepositStatus: this.store.currentOrder.is_deposit,
+        calculatedOrderPaymentType: orderPaymentType
       });
       await this.payment.addPaymentItemAsync(
         this.store.currentOrder.uuid,
-        paymentItem
+        paymentItemWithType
       );
       console.log("[Checkout] 支付项添加成功");
       const isEftposPayment = ((_a = paymentItem.type) == null ? void 0 : _a.toLowerCase()) === "eftpos" || ((_b = paymentItem.code) == null ? void 0 : _b.toUpperCase().includes("EFTPOS"));
@@ -1086,17 +1104,27 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         newVoucherCount: voucherPaymentItems.length,
         voucherPaymentItems
       });
-      for (const item of voucherPaymentItems) {
+      const orderPaymentType = this.store.currentOrder.is_deposit === 1 ? "deposit" : "normal";
+      const voucherPaymentItemsWithType = voucherPaymentItems.map((item) => {
         if (!item.voucher_id) {
           throw (0, import_utils.createCheckoutError)(
             import_types.CheckoutErrorType.ValidationFailed,
             `代金券支付项缺少 voucher_id: ${JSON.stringify(item)}`
           );
         }
-      }
+        return {
+          ...item,
+          order_payment_type: orderPaymentType
+        };
+      });
+      console.log("[Checkout] 代金券支付项订单支付类型设置:", {
+        orderDepositStatus: this.store.currentOrder.is_deposit,
+        calculatedOrderPaymentType: orderPaymentType,
+        itemsCount: voucherPaymentItemsWithType.length
+      });
       await this.payment.updateVoucherPaymentItemsAsync(
         this.store.currentOrder.uuid,
-        voucherPaymentItems
+        voucherPaymentItemsWithType
       );
       console.log("[Checkout] Payment模块批量更新完成");
       const currentOrderId = this.store.currentOrder.order_id;
@@ -2232,7 +2260,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           code: p.code,
           amount: p.amount,
           uniquePaymentNumber: (_a2 = p.metadata) == null ? void 0 : _a2.unique_payment_number,
-          voucherId: p.voucher_id
+          voucherId: p.voucher_id,
+          orderPaymentType: p.order_payment_type
         };
       })
     });

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

@@ -403,7 +403,9 @@ export declare enum CheckoutHooks {
     /** 下单接口请求开始 */
     OnOrderSubmitStart = "checkout:onOrderSubmitStart",
     /** 下单接口请求完成 */
-    OnOrderSubmitEnd = "checkout:onOrderSubmitEnd"
+    OnOrderSubmitEnd = "checkout:onOrderSubmitEnd",
+    /** 钱包数据初始化完成 */
+    OnWalletDataInitialized = "checkout:onWalletDataInitialized"
 }
 /**
  * 结账状态数据
@@ -897,4 +899,21 @@ export interface CheckoutEventData {
         duration?: number;
         timestamp: number;
     };
+    /** 钱包数据初始化完成事件 */
+    walletDataInitialized: {
+        /** 订单UUID */
+        orderUuid?: string;
+        /** 客户ID */
+        customerId?: number;
+        /** 钱包业务数据 */
+        walletBusinessData: {
+            customer_id?: number;
+            amountInfo: {
+                totalAmount: string;
+                subTotal: string;
+            };
+            order_wait_pay_amount?: number;
+        };
+        timestamp: number;
+    };
 }

package/lib/solution/Checkout/types.js

@@ -75,6 +75,7 @@ var CheckoutHooks = /* @__PURE__ */ ((CheckoutHooks2) => {
   CheckoutHooks2["OnOrderCleared"] = "checkout:onOrderCleared";
   CheckoutHooks2["OnOrderSubmitStart"] = "checkout:onOrderSubmitStart";
   CheckoutHooks2["OnOrderSubmitEnd"] = "checkout:onOrderSubmitEnd";
+  CheckoutHooks2["OnWalletDataInitialized"] = "checkout:onWalletDataInitialized";
   return CheckoutHooks2;
 })(CheckoutHooks || {});
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

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