@pisell/pisellos 0.0.449 → 0.0.451

package/dist/model/strategy/adapter/walletPass/evaluator.js

@@ -11,7 +11,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 { StrategyEngine } from "../../index";
-import { processVouchers as _processVouchers, recalculateVouchers as _recalculateVouchers, getApplicableProductIds, getMainProductPrice, getBundleItemPrice, getProductQuantity, getBundleItemIsOriginalPrice } from "./utils";
+import { processVouchers as _processVouchers, recalculateVouchers as _recalculateVouchers, getApplicableProductIds, getMainProductPrice, getBundleItemPrice, getProductQuantity, getBundleItemIsOriginalPrice, getTaxAndFeeRoundingRemainder, getBundleItemTaxAndFeeRoundingRemainder, getProductDiscountDifference, getBundleItemDiscountDifference } from "./utils";
 import { locales } from "./locales";
 import Decimal from 'decimal.js';
 var defaultStrategyMetadataCustom = {
@@ -465,8 +465,8 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
         // 检查主商品是否适用
         var isMainProductApplicable = applicableProductIds === null || applicableProductIds.includes(product.product_id);
         if (isMainProductApplicable) {
-          // 计算主商品价格（包含加减价子商品）
-          total += getMainProductPrice(product, deductTaxAndFee) * productQuantity;
+          // 计算主商品价格（包含加减价子商品）= 单价 * 数量 + 舍入余数 - 商品差额
+          total += getMainProductPrice(product, deductTaxAndFee) * productQuantity + getTaxAndFeeRoundingRemainder(product, deductTaxAndFee) - getProductDiscountDifference(product);
           count += productQuantity;
         }
 
@@ -478,9 +478,9 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
               // 检查子商品是否适用
               var isBundleItemApplicable = applicableProductIds === null || applicableProductIds.includes(bundleItem.bundle_product_id);
               if (isBundleItemApplicable) {
-                // 计算原价子商品价格
+                // 计算原价子商品价格 = 总价 + 舍入余数 - 商品差额
                 var bundleItemQuantity = bundleItem.num * productQuantity;
-                total += getBundleItemPrice(bundleItem, productQuantity, deductTaxAndFee);
+                total += getBundleItemPrice(bundleItem, productQuantity, deductTaxAndFee) + getBundleItemTaxAndFeeRoundingRemainder(bundleItem, deductTaxAndFee) - getBundleItemDiscountDifference(bundleItem);
                 count += bundleItemQuantity;
               }
             }

package/dist/model/strategy/adapter/walletPass/index.js

@@ -5,7 +5,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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 { getApplicableProductIds, getMainProductPrice, getBundleItemPrice, getProductQuantity, getBundleItemIsOriginalPrice } from "./utils";
+import { getApplicableProductIds, getMainProductPrice, getBundleItemPrice, getProductQuantity, getBundleItemIsOriginalPrice, getTaxAndFeeRoundingRemainder, getBundleItemTaxAndFeeRoundingRemainder, getProductDiscountDifference, getBundleItemDiscountDifference } from "./utils";
 
 /**
  * Wallet Pass 适配器
@@ -149,8 +149,8 @@ var WalletPassAdapter = /*#__PURE__*/function () {
         // 检查主商品是否适用
         var isMainProductApplicable = applicableProductIds === null || applicableProductIds.includes(product.product_id);
         if (isMainProductApplicable) {
-          // 计算主商品价格（包含加减价子商品）
-          total += getMainProductPrice(product, deductTaxAndFee) * productQuantity;
+          // 计算主商品价格（包含加减价子商品）= 单价 * 数量 + 舍入余数 - 商品差额
+          total += getMainProductPrice(product, deductTaxAndFee) * productQuantity + getTaxAndFeeRoundingRemainder(product, deductTaxAndFee) - getProductDiscountDifference(product);
           count += productQuantity;
         }
 
@@ -162,9 +162,9 @@ var WalletPassAdapter = /*#__PURE__*/function () {
               // 检查子商品是否适用
               var isBundleItemApplicable = applicableProductIds === null || applicableProductIds.includes(bundleItem.bundle_product_id);
               if (isBundleItemApplicable) {
-                // 计算原价子商品价格
+                // 计算原价子商品价格 = 总价 + 舍入余数 - 商品差额
                 var bundleItemQuantity = bundleItem.num * productQuantity;
-                total += getBundleItemPrice(bundleItem, productQuantity, deductTaxAndFee);
+                total += getBundleItemPrice(bundleItem, productQuantity, deductTaxAndFee) + getBundleItemTaxAndFeeRoundingRemainder(bundleItem, deductTaxAndFee) - getBundleItemDiscountDifference(bundleItem);
                 count += bundleItemQuantity;
               }
             }

package/dist/model/strategy/adapter/walletPass/type.d.ts

@@ -64,6 +64,8 @@ export interface Product {
         surcharge_rounding_remainder?: number;
         tax_fee_rounding_remainder?: number;
         main_product_selling_price: number;
+        /** 商品折扣差额 */
+        product_discount_difference?: number;
     };
     is_price_include_tax: 0 | 1;
     product_bundle: {
@@ -81,6 +83,7 @@ export interface Product {
             surcharge_fee: number;
             surcharge_rounding_remainder?: number;
             tax_fee_rounding_remainder?: number;
+            product_discount_difference?: number;
         };
     }[];
 }

