@pisell/pisellos 0.0.257 → 0.0.259

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

@@ -70,6 +70,9 @@ export interface Discount {
     limited_relation_product_data: Limitedrelationproductdata;
     balance: string;
     format_title: Formattitle;
+    metadata?: {
+        discount_card_type?: 'fixed_amount' | 'percent';
+    };
     product: Product;
     type: "product" | 'good_pass';
     resource_id?: number;

package/dist/modules/Payment/walletpass.js

@@ -406,9 +406,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               });
 
               // 检查识别码是否为9位且前3位为"000"
-              // const isWalletCode = code.length === 9 && code.startsWith('000');
-              // 测试环境先使用 WL
-              isWalletCode = code.startsWith('WL');
+              isWalletCode = code.length === 9 && code.startsWith('000'); // 测试环境先使用 WL
+              // const isWalletCode = code.startsWith('WL');
               if (!isWalletCode) {
                 _context5.next = 14;
                 break;

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/modules/Rules/index.js

@@ -25,7 +25,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
 import { RulesHooks } from "./types";
-import { uniqueById } from "../../solution/ShopDiscount/utils";
+import { uniqueById, getDiscountAmount } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
@@ -189,8 +189,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       });
 
       // 优惠力度排序，传进来的数据里可能有商品券，也可能有优惠券
-      // 商品券（n.tag=good_pass）视为最优惠（免费），折扣券（n.tag=product_discount_card）按照n.par_value排序
-      // 如果最后拍出来商品券有多个，或者说没有商品券，但是有多个相同折扣的折扣券（比如 6 折券有 3张），则按照过期时间(n.expire_time)排序
+      // 1. 商品券（n.tag=good_pass）视为最优惠（免费）
+      // 2. 折扣券（n.tag=product_discount_card）按照新的优先级排序：
+      //    - 固定金额优先于百分比（固定金额 > 百分比）
+      //    - 固定金额内部：金额越大越优先
+      //    - 百分比内部：折扣越大越优先（par_value越小越优先）
+      // 3. 相同类型和金额的情况下，按照过期时间(n.expire_time)排序
       var sortedDiscountList = _toConsumableArray(filteredDiscountList).sort(function (a, b) {
         // 1. 商品券优先级最高
         if (a.tag === 'good_pass' && b.tag !== 'good_pass') return -1;
@@ -201,13 +205,34 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 都是商品券，按照过期时间排序
           return compareByExpireTime(a, b);
         } else if (a.tag === 'product_discount_card' && b.tag === 'product_discount_card') {
-          // 都是折扣券，按照par_value排序（折扣越大越优先，即par_value越小越优先）
-          if (a.par_value !== b.par_value) {
-            var valueA = new Decimal(100).minus(a.par_value || 0);
-            var valueB = new Decimal(100).minus(b.par_value || 0);
-            return valueA.minus(valueB).toNumber();
+          var _a$metadata, _b$metadata;
+          // 都是折扣券，按照新的优先级排序：固定金额优先于百分比
+          var typeA = ((_a$metadata = a.metadata) === null || _a$metadata === void 0 ? void 0 : _a$metadata.discount_card_type) || 'percent'; // 默认为百分比
+          var typeB = ((_b$metadata = b.metadata) === null || _b$metadata === void 0 ? void 0 : _b$metadata.discount_card_type) || 'percent'; // 默认为百分比
+
+          // 1. 固定金额优先于百分比
+          if (typeA === 'fixed_amount' && typeB === 'percent') return -1;
+          if (typeA === 'percent' && typeB === 'fixed_amount') return 1;
+
+          // 2. 都是固定金额时，金额越大越优先
+          if (typeA === 'fixed_amount' && typeB === 'fixed_amount') {
+            if (a.par_value !== b.par_value) {
+              var valueA = new Decimal(a.par_value || 0);
+              var valueB = new Decimal(b.par_value || 0);
+              return valueB.minus(valueA).toNumber(); // 金额大的在前
+            }
           }
-          // 相同折扣的情况下，按照过期时间排序
+
+          // 3. 都是百分比时，折扣越大越优先（par_value越小越优先）
+          if (typeA === 'percent' && typeB === 'percent') {
+            if (a.par_value !== b.par_value) {
+              var _valueA = new Decimal(100).minus(a.par_value || 0);
+              var _valueB = new Decimal(100).minus(b.par_value || 0);
+              return _valueB.minus(_valueA).toNumber(); // 折扣大的在前
+            }
+          }
+
+          // 相同类型和金额的情况下，按照过期时间排序
           return compareByExpireTime(a, b);
         }
 
@@ -465,7 +490,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total
-          var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(productOriginTotal).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(productOriginTotal)).toNumber();
+          var targetProductTotal = getDiscountAmount(_selectedDiscount, productOriginTotal, product.price);
           var discountType = _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag;
           var discountDetail = {
             amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).toNumber(),

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, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/Checkout/index.js

@@ -2673,8 +2673,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
         var _this4 = this,
-          _this$store$currentCu2,
           _this$store$currentOr17,
+          _this$store$currentCu2,
           _this$store$currentOr18,
           _checkoutResponse3,
           _checkoutResponse4;
@@ -2684,6 +2684,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           isUpdateOperation,
           paymentItems,
           processedPaymentItems,
+          depositPaymentItems,
+          calculatedDepositAmount,
           orderParams,
           startTime,
           checkoutResponse,
@@ -2747,7 +2749,34 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                     shop_wallet_pass_id: ((_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.shop_wallet_pass_id) || _this4.otherParams.shop_wallet_pass_id
                   })
                 });
