@pisell/pisellos 0.0.246 → 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/BookingTicket/index.d.ts

@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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."); }
@@ -1661,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:
@@ -1672,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 支付，如果是则立即同步订单
@@ -1700,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);
@@ -1882,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:
@@ -1899,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
@@ -1971,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',
@@ -1983,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);
@@ -3764,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
                   };
                 })
               });

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/BookingTicket/index.d.ts

@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/Checkout/index.js

@@ -939,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"));
@@ -1096,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;
@@ -2242,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/package.json

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