package/dist/model/strategy/adapter/walletPass/utils.d.ts

@@ -24,18 +24,44 @@ export declare function recalculateVouchers(allVouchers: any[], selectedVouchers
     selectedWithDetails: any[];
 };
 /**
- * 获取主商品价格
+ * 获取税费和附加费的舍入余数
  * @param product 商品
  * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 商品价格
+ * @returns 舍入余数（税费 + 附加费的舍入余数）
+ */
+export declare const getTaxAndFeeRoundingRemainder: (product: Product, isDeductTaxAndFee: boolean) => number;
+/**
+ * 获取主商品的商品差额
+ * @param product 商品
+ * @returns 商品差额（与数量无关，计算总价时需要减去）
+ */
+export declare const getProductDiscountDifference: (product: Product) => number;
+/**
+ * 获取主商品价格（单价，不含舍入余数）
+ * @param product 商品
+ * @param isDeductTaxAndFee 是否抵扣税费与附加费
+ * @returns 商品单价
  */
 export declare const getMainProductPrice: (product: Product, isDeductTaxAndFee: boolean) => number;
 /**
- * 获取套餐子商品价格
+ * 获取套餐子商品税费和附加费的舍入余数
+ * @param bundleItem 套餐子商品
+ * @param isDeductTaxAndFee 是否抵扣税费与附加费
+ * @returns 舍入余数（税费 + 附加费的舍入余数）
+ */
+export declare const getBundleItemTaxAndFeeRoundingRemainder: (bundleItem: any, isDeductTaxAndFee: boolean) => number;
+/**
+ * 获取套餐子商品的商品差额
+ * @param bundleItem 套餐子商品
+ * @returns 商品差额（与数量无关，计算总价时需要减去）
+ */
+export declare const getBundleItemDiscountDifference: (bundleItem: any) => number;
+/**
+ * 获取套餐子商品价格（不含舍入余数）
  * @param bundleItem 套餐子商品
  * @param parentQuantity 父商品数量
  * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 子商品总价格
+ * @returns 子商品总价格（不含舍入余数）
  */
 export declare const getBundleItemPrice: (bundleItem: any, parentQuantity: number, isDeductTaxAndFee: boolean) => number;
 /**

package/dist/model/strategy/adapter/walletPass/utils.js

@@ -798,14 +798,48 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
 }
 
 /**
- * 获取主商品价格
+ * 获取税费和附加费的舍入余数
  * @param product 商品
  * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 商品价格
+ * @returns 舍入余数（税费 + 附加费的舍入余数）
+ */
+export var getTaxAndFeeRoundingRemainder = function getTaxAndFeeRoundingRemainder(product, isDeductTaxAndFee) {
+  var _product$metadata2;
+  if (!isDeductTaxAndFee) {
+    return 0;
+  }
+
+  // 税费舍入余数（如果价格包含税则为0）
+  var taxFeeRoundingRemainder = new Decimal(0);
+  if (product.is_price_include_tax !== 1) {
+    var _product$metadata;
+    taxFeeRoundingRemainder = new Decimal((product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.tax_fee_rounding_remainder) || 0);
+  }
+
+  // 附加费舍入余数
+  var surchargeFeeRoundingRemainder = new Decimal((product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.surcharge_rounding_remainder) || 0);
+  return taxFeeRoundingRemainder.add(surchargeFeeRoundingRemainder).toNumber();
+};
+
+/**
+ * 获取主商品的商品差额
+ * @param product 商品
+ * @returns 商品差额（与数量无关，计算总价时需要减去）
+ */
+export var getProductDiscountDifference = function getProductDiscountDifference(product) {
+  var _product$metadata3;
+  return new Decimal((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.product_discount_difference) || 0).toNumber();
+};
+
+/**
+ * 获取主商品价格（单价，不含舍入余数）
+ * @param product 商品
+ * @param isDeductTaxAndFee 是否抵扣税费与附加费
+ * @returns 商品单价
  */
 export var getMainProductPrice = function getMainProductPrice(product, isDeductTaxAndFee) {
-  var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5;
-  var mainProductPrice = new Decimal((product === null || product === void 0 ? void 0 : product.main_product_selling_price) || ((_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.main_product_selling_price) || 0);
+  var _product$metadata4, _product$metadata5, _product$metadata6;
+  var mainProductPrice = new Decimal((product === null || product === void 0 ? void 0 : product.main_product_selling_price) || ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_selling_price) || 0);
   var _iterator6 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
     _step6;
   try {
@@ -824,14 +858,14 @@ export var getMainProductPrice = function getMainProductPrice(product, isDeductT
   } finally {
     _iterator6.f();
   }
-  var taxFee = new Decimal((product === null || product === void 0 ? void 0 : product.tax_fee) || (product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.main_product_attached_bundle_tax_fee) || 0).add((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.tax_fee_rounding_remainder) || 0);
+  var taxFee = new Decimal((product === null || product === void 0 ? void 0 : product.tax_fee) || (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.main_product_attached_bundle_tax_fee) || 0);
   if (product.is_price_include_tax === 1) {
     taxFee = new Decimal(0);
   }
 
   // 税费
   // 附加费
-  var surchargeFee = new Decimal((product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_attached_bundle_surcharge_fee) || 0).add((product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.surcharge_rounding_remainder) || 0);
+  var surchargeFee = new Decimal((product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.main_product_attached_bundle_surcharge_fee) || 0);
 
   // 税费附加费总额
   var taxAndFeeTotal = taxFee.add(surchargeFee);
@@ -844,11 +878,45 @@ export var getMainProductPrice = function getMainProductPrice(product, isDeductT
 };
 
 /**
- * 获取套餐子商品价格
+ * 获取套餐子商品税费和附加费的舍入余数
+ * @param bundleItem 套餐子商品
+ * @param isDeductTaxAndFee 是否抵扣税费与附加费
+ * @returns 舍入余数（税费 + 附加费的舍入余数）
+ */
+export var getBundleItemTaxAndFeeRoundingRemainder = function getBundleItemTaxAndFeeRoundingRemainder(bundleItem, isDeductTaxAndFee) {
+  var _bundleItem$metadata2;
+  if (!isDeductTaxAndFee) {
+    return 0;
+  }
+
+  // 税费舍入余数（如果价格包含税则为0）
+  var taxFeeRoundingRemainder = new Decimal(0);
+  if (bundleItem.is_price_include_tax !== 1) {
+    var _bundleItem$metadata;
+    taxFeeRoundingRemainder = new Decimal(((_bundleItem$metadata = bundleItem.metadata) === null || _bundleItem$metadata === void 0 ? void 0 : _bundleItem$metadata.tax_fee_rounding_remainder) || 0);
+  }
+
+  // 附加费舍入余数
+  var surchargeFeeRoundingRemainder = new Decimal(((_bundleItem$metadata2 = bundleItem.metadata) === null || _bundleItem$metadata2 === void 0 ? void 0 : _bundleItem$metadata2.surcharge_rounding_remainder) || 0);
+  return taxFeeRoundingRemainder.add(surchargeFeeRoundingRemainder).toNumber();
+};
+
+/**
+ * 获取套餐子商品的商品差额
+ * @param bundleItem 套餐子商品
+ * @returns 商品差额（与数量无关，计算总价时需要减去）
+ */
+export var getBundleItemDiscountDifference = function getBundleItemDiscountDifference(bundleItem) {
+  var _bundleItem$metadata3;
+  return new Decimal(((_bundleItem$metadata3 = bundleItem.metadata) === null || _bundleItem$metadata3 === void 0 ? void 0 : _bundleItem$metadata3.product_discount_difference) || 0).toNumber();
+};
+
+/**
+ * 获取套餐子商品价格（不含舍入余数）
  * @param bundleItem 套餐子商品
  * @param parentQuantity 父商品数量
  * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 子商品总价格
+ * @returns 子商品总价格（不含舍入余数）
  */
 export var getBundleItemPrice = function getBundleItemPrice(bundleItem, parentQuantity, isDeductTaxAndFee) {
   var _bundleItem$bundle_se2;
@@ -858,14 +926,14 @@ export var getBundleItemPrice = function getBundleItemPrice(bundleItem, parentQu
 
   // 根据 deductTaxAndFee 配置决定是否加上税费和附加费
   if (isDeductTaxAndFee) {
-    var _bundleItem$tax_fee, _bundleItem$metadata$, _bundleItem$metadata;
+    var _bundleItem$tax_fee, _bundleItem$metadata$, _bundleItem$metadata4;
     // 税费
     var taxFee = new Decimal((_bundleItem$tax_fee = bundleItem.tax_fee) !== null && _bundleItem$tax_fee !== void 0 ? _bundleItem$tax_fee : 0).times(totalQuantity);
     if (bundleItem.is_price_include_tax === 1) {
       taxFee = new Decimal(0);
     }
     // 附加费
-    var surchargeFee = new Decimal((_bundleItem$metadata$ = (_bundleItem$metadata = bundleItem.metadata) === null || _bundleItem$metadata === void 0 ? void 0 : _bundleItem$metadata.surcharge_fee) !== null && _bundleItem$metadata$ !== void 0 ? _bundleItem$metadata$ : 0).times(totalQuantity);
+    var surchargeFee = new Decimal((_bundleItem$metadata$ = (_bundleItem$metadata4 = bundleItem.metadata) === null || _bundleItem$metadata4 === void 0 ? void 0 : _bundleItem$metadata4.surcharge_fee) !== null && _bundleItem$metadata$ !== void 0 ? _bundleItem$metadata$ : 0).times(totalQuantity);
     bundleItemPrice = bundleItemPrice.add(taxFee).add(surchargeFee);
   }
   return bundleItemPrice.toNumber();
@@ -886,6 +954,11 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
     var unitPriceWithTax = getMainProductPrice(product, true);
     var unitPricePure = getMainProductPrice(product, false);
 
+    // 获取舍入余数（与数量无关，只加一次）
+    var roundingRemainderWithTax = getTaxAndFeeRoundingRemainder(product, true);
+    // 获取商品差额（与数量无关，计算总价时需要减去）
+    var discountDifference = getProductDiscountDifference(product);
+
     // 1. 添加主商品（同时计算含税和不含税两个金额，以及单价和剩余数量）
     expandedProducts.push(_objectSpread(_objectSpread({}, product), {}, {
       is_bundle_item: false,
@@ -895,10 +968,10 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
       unitPricePure: new Decimal(unitPricePure),
       // 剩余可抵扣数量
       remainingQuantity: productQuantity,
-      // 含税费的剩余金额
-      remainingAmountWithTax: new Decimal(unitPriceWithTax).times(productQuantity),
-      // 纯商品金额（不含税费）
-      remainingAmountPure: new Decimal(unitPricePure).times(productQuantity)
+      // 含税费的剩余金额（单价 * 数量 + 舍入余数 - 商品差额）
+      remainingAmountWithTax: new Decimal(unitPriceWithTax).times(productQuantity).add(roundingRemainderWithTax).sub(discountDifference),
+      // 纯商品金额（不含税费，也需要减去商品差额）
+      remainingAmountPure: new Decimal(unitPricePure).times(productQuantity).sub(discountDifference)
     }));
 
     // 2. 添加原价子商品（作为独立商品项）
@@ -910,6 +983,11 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
           var bundleUnitPriceWithTax = new Decimal(getBundleItemPrice(bundleItem, 1, true)).dividedBy(bundleItem.num);
           var bundleUnitPricePure = new Decimal(getBundleItemPrice(bundleItem, 1, false)).dividedBy(bundleItem.num);
 
+          // 获取子商品舍入余数（与数量无关，只加一次）
+          var bundleRoundingRemainder = getBundleItemTaxAndFeeRoundingRemainder(bundleItem, true);
+          // 获取子商品差额（与数量无关，计算总价时需要减去）
+          var bundleDiscountDifference = getBundleItemDiscountDifference(bundleItem);
+
           // 原价子商品作为独立商品
           expandedProducts.push(_objectSpread(_objectSpread({}, bundleItem), {}, {
             product_id: bundleItem.bundle_product_id,
@@ -923,10 +1001,10 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
             unitPricePure: bundleUnitPricePure,
             // 剩余可抵扣数量
             remainingQuantity: bundleQuantity,
-            // 含税费的剩余金额
-            remainingAmountWithTax: new Decimal(getBundleItemPrice(bundleItem, productQuantity, true)),
-            // 纯商品金额（不含税费）
-            remainingAmountPure: new Decimal(getBundleItemPrice(bundleItem, productQuantity, false))
+            // 含税费的剩余金额（总价 + 舍入余数 - 商品差额）
+            remainingAmountWithTax: new Decimal(getBundleItemPrice(bundleItem, productQuantity, true)).add(bundleRoundingRemainder).sub(bundleDiscountDifference),
+            // 纯商品金额（不含税费，也需要减去商品差额）
+            remainingAmountPure: new Decimal(getBundleItemPrice(bundleItem, productQuantity, false)).sub(bundleDiscountDifference)
           }));
         }
       });

package/dist/modules/Summary/utils.js

@@ -738,12 +738,8 @@ var getMainProductTotal = function getMainProductTotal(item) {
       var bundleItem = _step4.value;
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
         var _ref10, _bundleItem$bundle_se2;
-        // 子商品折扣金额
-        var discountAmount = getDiscountAmount(bundleItem.discount_list);
-        // 子商品价格
-        var bundleItemPrice = new Decimal((_ref10 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
-        // todo: 套餐子商品后不需要处理 子商品价格 - 子商品折扣金额
-        var bundleItemTotal = bundleItemPrice.minus(discountAmount);
+        // IMPORTANT: 套餐子商品如果应用了 discount，bundle_selling_price和 price 其实都已经是折后价格了，不需要单独再减一次
+        var bundleItemTotal = new Decimal((_ref10 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
         total = total.add(bundleItemTotal);
       }
     }

package/lib/model/strategy/adapter/walletPass/evaluator.js

@@ -392,7 +392,7 @@ var WalletPassEvaluator = class {
       const productQuantity = (0, import_utils.getProductQuantity)(product);
       const isMainProductApplicable = applicableProductIds === null || applicableProductIds.includes(product.product_id);
       if (isMainProductApplicable) {
-        total += (0, import_utils.getMainProductPrice)(product, deductTaxAndFee) * productQuantity;
+        total += (0, import_utils.getMainProductPrice)(product, deductTaxAndFee) * productQuantity + (0, import_utils.getTaxAndFeeRoundingRemainder)(product, deductTaxAndFee) - (0, import_utils.getProductDiscountDifference)(product);
         count += productQuantity;
       }
       if (product.product_bundle && product.product_bundle.length > 0) {
@@ -405,7 +405,7 @@ var WalletPassEvaluator = class {
                 bundleItem,
                 productQuantity,
                 deductTaxAndFee
-              );
+              ) + (0, import_utils.getBundleItemTaxAndFeeRoundingRemainder)(bundleItem, deductTaxAndFee) - (0, import_utils.getBundleItemDiscountDifference)(bundleItem);
               count += bundleItemQuantity;
             }
           }

package/lib/model/strategy/adapter/walletPass/index.js

@@ -121,7 +121,7 @@ var WalletPassAdapter = class {
       const productQuantity = (0, import_utils.getProductQuantity)(product);
       const isMainProductApplicable = applicableProductIds === null || applicableProductIds.includes(product.product_id);
       if (isMainProductApplicable) {
-        total += (0, import_utils.getMainProductPrice)(product, deductTaxAndFee) * productQuantity;
+        total += (0, import_utils.getMainProductPrice)(product, deductTaxAndFee) * productQuantity + (0, import_utils.getTaxAndFeeRoundingRemainder)(product, deductTaxAndFee) - (0, import_utils.getProductDiscountDifference)(product);
         count += productQuantity;
       }
       if (product.product_bundle && product.product_bundle.length > 0) {
@@ -130,7 +130,7 @@ var WalletPassAdapter = class {
             const isBundleItemApplicable = applicableProductIds === null || applicableProductIds.includes(bundleItem.bundle_product_id);
             if (isBundleItemApplicable) {
               const bundleItemQuantity = bundleItem.num * productQuantity;
-              total += (0, import_utils.getBundleItemPrice)(bundleItem, productQuantity, deductTaxAndFee);
+              total += (0, import_utils.getBundleItemPrice)(bundleItem, productQuantity, deductTaxAndFee) + (0, import_utils.getBundleItemTaxAndFeeRoundingRemainder)(bundleItem, deductTaxAndFee) - (0, import_utils.getBundleItemDiscountDifference)(bundleItem);
               count += bundleItemQuantity;
             }
           }

package/lib/model/strategy/adapter/walletPass/type.d.ts

@@ -64,6 +64,8 @@ export interface Product {
         surcharge_rounding_remainder?: number;
         tax_fee_rounding_remainder?: number;
         main_product_selling_price: number;
+        /** 商品折扣差额 */
+        product_discount_difference?: number;
     };
     is_price_include_tax: 0 | 1;
     product_bundle: {
@@ -81,6 +83,7 @@ export interface Product {
             surcharge_fee: number;
             surcharge_rounding_remainder?: number;
             tax_fee_rounding_remainder?: number;
+            product_discount_difference?: number;
         };
     }[];
 }

package/lib/model/strategy/adapter/walletPass/utils.d.ts

@@ -24,18 +24,44 @@ export declare function recalculateVouchers(allVouchers: any[], selectedVouchers
     selectedWithDetails: any[];
 };
 /**
- * 获取主商品价格
+ * 获取税费和附加费的舍入余数
  * @param product 商品
  * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 商品价格
+ * @returns 舍入余数（税费 + 附加费的舍入余数）
+ */
+export declare const getTaxAndFeeRoundingRemainder: (product: Product, isDeductTaxAndFee: boolean) => number;
+/**
+ * 获取主商品的商品差额
+ * @param product 商品
+ * @returns 商品差额（与数量无关，计算总价时需要减去）
+ */
+export declare const getProductDiscountDifference: (product: Product) => number;
+/**
+ * 获取主商品价格（单价，不含舍入余数）
+ * @param product 商品
+ * @param isDeductTaxAndFee 是否抵扣税费与附加费
+ * @returns 商品单价
  */
 export declare const getMainProductPrice: (product: Product, isDeductTaxAndFee: boolean) => number;
 /**
- * 获取套餐子商品价格
+ * 获取套餐子商品税费和附加费的舍入余数
+ * @param bundleItem 套餐子商品
+ * @param isDeductTaxAndFee 是否抵扣税费与附加费
+ * @returns 舍入余数（税费 + 附加费的舍入余数）
+ */
+export declare const getBundleItemTaxAndFeeRoundingRemainder: (bundleItem: any, isDeductTaxAndFee: boolean) => number;
+/**
+ * 获取套餐子商品的商品差额
+ * @param bundleItem 套餐子商品
+ * @returns 商品差额（与数量无关，计算总价时需要减去）
+ */
+export declare const getBundleItemDiscountDifference: (bundleItem: any) => number;
+/**
+ * 获取套餐子商品价格（不含舍入余数）
  * @param bundleItem 套餐子商品
  * @param parentQuantity 父商品数量
  * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 子商品总价格
+ * @returns 子商品总价格（不含舍入余数）
  */
 export declare const getBundleItemPrice: (bundleItem: any, parentQuantity: number, isDeductTaxAndFee: boolean) => number;
 /**

package/lib/model/strategy/adapter/walletPass/utils.js

@@ -30,13 +30,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   getApplicableProductIds: () => getApplicableProductIds,
+  getBundleItemDiscountDifference: () => getBundleItemDiscountDifference,
   getBundleItemIsDiscountPrice: () => getBundleItemIsDiscountPrice,
   getBundleItemIsMarkupOrDiscountPrice: () => getBundleItemIsMarkupOrDiscountPrice,
   getBundleItemIsMarkupPrice: () => getBundleItemIsMarkupPrice,
   getBundleItemIsOriginalPrice: () => getBundleItemIsOriginalPrice,
   getBundleItemPrice: () => getBundleItemPrice,
+  getBundleItemTaxAndFeeRoundingRemainder: () => getBundleItemTaxAndFeeRoundingRemainder,
   getMainProductPrice: () => getMainProductPrice,
+  getProductDiscountDifference: () => getProductDiscountDifference,
   getProductQuantity: () => getProductQuantity,
+  getTaxAndFeeRoundingRemainder: () => getTaxAndFeeRoundingRemainder,
   processVouchers: () => processVouchers,
   recalculateVouchers: () => recalculateVouchers
 });
@@ -546,8 +550,24 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     selectedWithDetails
   };
 }
+var getTaxAndFeeRoundingRemainder = (product, isDeductTaxAndFee) => {
+  var _a, _b;
+  if (!isDeductTaxAndFee) {
+    return 0;
+  }
+  let taxFeeRoundingRemainder = new import_decimal.default(0);
+  if (product.is_price_include_tax !== 1) {
+    taxFeeRoundingRemainder = new import_decimal.default(((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.tax_fee_rounding_remainder) || 0);
+  }
+  const surchargeFeeRoundingRemainder = new import_decimal.default(((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.surcharge_rounding_remainder) || 0);
+  return taxFeeRoundingRemainder.add(surchargeFeeRoundingRemainder).toNumber();
+};
+var getProductDiscountDifference = (product) => {
+  var _a;
+  return new import_decimal.default(((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.product_discount_difference) || 0).toNumber();
+};
 var getMainProductPrice = (product, isDeductTaxAndFee) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c;
   let mainProductPrice = new import_decimal.default((product == null ? void 0 : product.main_product_selling_price) || ((_a = product.metadata) == null ? void 0 : _a.main_product_selling_price) || 0);
   for (let bundleItem of (product == null ? void 0 : product.product_bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
@@ -555,17 +575,33 @@ var getMainProductPrice = (product, isDeductTaxAndFee) => {
       mainProductPrice = mainProductPrice.add(bundleItemPrice.times(bundleItem.num));
     }
   }
-  let taxFee = new import_decimal.default((product == null ? void 0 : product.tax_fee) || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.main_product_attached_bundle_tax_fee) || 0).add(((_c = product == null ? void 0 : product.metadata) == null ? void 0 : _c.tax_fee_rounding_remainder) || 0);
+  let taxFee = new import_decimal.default((product == null ? void 0 : product.tax_fee) || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.main_product_attached_bundle_tax_fee) || 0);
   if (product.is_price_include_tax === 1) {
     taxFee = new import_decimal.default(0);
   }
-  const surchargeFee = new import_decimal.default(((_d = product == null ? void 0 : product.metadata) == null ? void 0 : _d.main_product_attached_bundle_surcharge_fee) || 0).add(((_e = product == null ? void 0 : product.metadata) == null ? void 0 : _e.surcharge_rounding_remainder) || 0);
+  const surchargeFee = new import_decimal.default(((_c = product == null ? void 0 : product.metadata) == null ? void 0 : _c.main_product_attached_bundle_surcharge_fee) || 0);
   const taxAndFeeTotal = taxFee.add(surchargeFee);
   if (isDeductTaxAndFee) {
     mainProductPrice = mainProductPrice.add(taxAndFeeTotal);
   }
   return mainProductPrice.toNumber();
 };
+var getBundleItemTaxAndFeeRoundingRemainder = (bundleItem, isDeductTaxAndFee) => {
+  var _a, _b;
+  if (!isDeductTaxAndFee) {
+    return 0;
+  }
+  let taxFeeRoundingRemainder = new import_decimal.default(0);
+  if (bundleItem.is_price_include_tax !== 1) {
+    taxFeeRoundingRemainder = new import_decimal.default(((_a = bundleItem.metadata) == null ? void 0 : _a.tax_fee_rounding_remainder) || 0);
+  }
+  const surchargeFeeRoundingRemainder = new import_decimal.default(((_b = bundleItem.metadata) == null ? void 0 : _b.surcharge_rounding_remainder) || 0);
+  return taxFeeRoundingRemainder.add(surchargeFeeRoundingRemainder).toNumber();
+};
+var getBundleItemDiscountDifference = (bundleItem) => {
+  var _a;
+  return new import_decimal.default(((_a = bundleItem.metadata) == null ? void 0 : _a.product_discount_difference) || 0).toNumber();
+};
 var getBundleItemPrice = (bundleItem, parentQuantity, isDeductTaxAndFee) => {
   var _a;
   const totalQuantity = bundleItem.num * parentQuantity;
@@ -586,6 +622,8 @@ var expandProductsWithBundleItems = (products, deductTaxAndFee) => {
     const productQuantity = getProductQuantity(product);
     const unitPriceWithTax = getMainProductPrice(product, true);
     const unitPricePure = getMainProductPrice(product, false);
+    const roundingRemainderWithTax = getTaxAndFeeRoundingRemainder(product, true);
+    const discountDifference = getProductDiscountDifference(product);
     expandedProducts.push({
       ...product,
       is_bundle_item: false,
@@ -595,10 +633,10 @@ var expandProductsWithBundleItems = (products, deductTaxAndFee) => {
       unitPricePure: new import_decimal.default(unitPricePure),
       // 剩余可抵扣数量
       remainingQuantity: productQuantity,
-      // 含税费的剩余金额
-      remainingAmountWithTax: new import_decimal.default(unitPriceWithTax).times(productQuantity),
-      // 纯商品金额（不含税费）
-      remainingAmountPure: new import_decimal.default(unitPricePure).times(productQuantity)
+      // 含税费的剩余金额（单价 * 数量 + 舍入余数 - 商品差额）
+      remainingAmountWithTax: new import_decimal.default(unitPriceWithTax).times(productQuantity).add(roundingRemainderWithTax).sub(discountDifference),
+      // 纯商品金额（不含税费，也需要减去商品差额）
+      remainingAmountPure: new import_decimal.default(unitPricePure).times(productQuantity).sub(discountDifference)
     });
     if (product.product_bundle && product.product_bundle.length > 0) {
       product.product_bundle.forEach((bundleItem) => {
@@ -606,6 +644,8 @@ var expandProductsWithBundleItems = (products, deductTaxAndFee) => {
           const bundleQuantity = bundleItem.num * productQuantity;
           const bundleUnitPriceWithTax = new import_decimal.default(getBundleItemPrice(bundleItem, 1, true)).dividedBy(bundleItem.num);
           const bundleUnitPricePure = new import_decimal.default(getBundleItemPrice(bundleItem, 1, false)).dividedBy(bundleItem.num);
+          const bundleRoundingRemainder = getBundleItemTaxAndFeeRoundingRemainder(bundleItem, true);
+          const bundleDiscountDifference = getBundleItemDiscountDifference(bundleItem);
           expandedProducts.push({
             ...bundleItem,
             product_id: bundleItem.bundle_product_id,
@@ -619,10 +659,10 @@ var expandProductsWithBundleItems = (products, deductTaxAndFee) => {
             unitPricePure: bundleUnitPricePure,
             // 剩余可抵扣数量
             remainingQuantity: bundleQuantity,
-            // 含税费的剩余金额
-            remainingAmountWithTax: new import_decimal.default(getBundleItemPrice(bundleItem, productQuantity, true)),
-            // 纯商品金额（不含税费）
-            remainingAmountPure: new import_decimal.default(getBundleItemPrice(bundleItem, productQuantity, false))
+            // 含税费的剩余金额（总价 + 舍入余数 - 商品差额）
+            remainingAmountWithTax: new import_decimal.default(getBundleItemPrice(bundleItem, productQuantity, true)).add(bundleRoundingRemainder).sub(bundleDiscountDifference),
+            // 纯商品金额（不含税费，也需要减去商品差额）
+            remainingAmountPure: new import_decimal.default(getBundleItemPrice(bundleItem, productQuantity, false)).sub(bundleDiscountDifference)
           });
         }
       });
@@ -648,13 +688,17 @@ var getBundleItemIsMarkupOrDiscountPrice = (item) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getApplicableProductIds,
+  getBundleItemDiscountDifference,
   getBundleItemIsDiscountPrice,
   getBundleItemIsMarkupOrDiscountPrice,
   getBundleItemIsMarkupPrice,
   getBundleItemIsOriginalPrice,
   getBundleItemPrice,
+  getBundleItemTaxAndFeeRoundingRemainder,
   getMainProductPrice,
+  getProductDiscountDifference,
   getProductQuantity,
+  getTaxAndFeeRoundingRemainder,
   processVouchers,
   recalculateVouchers
 });

package/lib/modules/Summary/utils.js

@@ -458,9 +458,7 @@ var getMainProductTotal = (item) => {
   }
   for (let bundleItem of (item == null ? void 0 : item.bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-      const discountAmount = getDiscountAmount(bundleItem.discount_list);
-      const bundleItemPrice = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
-      const bundleItemTotal = bundleItemPrice.minus(discountAmount);
+      const bundleItemTotal = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
       total = total.add(bundleItemTotal);
     }
   }

package/package.json

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