@pisell/pisellos 1.0.62 → 1.0.64

package/dist/modules/Cart/utils/cartProduct.js

@@ -12,6 +12,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 Decimal from 'decimal.js';
 import { isNormalProduct } from "../../Product/utils";
+import { getDiscountAmount } from "../../../solution/ShopDiscount/utils";
 
 /**
  * @title 处理组合商品
@@ -192,8 +193,14 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
       // 不是商品券则代表折扣卡，计算打折后的价格
       // 一个商品折扣卡只能存在于一张
       if (currentValue.type !== 'good_pass') {
-        var discountPrice = new Decimal(100).minus(currentValue.discount.percent || 0).div(100).mul(new Decimal(price || 0)).toFixed(2);
-        price = Number(discountPrice);
+        var _currentValue$discoun;
+        price = getDiscountAmount({
+          tag: currentValue.type,
+          par_value: currentValue.discount.percent,
+          metadata: {
+            discount_card_type: currentValue === null || currentValue === void 0 || (_currentValue$discoun = currentValue.discount) === null || _currentValue$discoun === void 0 ? void 0 : _currentValue$discoun.discount_card_type
+          }
+        }, price, price);
       }
     });
   }

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/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);
         }
 
@@ -291,7 +316,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 判断优惠券是否适用于该商品
           if (isAvailableProduct && isLimitedProduct) {
-            var _discountApplicabilit;
+            var _discountApplicabilit, _discount$metadata;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
 
@@ -303,6 +328,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               type: discountType,
               tag: discountType,
               discount: {
+                discount_card_type: discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type,
                 resource_id: discount.id,
                 title: discount.format_title,
                 original_amount: product.origin_total,
@@ -444,7 +470,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }));
         }
         for (var _i = 0; _i < splitCount; _i++) {
-          var _product$discount_lis12, _originProduct$_produ;
+          var _product$discount_lis12, _originProduct$_produ, _selectedDiscount$met;
           // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
           var _selectedDiscount = selectedDiscountCard || applicableDiscounts[_i];
           // 标记优惠券为已使用
@@ -465,12 +491,13 @@ 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(),
             type: discountType,
             discount: {
+              discount_card_type: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met = _selectedDiscount.metadata) === null || _selectedDiscount$met === void 0 ? void 0 : _selectedDiscount$met.discount_card_type,
               resource_id: _selectedDiscount.id,
               title: _selectedDiscount.format_title,
               original_amount: productOriginTotal,

package/dist/solution/Checkout/index.js

@@ -25,6 +25,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 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 "../../modules/BaseModule";
+import Decimal from 'decimal.js';
 import { OrderModule } from "../../modules/Order";
 import { PaymentModule } from "../../modules/Payment";
 import { CheckoutStatus, CheckoutStep, CheckoutHooks, CheckoutErrorType } from "./types";
@@ -1820,9 +1821,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 21:
               syncResult = _context25.sent;
               console.log('[Checkout] EFTPOS 支付后订单同步完成 (已标记为手动同步):', {
-                订单ID: syncResult.orderId,
-                是否已同步: this.store.isOrderSynced,
-                后端响应: syncResult.response
+                orderId: syncResult.orderId,
+                isOrderSynced: this.store.isOrderSynced,
+                backendResponse: syncResult.response
               });
               _context25.next = 30;
               break;
@@ -1935,8 +1936,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 // 如果当前订单ID是真实ID，但获取到的订单ID是虚拟ID，需要保护真实ID
                 if (isCurrentOrderReal && isVirtualOrderId(updatedOrder.order_id)) {
                   console.warn('[Checkout] deletePaymentItemAsync: 检测到订单ID回退，保护真实订单ID:', {
-                    当前真实ID: currentOrderId,
-                    获取到的虚拟ID: updatedOrder.order_id
+                    currentRealId: currentOrderId,
+                    retrievedVirtualId: updatedOrder.order_id
                   });
                   updatedOrder.order_id = currentOrderId; // 恢复真实的订单ID
                 }
@@ -2052,8 +2053,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 // 如果当前订单ID是真实ID，但获取到的订单ID是虚拟ID，需要保护真实ID
                 if (isCurrentOrderReal && isVirtualOrderId(updatedOrder.order_id)) {
                   console.warn('[Checkout] updateVoucherPaymentItemsAsync: 检测到订单ID回退，保护真实订单ID:', {
-                    当前真实ID: currentOrderId,
-                    获取到的虚拟ID: updatedOrder.order_id
+                    currentRealId: currentOrderId,
+                    retrievedVirtualId: updatedOrder.order_id
                   });
                   updatedOrder.order_id = currentOrderId; // 恢复真实的订单ID
                 }
@@ -2311,8 +2312,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.calculateRemainingAmountAsync();
             case 5:
               remainingAmount = _context30.sent;
-              remainingValue = parseFloat(remainingAmount);
-              if (!(remainingValue > 0)) {
+              remainingValue = new Decimal(remainingAmount);
+              if (!remainingValue.gt(0)) {
                 _context30.next = 9;
                 break;
               }
@@ -2428,11 +2429,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               finalOrderId = this.store.currentOrder.order_id;
               finalIsVirtual = isVirtualOrderId(finalOrderId);
               console.log('[Checkout] manualSyncOrderAsync 最终状态验证:', {
-                返回的订单ID: syncResult.orderId,
-                存储的订单ID: finalOrderId,
-                存储的ID是否虚拟: finalIsVirtual,
-                是否一致: syncResult.orderId === finalOrderId,
-                同步状态: this.store.isOrderSynced
+                returnedOrderId: syncResult.orderId,
+                storedOrderId: finalOrderId,
+                storedIdIsVirtual: finalIsVirtual,
+                isConsistent: syncResult.orderId === finalOrderId,
+                syncStatus: this.store.isOrderSynced
               });
               if (finalIsVirtual) {
                 console.error('[Checkout] 严重警告：手动同步完成后订单ID仍为虚拟ID！');
@@ -2691,10 +2692,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // 验证最终状态
               finalOrderId = this.store.currentOrder.order_id;
               console.log('[Checkout] saveForLaterPaymentAsync 最终状态验证:', {
-                返回的订单ID: syncResult.orderId,
-                存储的订单ID: finalOrderId,
-                是否一致: syncResult.orderId === finalOrderId,
-                同步状态: this.store.isOrderSynced
+                returnedOrderId: syncResult.orderId,
+                storedOrderId: finalOrderId,
+                isConsistent: syncResult.orderId === finalOrderId,
+                syncStatus: this.store.isOrderSynced
               });
               return _context33.abrupt("return", {
                 success: true,
@@ -3114,58 +3115,78 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.calculateRemainingAmountAsync();
             case 6:
               remainingAmountStr = _context39.sent;
-              remainingAmount = parseFloat(remainingAmountStr);
-              cashAmount = parseFloat(String(paymentItem.amount));
+              // 15.66
+              remainingAmount = new Decimal(remainingAmountStr);
+              cashAmount = new Decimal(String(paymentItem.amount)); // 15.7
               console.log('[Checkout] 现金支付处理:', {
-                cashAmount: cashAmount,
-                remainingAmount: remainingAmount,
-                needsChange: cashAmount > remainingAmount
+                cashAmount: cashAmount.toNumber(),
+                remainingAmount: remainingAmount.toNumber(),
+                needsChange: cashAmount.gt(remainingAmount)
               });
 
               // 如果现金金额小于等于剩余待付金额，无需找零
-              if (!(cashAmount <= remainingAmount)) {
+              if (!cashAmount.lte(remainingAmount)) {
                 _context39.next = 12;
                 break;
               }
               return _context39.abrupt("return", paymentItem);
             case 12:
-              // 计算找零金额
-              changeAmount = cashAmount - remainingAmount;
+              // 使用 Decimal.js 安全计算找零金额
+              changeAmount = cashAmount.sub(remainingAmount); // 如果还有 rounding_amount 的配置，要判断是否和 changeAmount 相等
+              if (!(Number(paymentItem.rounding_amount) > 0)) {
+                _context39.next = 19;
+                break;
+              }
+              if (!(Number(paymentItem.rounding_amount) === changeAmount.toNumber())) {
+                _context39.next = 18;
+                break;
+              }
+              return _context39.abrupt("return", paymentItem);
+            case 18:
+              // 如果不等于，则remainingAmount需要加上 rounding_amount，避免这里被改为未舍入金额
+              remainingAmount = remainingAmount.add(new Decimal(paymentItem.rounding_amount || '0'));
+            case 19:
               console.log('[Checkout] 现金支付需要找零:', {
-                actualPaidAmount: cashAmount,
-                chargedAmount: remainingAmount,
-                changeGivenAmount: changeAmount
+                actualPaidAmount: cashAmount.toFixed(2),
+                chargedAmount: remainingAmount.toFixed(2),
+                changeGivenAmount: changeAmount.toFixed(2)
               });
 
               // 创建包含找零信息的支付项
               processedPaymentItem = _objectSpread(_objectSpread({}, paymentItem), {}, {
-                amount: remainingAmount,
-                // 将 amount 设置为剩余待付金额
+                amount: remainingAmount.toFixed(2),
+                // 将 amount 设置为剩余待付金额，保留2位小数
                 metadata: _objectSpread(_objectSpread({}, paymentItem.metadata), {}, {
-                  actual_paid_amount: cashAmount,
+                  actual_paid_amount: cashAmount.toNumber(),
                   // 实付金额
-                  change_given_amount: changeAmount // 找零金额
+                  change_given_amount: changeAmount.toNumber() // 找零金额
                 })
               });
               this.logInfo('Cash payment with change processed', {
-                originalAmount: cashAmount,
-                chargedAmount: remainingAmount,
-                changeAmount: changeAmount,
+                originalAmount: cashAmount.toFixed(2),
+                chargedAmount: remainingAmount.toFixed(2),
+                changeAmount: changeAmount.toFixed(2),
                 paymentCode: paymentItem.code,
-                paymentType: paymentItem.type
+                paymentType: paymentItem.type,
+                // 额外的精度验证信息
+                decimalPrecisionCheck: {
+                  cashAmountPrecise: cashAmount.toString(),
+                  remainingAmountPrecise: remainingAmount.toString(),
+                  changeAmountPrecise: changeAmount.toString()
+                }
               });
               return _context39.abrupt("return", processedPaymentItem);
-            case 19:
-              _context39.prev = 19;
+            case 25:
+              _context39.prev = 25;
               _context39.t0 = _context39["catch"](3);
               console.error('[Checkout] 处理现金支付项时出错:', _context39.t0);
               // 出错时返回原始支付项，避免中断支付流程
               return _context39.abrupt("return", paymentItem);
-            case 23:
+            case 29:
             case "end":
               return _context39.stop();
           }
-        }, _callee39, this, [[3, 19]]);
+        }, _callee39, this, [[3, 25]]);
       }));
       function processCashPaymentItem(_x28) {
         return _processCashPaymentItem.apply(this, arguments);
@@ -3456,25 +3477,33 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   };
                 })
               });
+
+              // 使用 Decimal.js 进行安全的金额计算
               paidAmount = payments.filter(function (payment) {
                 return payment.status !== 'voided';
               }) // 只计算未撤销的支付项
               .reduce(function (sum, payment) {
-                var amount = parseFloat(payment.amount || '0');
-                var roundingAmount = parseFloat(payment.rounding_amount || '0');
+                var amount = new Decimal(payment.amount || '0');
+                var roundingAmount = new Decimal(payment.rounding_amount || '0');
 
-                // 计算实际支付有效金额：
+                // 使用 Decimal.js 计算实际支付有效金额：
                 // 当 rounding_amount 为负数时，表示抹掉的金额，应该按绝对值加到实际支付中
                 // 例如：amount=15, rounding_amount=-0.2，实际相当于支付了15.2（抹掉了0.2元的零头）
-                var effectiveAmount = amount + Math.abs(roundingAmount);
+                var effectiveAmount = amount.add(roundingAmount.abs());
                 console.log("[Checkout] \u8BA1\u7B97\u652F\u4ED8\u9879: ".concat(payment.code), {
-                  原始金额: amount,
-                  抹零金额: roundingAmount,
-                  有效金额: effectiveAmount,
-                  说明: roundingAmount !== 0 ? "\u62B9\u96F6\u91D1\u989D ".concat(roundingAmount, " \u5143\uFF0C\u6709\u6548\u652F\u4ED8\u589E\u52A0 ").concat(Math.abs(roundingAmount), " \u5143") : '无抹零'
+                  originalAmount: amount.toFixed(2),
+                  roundingAmount: roundingAmount.toFixed(2),
+                  effectiveAmount: effectiveAmount.toFixed(2),
+                  description: !roundingAmount.isZero() ? "\u62B9\u96F6\u91D1\u989D ".concat(roundingAmount.toFixed(2), " \u5143\uFF0C\u6709\u6548\u652F\u4ED8\u589E\u52A0 ").concat(roundingAmount.abs().toFixed(2), " \u5143") : '无抹零',
+                  // Decimal 精度验证
+                  preciseCalculationValues: {
+                    amount: amount.toString(),
+                    roundingAmount: roundingAmount.toString(),
+                    effectiveAmount: effectiveAmount.toString()
+                  }
                 });
-                return sum + effectiveAmount;
-              }, 0);
+                return sum.add(effectiveAmount);
+              }, new Decimal(0));
               result = paidAmount.toFixed(2);
               console.log('[Checkout] calculatePaidAmountAsync: 计算结果 =', result);
               return _context42.abrupt("return", result);
@@ -3502,7 +3531,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "calculateRemainingAmountAsync",
     value: (function () {
       var _calculateRemainingAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43() {
-        var totalAmount, paidAmount, remainingAmount, result;
+        var totalAmount, paidAmountStr, paidAmount, remainingAmount, result;
         return _regeneratorRuntime().wrap(function _callee43$(_context43) {
           while (1) switch (_context43.prev = _context43.next) {
             case 0:
@@ -3513,25 +3542,32 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               console.log('[Checkout] calculateRemainingAmountAsync: 没有当前订单');
               return _context43.abrupt("return", '0.00');
             case 3:
-              totalAmount = parseFloat(this.store.currentOrder.total_amount || '0');
-              _context43.t0 = parseFloat;
-              _context43.next = 7;
+              // 使用 Decimal.js 进行安全的金额计算
+              totalAmount = new Decimal(this.store.currentOrder.total_amount || '0');
+              _context43.next = 6;
               return this.calculatePaidAmountAsync();
-            case 7:
-              _context43.t1 = _context43.sent;
-              paidAmount = (0, _context43.t0)(_context43.t1);
-              remainingAmount = totalAmount - paidAmount;
-              result = Math.max(0, remainingAmount).toFixed(2);
+            case 6:
+              paidAmountStr = _context43.sent;
+              paidAmount = new Decimal(paidAmountStr);
+              remainingAmount = totalAmount.sub(paidAmount); // 确保剩余金额不为负数
+              result = Decimal.max(0, remainingAmount).toFixed(2);
               console.log('[Checkout] calculateRemainingAmountAsync: 计算详情:', {
                 orderUuid: this.store.currentOrder.uuid,
                 totalAmount: totalAmount.toFixed(2),
                 paidAmount: paidAmount.toFixed(2),
                 calculatedRemaining: remainingAmount.toFixed(2),
                 finalResult: result,
-                说明: '已支付金额包含抹零计算（amount + |rounding_amount|）'
+                description: '已支付金额包含抹零计算（amount + |rounding_amount|）',
+                // Decimal 精度验证
+                preciseCalculationValues: {
+                  totalAmount: totalAmount.toString(),
+                  paidAmount: paidAmount.toString(),
+                  remainingAmount: remainingAmount.toString(),
+                  resultAfterMax: Decimal.max(0, remainingAmount).toString()
+                }
               });
               return _context43.abrupt("return", result);
-            case 13:
+            case 12:
             case "end":
               return _context43.stop();
           }
@@ -3706,8 +3742,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.calculateRemainingAmountAsync();
             case 5:
               remainingAmount = _context46.sent;
-              remainingValue = parseFloat(remainingAmount); // 当剩余金额小于等于0时，认为订单已完成支付
-              if (!(remainingValue <= 0)) {
+              remainingValue = new Decimal(remainingAmount); // 当剩余金额小于等于0时，认为订单已完成支付
+              if (!remainingValue.lte(0)) {
                 _context46.next = 29;
                 break;
               }
@@ -4224,8 +4260,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 beforeManualUpdate = this.store.currentOrder.order_id;
                 this.store.currentOrder.order_id = realOrderId;
                 console.log('[Checkout] 手动设置订单ID:', {
-                  替换前: beforeManualUpdate,
-                  替换后: this.store.currentOrder.order_id,
+                  beforeReplacement: beforeManualUpdate,
+                  afterReplacement: this.store.currentOrder.order_id,
                   目标ID: realOrderId
                 });
               }
@@ -4258,10 +4294,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               finalOrderId = this.store.currentOrder.order_id;
               finalIsVirtual = isVirtualOrderId(finalOrderId || '');
               console.log("[Checkout] ".concat(syncType).concat(operation, "\u8BA2\u5355\u5230\u540E\u7AEF\u5B8C\u6210"), {
-                返回的订单ID: realOrderId,
-                当前存储的订单ID: finalOrderId,
-                是否还是虚拟ID: finalIsVirtual,
-                是否同步: this.store.isOrderSynced
+                returnedOrderId: realOrderId,
+                currentStoredOrderId: finalOrderId,
+                isStillVirtualId: finalIsVirtual,
+                isSynced: this.store.isOrderSynced
               });
 
               // 如果最终状态不正确，发出警告

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/Cart/utils/cartProduct.js

@@ -44,6 +44,7 @@ __export(cartProduct_exports, {
 module.exports = __toCommonJS(cartProduct_exports);
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../Product/utils");
+var import_utils2 = require("../../../solution/ShopDiscount/utils");
 var handleVariantProduct = (product) => {
   var _a;
   if (product == null ? void 0 : product.product_variant_id) {
@@ -183,9 +184,15 @@ var getProductTotalPrice = (params) => {
   }
   if (discounts == null ? void 0 : discounts.length) {
     discounts.forEach((currentValue) => {
+      var _a;
       if (currentValue.type !== "good_pass") {
-        const discountPrice = new import_decimal.default(100).minus(currentValue.discount.percent || 0).div(100).mul(new import_decimal.default(price || 0)).toFixed(2);
-        price = Number(discountPrice);
+        price = (0, import_utils2.getDiscountAmount)({
+          tag: currentValue.type,
+          par_value: currentValue.discount.percent,
+          metadata: {
+            discount_card_type: (_a = currentValue == null ? void 0 : currentValue.discount) == null ? void 0 : _a.discount_card_type
+          }
+        }, price, price);
       }
     });
   }

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/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);
       }
@@ -182,7 +198,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     sortedProductList.forEach((originProduct) => {
       const product = this.hooks.getProduct(originProduct);
       addModeDiscount.forEach((discount) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
         const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
         const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type))));
@@ -195,6 +211,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             type: discountType,
             tag: discountType,
             discount: {
+              discount_card_type: (_d = discount == null ? void 0 : discount.metadata) == null ? void 0 : _d.discount_card_type,
               resource_id: discount.id,
               title: discount.format_title,
               original_amount: product.origin_total,
@@ -212,7 +229,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     console.log(sortedProductList, "sortedProductListsortedProductList");
     sortedProductList.forEach((originProduct, i) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
       const product = this.hooks.getProduct(originProduct);
       if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount.tag || discount.type)))) {
         processedProductsMap.set(product._id, [originProduct]);
@@ -322,12 +339,13 @@ 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(),
           type: discountType,
           discount: {
+            discount_card_type: (_j = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _j.discount_card_type,
             resource_id: selectedDiscount2.id,
             title: selectedDiscount2.format_title,
             original_amount: productOriginTotal,

package/lib/solution/Checkout/index.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)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+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/Checkout/index.ts
@@ -24,6 +34,7 @@ __export(Checkout_exports, {
 });
 module.exports = __toCommonJS(Checkout_exports);
 var import_BaseModule = require("../../modules/BaseModule");
+var import_decimal = __toESM(require("decimal.js"));
 var import_Order = require("../../modules/Order");
 var import_Payment = require("../../modules/Payment");
 var import_types = require("./types");
@@ -1077,9 +1088,9 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         try {
           const syncResult = await this.syncOrderToBackendWithReturn(true);
           console.log("[Checkout] EFTPOS 支付后订单同步完成 (已标记为手动同步):", {
-            订单ID: syncResult.orderId,
-            是否已同步: this.store.isOrderSynced,
-            后端响应: syncResult.response
+            orderId: syncResult.orderId,
+            isOrderSynced: this.store.isOrderSynced,
+            backendResponse: syncResult.response
           });
         } catch (error) {
           console.error("[Checkout] EFTPOS 支付后订单同步失败:", error);
@@ -1156,8 +1167,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           console.warn(
             "[Checkout] deletePaymentItemAsync: 检测到订单ID回退，保护真实订单ID:",
             {
-              当前真实ID: currentOrderId,
-              获取到的虚拟ID: updatedOrder.order_id
+              currentRealId: currentOrderId,
+              retrievedVirtualId: updatedOrder.order_id
             }
           );
           updatedOrder.order_id = currentOrderId;
@@ -1245,8 +1256,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           console.warn(
             "[Checkout] updateVoucherPaymentItemsAsync: 检测到订单ID回退，保护真实订单ID:",
             {
-              当前真实ID: currentOrderId,
-              获取到的虚拟ID: updatedOrder.order_id
+              currentRealId: currentOrderId,
+              retrievedVirtualId: updatedOrder.order_id
             }
           );
           updatedOrder.order_id = currentOrderId;
@@ -1414,8 +1425,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         return false;
       }
       const remainingAmount = await this.calculateRemainingAmountAsync();
-      const remainingValue = parseFloat(remainingAmount);
-      if (remainingValue > 0) {
+      const remainingValue = new import_decimal.default(remainingAmount);
+      if (remainingValue.gt(0)) {
         return false;
       }
       const currentPayments = await this.payment.getPaymentItemsAsync(
@@ -1490,11 +1501,11 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       const finalOrderId = this.store.currentOrder.order_id;
       const finalIsVirtual = (0, import_utils.isVirtualOrderId)(finalOrderId);
       console.log("[Checkout] manualSyncOrderAsync 最终状态验证:", {
-        返回的订单ID: syncResult.orderId,
-        存储的订单ID: finalOrderId,
-        存储的ID是否虚拟: finalIsVirtual,
-        是否一致: syncResult.orderId === finalOrderId,
-        同步状态: this.store.isOrderSynced
+        returnedOrderId: syncResult.orderId,
+        storedOrderId: finalOrderId,
+        storedIdIsVirtual: finalIsVirtual,
+        isConsistent: syncResult.orderId === finalOrderId,
+        syncStatus: this.store.isOrderSynced
       });
       if (finalIsVirtual) {
         console.error("[Checkout] 严重警告：手动同步完成后订单ID仍为虚拟ID！");
@@ -1678,10 +1689,10 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       });
       const finalOrderId = this.store.currentOrder.order_id;
       console.log("[Checkout] saveForLaterPaymentAsync 最终状态验证:", {
-        返回的订单ID: syncResult.orderId,
-        存储的订单ID: finalOrderId,
-        是否一致: syncResult.orderId === finalOrderId,
-        同步状态: this.store.isOrderSynced
+        returnedOrderId: syncResult.orderId,
+        storedOrderId: finalOrderId,
+        isConsistent: syncResult.orderId === finalOrderId,
+        syncStatus: this.store.isOrderSynced
       });
       return {
         success: true,
@@ -1934,40 +1945,53 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     }
     try {
       const remainingAmountStr = await this.calculateRemainingAmountAsync();
-      const remainingAmount = parseFloat(remainingAmountStr);
-      const cashAmount = parseFloat(String(paymentItem.amount));
+      let remainingAmount = new import_decimal.default(remainingAmountStr);
+      const cashAmount = new import_decimal.default(String(paymentItem.amount));
       console.log("[Checkout] 现金支付处理:", {
-        cashAmount,
-        remainingAmount,
-        needsChange: cashAmount > remainingAmount
+        cashAmount: cashAmount.toNumber(),
+        remainingAmount: remainingAmount.toNumber(),
+        needsChange: cashAmount.gt(remainingAmount)
       });
-      if (cashAmount <= remainingAmount) {
+      if (cashAmount.lte(remainingAmount)) {
         return paymentItem;
       }
-      const changeAmount = cashAmount - remainingAmount;
+      const changeAmount = cashAmount.sub(remainingAmount);
+      if (Number(paymentItem.rounding_amount) > 0) {
+        if (Number(paymentItem.rounding_amount) === changeAmount.toNumber()) {
+          return paymentItem;
+        } else {
+          remainingAmount = remainingAmount.add(new import_decimal.default(paymentItem.rounding_amount || "0"));
+        }
+      }
       console.log("[Checkout] 现金支付需要找零:", {
-        actualPaidAmount: cashAmount,
-        chargedAmount: remainingAmount,
-        changeGivenAmount: changeAmount
+        actualPaidAmount: cashAmount.toFixed(2),
+        chargedAmount: remainingAmount.toFixed(2),
+        changeGivenAmount: changeAmount.toFixed(2)
       });
       const processedPaymentItem = {
         ...paymentItem,
-        amount: remainingAmount,
-        // 将 amount 设置为剩余待付金额
+        amount: remainingAmount.toFixed(2),
+        // 将 amount 设置为剩余待付金额，保留2位小数
         metadata: {
           ...paymentItem.metadata,
-          actual_paid_amount: cashAmount,
+          actual_paid_amount: cashAmount.toNumber(),
           // 实付金额
-          change_given_amount: changeAmount
+          change_given_amount: changeAmount.toNumber()
           // 找零金额
         }
       };
       this.logInfo("Cash payment with change processed", {
-        originalAmount: cashAmount,
-        chargedAmount: remainingAmount,
-        changeAmount,
+        originalAmount: cashAmount.toFixed(2),
+        chargedAmount: remainingAmount.toFixed(2),
+        changeAmount: changeAmount.toFixed(2),
         paymentCode: paymentItem.code,
-        paymentType: paymentItem.type
+        paymentType: paymentItem.type,
+        // 额外的精度验证信息
+        decimalPrecisionCheck: {
+          cashAmountPrecise: cashAmount.toString(),
+          remainingAmountPrecise: remainingAmount.toString(),
+          changeAmountPrecise: changeAmount.toString()
+        }
       });
       return processedPaymentItem;
     } catch (error) {
@@ -2116,17 +2140,23 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }))
       });
       const paidAmount = payments.filter((payment) => payment.status !== "voided").reduce((sum, payment) => {
-        const amount = parseFloat(payment.amount || "0");
-        const roundingAmount = parseFloat(payment.rounding_amount || "0");
-        const effectiveAmount = amount + Math.abs(roundingAmount);
+        const amount = new import_decimal.default(payment.amount || "0");
+        const roundingAmount = new import_decimal.default(payment.rounding_amount || "0");
+        const effectiveAmount = amount.add(roundingAmount.abs());
         console.log(`[Checkout] 计算支付项: ${payment.code}`, {
-          原始金额: amount,
-          抹零金额: roundingAmount,
-          有效金额: effectiveAmount,
-          说明: roundingAmount !== 0 ? `抹零金额 ${roundingAmount} 元，有效支付增加 ${Math.abs(roundingAmount)} 元` : "无抹零"
+          originalAmount: amount.toFixed(2),
+          roundingAmount: roundingAmount.toFixed(2),
+          effectiveAmount: effectiveAmount.toFixed(2),
+          description: !roundingAmount.isZero() ? `抹零金额 ${roundingAmount.toFixed(2)} 元，有效支付增加 ${roundingAmount.abs().toFixed(2)} 元` : "无抹零",
+          // Decimal 精度验证
+          preciseCalculationValues: {
+            amount: amount.toString(),
+            roundingAmount: roundingAmount.toString(),
+            effectiveAmount: effectiveAmount.toString()
+          }
         });
-        return sum + effectiveAmount;
-      }, 0);
+        return sum.add(effectiveAmount);
+      }, new import_decimal.default(0));
       const result = paidAmount.toFixed(2);
       console.log("[Checkout] calculatePaidAmountAsync: 计算结果 =", result);
       return result;
@@ -2143,17 +2173,25 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       console.log("[Checkout] calculateRemainingAmountAsync: 没有当前订单");
       return "0.00";
     }
-    const totalAmount = parseFloat(this.store.currentOrder.total_amount || "0");
-    const paidAmount = parseFloat(await this.calculatePaidAmountAsync());
-    const remainingAmount = totalAmount - paidAmount;
-    const result = Math.max(0, remainingAmount).toFixed(2);
+    const totalAmount = new import_decimal.default(this.store.currentOrder.total_amount || "0");
+    const paidAmountStr = await this.calculatePaidAmountAsync();
+    const paidAmount = new import_decimal.default(paidAmountStr);
+    const remainingAmount = totalAmount.sub(paidAmount);
+    const result = import_decimal.default.max(0, remainingAmount).toFixed(2);
     console.log("[Checkout] calculateRemainingAmountAsync: 计算详情:", {
       orderUuid: this.store.currentOrder.uuid,
       totalAmount: totalAmount.toFixed(2),
       paidAmount: paidAmount.toFixed(2),
       calculatedRemaining: remainingAmount.toFixed(2),
       finalResult: result,
-      说明: "已支付金额包含抹零计算（amount + |rounding_amount|）"
+      description: "已支付金额包含抹零计算（amount + |rounding_amount|）",
+      // Decimal 精度验证
+      preciseCalculationValues: {
+        totalAmount: totalAmount.toString(),
+        paidAmount: paidAmount.toString(),
+        remainingAmount: remainingAmount.toString(),
+        resultAfterMax: import_decimal.default.max(0, remainingAmount).toString()
+      }
     });
     return result;
   }
@@ -2240,8 +2278,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         return;
       }
       const remainingAmount = await this.calculateRemainingAmountAsync();
-      const remainingValue = parseFloat(remainingAmount);
-      if (remainingValue <= 0) {
+      const remainingValue = new import_decimal.default(remainingAmount);
+      if (remainingValue.lte(0)) {
         const totalAmount = this.store.currentOrder.total_amount;
         const paidAmount = await this.calculatePaidAmountAsync();
         console.log("[Checkout] 检测到订单支付完成:", {
@@ -2598,8 +2636,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           const beforeManualUpdate = this.store.currentOrder.order_id;
           this.store.currentOrder.order_id = realOrderId;
           console.log("[Checkout] 手动设置订单ID:", {
-            替换前: beforeManualUpdate,
-            替换后: this.store.currentOrder.order_id,
+            beforeReplacement: beforeManualUpdate,
+            afterReplacement: this.store.currentOrder.order_id,
             目标ID: realOrderId
           });
         }
@@ -2621,10 +2659,10 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     const finalOrderId = this.store.currentOrder.order_id;
     const finalIsVirtual = (0, import_utils.isVirtualOrderId)(finalOrderId || "");
     console.log(`[Checkout] ${syncType}${operation}订单到后端完成`, {
-      返回的订单ID: realOrderId,
-      当前存储的订单ID: finalOrderId,
-      是否还是虚拟ID: finalIsVirtual,
-      是否同步: this.store.isOrderSynced
+      returnedOrderId: realOrderId,
+      currentStoredOrderId: finalOrderId,
+      isStillVirtualId: finalIsVirtual,
+      isSynced: this.store.isOrderSynced
     });
     if (finalIsVirtual && !isUpdateOperation) {
       console.warn(

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": "1.0.62",
+  "version": "1.0.64",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",