-              }); // 构造订单参数，直接使用 localOrderData 中已处理好的数据
+              }); // 计算定金支付项的总金额（order_payment_type="deposit"）
+              depositPaymentItems = processedPaymentItems.filter(function (item) {
+                return item.order_payment_type === 'deposit' && item.status !== 'voided';
+              });
+              calculatedDepositAmount = depositPaymentItems.reduce(function (sum, item) {
+                var amount = new Decimal(item.amount || '0');
+                var roundingAmount = new Decimal(item.rounding_amount || '0');
+                // 包含抹零计算的有效支付金额
+                var effectiveAmount = amount.add(roundingAmount.abs());
+                return sum.add(effectiveAmount);
+              }, new Decimal(0)).toFixed(2);
+              this.logInfo('计算定金支付项总金额', {
+                depositPaymentItemsCount: depositPaymentItems.length,
+                depositPaymentItems: depositPaymentItems.map(function (item) {
+                  return {
+                    uuid: item.uuid,
+                    code: item.code,
+                    amount: item.amount,
+                    rounding_amount: item.rounding_amount,
+                    order_payment_type: item.order_payment_type,
+                    status: item.status
+                  };
+                }),
+                calculatedDepositAmount: calculatedDepositAmount,
+                originalDepositAmount: ((_this$store$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.deposit_amount) || '0.00'
+              });
+
+              // 构造订单参数，直接使用 localOrderData 中已处理好的数据
               orderParams = _objectSpread(_objectSpread({}, this.store.localOrderData), {}, {
                 type: this.store.localOrderData.type,
                 platform: this.store.localOrderData.platform,
@@ -2766,8 +2795,9 @@ 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$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.is_deposit) || 0,
-                deposit_amount: ((_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.deposit_amount) || '0.00',
+                is_deposit: ((_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.is_deposit) || 0,
+                deposit_amount: calculatedDepositAmount,
+                // 使用从支付项中计算出的定金金额
                 product_tax_fee: this.store.localOrderData.tax_fee,
                 note: this.store.localOrderData.shop_note
               }); // 如果是更新操作，需要在参数中包含真实的订单ID
@@ -2782,7 +2812,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 发送下单接口请求开始事件
               startTime = Date.now();
-              _context34.next = 20;
+              _context34.next = 23;
               return this.core.effects.emit(CheckoutHooks.OnOrderSubmitStart, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -2790,9 +2820,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 paymentItemCount: paymentItems.length,
                 timestamp: startTime
               });
-            case 20:
+            case 23:
               submitSuccess = false;
-              _context34.prev = 21;
+              _context34.prev = 24;
               // 记录接口调用参数
               this.logInfo('Calling backend checkout API', _objectSpread({
                 url: '/order/checkout',
@@ -2800,23 +2830,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }, orderParams));
 
               // 调用 Order 模块的专用 createOrderByCheckout 方法
-              _context34.next = 25;
+              _context34.next = 28;
               return this.order.createOrderByCheckout(orderParams);
-            case 25:
+            case 28:
               checkoutResponse = _context34.sent;
               submitSuccess = true;
               this.logInfo('下单接口调用成功', checkoutResponse);
-              _context34.next = 38;
+              _context34.next = 41;
               break;
-            case 30:
-              _context34.prev = 30;
-              _context34.t1 = _context34["catch"](21);
+            case 33:
+              _context34.prev = 33;
+              _context34.t1 = _context34["catch"](24);
               submitSuccess = false;
               submitError = _context34.t1 instanceof Error ? _context34.t1.message : String(_context34.t1);
               this.logError('下单接口调用失败:', submitError);
 
               // 发送订单同步失败事件（网络错误或请求失败）
-              _context34.next = 37;
+              _context34.next = 40;
               return this.core.effects.emit(CheckoutHooks.OnOrderSyncFailed, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -2826,11 +2856,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 37:
+            case 40:
               throw _context34.t1;
-            case 38:
-              _context34.prev = 38;
-              _context34.next = 41;
+            case 41:
+              _context34.prev = 41;
+              _context34.next = 44;
               return this.core.effects.emit(CheckoutHooks.OnOrderSubmitEnd, {
                 success: submitSuccess,
                 orderUuid: this.store.currentOrder.uuid,
@@ -2841,18 +2871,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 41:
-              return _context34.finish(38);
-            case 42:
+            case 44:
+              return _context34.finish(41);
+            case 45:
               // 检查响应状态是否为成功状态
               responseStatus = (_checkoutResponse3 = checkoutResponse) === null || _checkoutResponse3 === void 0 ? void 0 : _checkoutResponse3.status;
               isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === 'success' || responseStatus === 1 && ((_checkoutResponse4 = checkoutResponse) === null || _checkoutResponse4 === void 0 ? void 0 : _checkoutResponse4.code) === 200;
               if (isSuccessResponse) {
-                _context34.next = 49;
+                _context34.next = 52;
                 break;
               }
               errorMessage = ((_checkoutResponse5 = checkoutResponse) === null || _checkoutResponse5 === void 0 ? void 0 : _checkoutResponse5.message) || '订单同步失败，后端返回非成功状态'; // 发送订单同步失败事件
-              _context34.next = 48;
+              _context34.next = 51;
               return this.core.effects.emit(CheckoutHooks.OnOrderSyncFailed, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -2863,18 +2893,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 48:
+            case 51:
               throw new Error(errorMessage);
-            case 49:
+            case 52:
               if (!isUpdateOperation) {
-                _context34.next = 53;
+                _context34.next = 56;
                 break;
               }
               // 更新操作：使用现有的订单ID
               realOrderId = currentOrderId;
-              _context34.next = 72;
+              _context34.next = 75;
               break;
-            case 53:
+            case 56:
               // 创建操作：从响应中提取新的订单ID
               extractedOrderId = (_checkoutResponse6 = checkoutResponse) === null || _checkoutResponse6 === void 0 || (_checkoutResponse6 = _checkoutResponse6.data) === null || _checkoutResponse6 === void 0 ? void 0 : _checkoutResponse6.order_id; // 如果data.order_id不存在，尝试直接从根级获取
               if (!extractedOrderId) {
@@ -2896,10 +2926,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 oldOrderId: this.store.currentOrder.order_id,
                 newOrderId: realOrderId
               });
-              _context34.prev = 59;
-              _context34.next = 62;
+              _context34.prev = 62;
+              _context34.next = 65;
               return this.payment.replaceOrderIdByUuidAsync(this.store.currentOrder.uuid, realOrderId);
-            case 62:
+            case 65:
               updatedOrder = _context34.sent;
               this.logInfo('Payment模块替换订单ID结果:', {
                 wasSuccessful: !!updatedOrder,
@@ -2926,22 +2956,22 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   目标ID: realOrderId
                 });
               }
-              _context34.next = 72;
+              _context34.next = 75;
               break;
-            case 67:
-              _context34.prev = 67;
-              _context34.t2 = _context34["catch"](59);
+            case 70:
+              _context34.prev = 70;
+              _context34.t2 = _context34["catch"](62);
               this.logError('调用Payment模块替换订单ID时发生错误:', _context34.t2);
 
               // 发生错误时也进行手动替换
               this.store.currentOrder.order_id = realOrderId;
               this.logInfo('错误恢复：手动设置订单ID:', realOrderId);
-            case 72:
+            case 75:
               // 标记订单已同步
               this.store.isOrderSynced = true;
 
               // 触发订单同步完成事件
-              _context34.next = 75;
+              _context34.next = 78;
               return this.core.effects.emit(CheckoutHooks.OnOrderSynced, {
                 orderUuid: this.store.currentOrder.uuid,
                 realOrderId: realOrderId,
@@ -2950,18 +2980,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isManual: isManual,
                 response: checkoutResponse
               });
-            case 75:
+            case 78:
               return _context34.abrupt("return", {
                 success: true,
                 orderId: realOrderId,
                 orderUuid: this.store.currentOrder.uuid,
                 response: checkoutResponse
               });
-            case 76:
+            case 79:
             case "end":
               return _context34.stop();
           }
-        }, _callee34, this, [[21, 30, 38, 42], [59, 67]]);
+        }, _callee34, this, [[24, 33, 41, 45], [62, 70]]);
       }));
       function syncOrderToBackendWithReturn() {
         return _syncOrderToBackendWithReturn.apply(this, arguments);

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

@@ -1 +1,12 @@
+import { Discount } from "../../modules/Discount/types";
 export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
+/**
+ * 获取折扣金额 基于折扣卡类型计算
+ * 商品券：直接返回商品价格
+ * 折扣卡：根据折扣卡类型计算 固定金额：直接返回折扣卡金额 百分比：根据折扣卡金额计算
+ * @param discount
+ * @param total
+ * @param price
+ * @returns
+ */
+export declare const getDiscountAmount: (discount: Discount, total: number, price: number) => number;

package/dist/solution/ShopDiscount/utils.js

@@ -1,7 +1,36 @@
+import Decimal from "decimal.js";
 export var uniqueById = function uniqueById(arr) {
   var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'id';
   var seen = new Set();
   return arr.filter(function (item) {
     return !seen.has(item[key]) && seen.add(item[key]);
   });
+};
+
+/**
+ * 获取折扣金额 基于折扣卡类型计算 
+ * 商品券：直接返回商品价格
+ * 折扣卡：根据折扣卡类型计算 固定金额：直接返回折扣卡金额 百分比：根据折扣卡金额计算
+ * @param discount 
+ * @param total 
+ * @param price 
+ * @returns 
+ */
+export var getDiscountAmount = function getDiscountAmount(discount, total, price) {
+  var _discount$metadata;
+  // 商品券
+  if (discount.tag === 'good_pass') {
+    return new Decimal(total).minus(new Decimal(price || 0)).toNumber();
+  }
+
+  // 判断是否是固定金额
+  var isFixedAmount = (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type) === 'fixed_amount';
+
+  // 固定金额 小于0时返回0
+  if (isFixedAmount) {
+    return Math.max(new Decimal(total).minus(new Decimal(discount.par_value || 0)).toNumber(), 0);
+  }
+
+  // 百分比：根据折扣卡金额计算
+  return new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(total)).toNumber();
 };

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

@@ -70,6 +70,9 @@ export interface Discount {
     limited_relation_product_data: Limitedrelationproductdata;
     balance: string;
     format_title: Formattitle;
+    metadata?: {
+        discount_card_type?: 'fixed_amount' | 'percent';
+    };
     product: Product;
     type: "product" | 'good_pass';
     resource_id?: number;

package/lib/modules/Payment/walletpass.js

@@ -268,7 +268,7 @@ var WalletPassPaymentImpl = class {
         code_length: code.length,
         noCache: config.noCache || false
       });
-      const isWalletCode = code.startsWith("WL");
+      const isWalletCode = code.length === 9 && code.startsWith("000");
       if (isWalletCode) {
         const walletDetailParams = {
           code,

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/modules/Rules/index.js

@@ -132,6 +132,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return !discount.isManualSelect;
     });
     const sortedDiscountList = [...filteredDiscountList].sort((a, b) => {
+      var _a, _b;
       if (a.tag === "good_pass" && b.tag !== "good_pass")
         return -1;
       if (b.tag === "good_pass" && a.tag !== "good_pass")
@@ -139,10 +140,25 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (a.tag === "good_pass" && b.tag === "good_pass") {
         return compareByExpireTime(a, b);
       } else if (a.tag === "product_discount_card" && b.tag === "product_discount_card") {
-        if (a.par_value !== b.par_value) {
-          const valueA = new import_decimal.default(100).minus(a.par_value || 0);
-          const valueB = new import_decimal.default(100).minus(b.par_value || 0);
-          return valueA.minus(valueB).toNumber();
+        const typeA = ((_a = a.metadata) == null ? void 0 : _a.discount_card_type) || "percent";
+        const typeB = ((_b = b.metadata) == null ? void 0 : _b.discount_card_type) || "percent";
+        if (typeA === "fixed_amount" && typeB === "percent")
+          return -1;
+        if (typeA === "percent" && typeB === "fixed_amount")
+          return 1;
+        if (typeA === "fixed_amount" && typeB === "fixed_amount") {
+          if (a.par_value !== b.par_value) {
+            const valueA = new import_decimal.default(a.par_value || 0);
+            const valueB = new import_decimal.default(b.par_value || 0);
+            return valueB.minus(valueA).toNumber();
+          }
+        }
+        if (typeA === "percent" && typeB === "percent") {
+          if (a.par_value !== b.par_value) {
+            const valueA = new import_decimal.default(100).minus(a.par_value || 0);
+            const valueB = new import_decimal.default(100).minus(b.par_value || 0);
+            return valueB.minus(valueA).toNumber();
+          }
         }
         return compareByExpireTime(a, b);
       }
@@ -322,7 +338,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (Number(((_i = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _i.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
           productOriginTotal = product.total;
         }
-        const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(productOriginTotal)).toNumber();
+        const targetProductTotal = (0, import_utils.getDiscountAmount)(selectedDiscount2, productOriginTotal, product.price);
         const discountType = selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag;
         const discountDetail = {
           amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),

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, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/Checkout/index.js

@@ -1636,13 +1636,35 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }
       };
     });
+    const depositPaymentItems = processedPaymentItems.filter(
+      (item) => item.order_payment_type === "deposit" && item.status !== "voided"
+    );
+    const calculatedDepositAmount = depositPaymentItems.reduce((sum, item) => {
+      const amount = new import_decimal.default(item.amount || "0");
+      const roundingAmount = new import_decimal.default(item.rounding_amount || "0");
+      const effectiveAmount = amount.add(roundingAmount.abs());
+      return sum.add(effectiveAmount);
+    }, new import_decimal.default(0)).toFixed(2);
+    this.logInfo("计算定金支付项总金额", {
+      depositPaymentItemsCount: depositPaymentItems.length,
+      depositPaymentItems: depositPaymentItems.map((item) => ({
+        uuid: item.uuid,
+        code: item.code,
+        amount: item.amount,
+        rounding_amount: item.rounding_amount,
+        order_payment_type: item.order_payment_type,
+        status: item.status
+      })),
+      calculatedDepositAmount,
+      originalDepositAmount: ((_a = this.store.currentOrder) == null ? void 0 : _a.deposit_amount) || "0.00"
+    });
     const orderParams = {
       ...this.store.localOrderData,
       type: this.store.localOrderData.type,
       platform: this.store.localOrderData.platform,
       payments: processedPaymentItems,
       // 使用处理过的支付项数据
-      customer_id: (_a = this.store.currentCustomer) == null ? void 0 : _a.customer_id,
+      customer_id: (_b = this.store.currentCustomer) == null ? void 0 : _b.customer_id,
       // 添加客户ID
       is_price_include_tax: this.otherParams.is_price_include_tax,
       // core 有
@@ -1655,8 +1677,9 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       currency_code: this.otherParams.currency_code,
       currency_symbol: this.otherParams.currency_symbol,
       currency_format: this.otherParams.currency_format,
-      is_deposit: ((_b = this.store.currentOrder) == null ? void 0 : _b.is_deposit) || 0,
-      deposit_amount: ((_c = this.store.currentOrder) == null ? void 0 : _c.deposit_amount) || "0.00",
+      is_deposit: ((_c = this.store.currentOrder) == null ? void 0 : _c.is_deposit) || 0,
+      deposit_amount: calculatedDepositAmount,
+      // 使用从支付项中计算出的定金金额
       product_tax_fee: this.store.localOrderData.tax_fee,
       note: this.store.localOrderData.shop_note
     };

package/lib/solution/ShopDiscount/utils.d.ts

@@ -1 +1,12 @@
+import { Discount } from "../../modules/Discount/types";
 export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
+/**
+ * 获取折扣金额 基于折扣卡类型计算
+ * 商品券：直接返回商品价格
+ * 折扣卡：根据折扣卡类型计算 固定金额：直接返回折扣卡金额 百分比：根据折扣卡金额计算
+ * @param discount
+ * @param total
+ * @param price
+ * @returns
+ */
+export declare const getDiscountAmount: (discount: Discount, total: number, price: number) => number;

package/lib/solution/ShopDiscount/utils.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,19 +16,41 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/solution/ShopDiscount/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  getDiscountAmount: () => getDiscountAmount,
   uniqueById: () => uniqueById
 });
 module.exports = __toCommonJS(utils_exports);
+var import_decimal = __toESM(require("decimal.js"));
 var uniqueById = (arr, key = "id") => {
   const seen = /* @__PURE__ */ new Set();
   return arr.filter((item) => !seen.has(item[key]) && seen.add(item[key]));
 };
+var getDiscountAmount = (discount, total, price) => {
+  var _a;
+  if (discount.tag === "good_pass") {
+    return new import_decimal.default(total).minus(new import_decimal.default(price || 0)).toNumber();
+  }
+  const isFixedAmount = ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount";
+  if (isFixedAmount) {
+    return Math.max(new import_decimal.default(total).minus(new import_decimal.default(discount.par_value || 0)).toNumber(), 0);
+  }
+  return new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(total)).toNumber();
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getDiscountAmount,
   uniqueById
 });

package/package.json

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