@pisell/pisellos 1.0.124 → 1.0.125

package/dist/modules/Summary/utils.js

@@ -193,6 +193,15 @@ export var getTax = function getTax(_ref, options) {
     tax: totalTax.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber()
   };
 };
+function getDiscountedTaxableBase(input) {
+  var basePrice = input.basePrice,
+    discount = input.discount,
+    surchargeFee = input.surchargeFee;
+  if (surchargeFee.lte(0) && basePrice.lte(0)) return new Decimal(0);
+  var discountedBase = basePrice.minus(discount);
+  if (discountedBase.lte(0)) return surchargeFee;
+  return discountedBase.plus(surchargeFee);
+}
 
 /**
  * 处理商品税费计算（折扣前后）
@@ -237,8 +246,13 @@ var processItemsTax = function processItemsTax(items, _ref2, options) {
       })) || 0);
 
       // 计算原始税费（折扣前）- 单个商品（精确值）
+      var originalTaxableBase = getDiscountedTaxableBase({
+        basePrice: mainProductPrice,
+        discount: new Decimal(0),
+        surchargeFee: new Decimal((item === null || item === void 0 ? void 0 : item.surcharge_fee) || 0)
+      });
       var originalTaxPerItemPrecise = getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
-        total: mainProductPrice.add((item === null || item === void 0 ? void 0 : item.surcharge_fee) || 0).toNumber(),
+        total: originalTaxableBase.toNumber(),
         quantity: 1
       }), {
         bookingDetail: bookingDetail,
@@ -259,7 +273,11 @@ var processItemsTax = function processItemsTax(items, _ref2, options) {
       if (unitPrice.greaterThan(0)) {
         mainItemDiscount = mainProductPrice.dividedBy(productExpectAmount).times(shopDiscount);
       }
-      var mainItemDiscountedUnitPrice = mainProductPrice.minus(mainItemDiscount).add((item === null || item === void 0 ? void 0 : item.surcharge_fee) || 0);
+      var mainItemDiscountedUnitPrice = getDiscountedTaxableBase({
+        basePrice: mainProductPrice,
+        discount: mainItemDiscount,
+        surchargeFee: new Decimal((item === null || item === void 0 ? void 0 : item.surcharge_fee) || 0)
+      });
 
       // 计算折后税费（折扣后）- 主商品的税费（精确值）
       var maxDiscountedTaxPerItemPrecise = getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
@@ -299,12 +317,14 @@ var processItemsTax = function processItemsTax(items, _ref2, options) {
             var atItem = _step2.value;
             // 计算单件加时商品折扣后价格
             var _originTotal = new Decimal(atItem.selling_price || atItem.price || 0);
-            var _discountedTotal = _originTotal;
-            if (productExpectAmount > 0) {
-              _discountedTotal = _originTotal.minus(_originTotal.dividedBy(productExpectAmount).times(shopDiscount));
-            }
+            var addTimeDiscount = productExpectAmount > 0 ? _originTotal.dividedBy(productExpectAmount).times(shopDiscount) : new Decimal(0);
+            var _discountedTotal = getDiscountedTaxableBase({
+              basePrice: _originTotal,
+              discount: addTimeDiscount,
+              surchargeFee: new Decimal((atItem === null || atItem === void 0 ? void 0 : atItem.surcharge_fee) || 0)
+            });
             var addTimeTaxPerItemPrecise = getProductItemTax(_objectSpread(_objectSpread({}, atItem), {}, {
-              total: _discountedTotal.add((atItem === null || atItem === void 0 ? void 0 : atItem.surcharge_fee) || 0).toNumber(),
+              total: _discountedTotal.toNumber(),
               quantity: atItem.product_quantity || atItem.num || 1
             }), {
               bookingDetail: bookingDetail,
@@ -353,8 +373,13 @@ var processItemsTax = function processItemsTax(items, _ref2, options) {
               var bundleUnitPrice = new Decimal((_ref3 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
 
               // 计算原始税费（折扣前）- 单个商品（精确值）
+              var bundleOriginalTaxableBase = getDiscountedTaxableBase({
+                basePrice: bundleUnitPrice,
+                discount: new Decimal(0),
+                surchargeFee: new Decimal((bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.surcharge_fee) || 0)
+              });
               var bundleOriginalTaxPerItemPrecise = getProductItemTax(_objectSpread(_objectSpread({}, bundleItem), {}, {
-                total: bundleUnitPrice.add((bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.surcharge_fee) || 0).toNumber(),
+                total: bundleOriginalTaxableBase.toNumber(),
                 quantity: 1
               }), {
                 bookingDetail: bookingDetail,
@@ -371,7 +396,11 @@ var processItemsTax = function processItemsTax(items, _ref2, options) {
               }
 
               // bundle商品折后单价
-              var bundleDiscountedUnitPrice = bundleUnitPrice.minus(bundleItemDiscount).add((bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.surcharge_fee) || 0);
+              var bundleDiscountedUnitPrice = getDiscountedTaxableBase({
+                basePrice: bundleUnitPrice,
+                discount: bundleItemDiscount,
+                surchargeFee: new Decimal((bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.surcharge_fee) || 0)
+              });
 
               // 计算折后税费（折扣后）- 单个商品（精确值）
               var bundleDiscountedTaxPerItemPrecise = getProductItemTax(_objectSpread(_objectSpread({}, bundleItem), {}, {
@@ -723,7 +752,6 @@ var getMainProductTotal = function getMainProductTotal(item) {
   }
   return total.toNumber();
 };
-
 /**
  * 判断商品是否符合附加费条件
  */

package/dist/solution/BookingTicket/index.d.ts

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

package/lib/modules/Summary/utils.js

@@ -134,6 +134,15 @@ var getTax = ({ service, addons, bookingDetail, bookingId }, options) => {
     tax: totalTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber()
   };
 };
+function getDiscountedTaxableBase(input) {
+  const { basePrice, discount, surchargeFee } = input;
+  if (surchargeFee.lte(0) && basePrice.lte(0))
+    return new import_decimal.default(0);
+  const discountedBase = basePrice.minus(discount);
+  if (discountedBase.lte(0))
+    return surchargeFee;
+  return discountedBase.plus(surchargeFee);
+}
 var processItemsTax = (items, { bookingDetail, bookingId }, options) => {
   const { tax_rate, is_price_include_tax, computed } = options;
   const { shopDiscount, productExpectAmount } = computed;
@@ -150,10 +159,15 @@ var processItemsTax = (items, { bookingDetail, bookingId }, options) => {
       option: (item == null ? void 0 : item.option) || (item == null ? void 0 : item.options) || [],
       bundle: (item == null ? void 0 : item.bundle) || (item == null ? void 0 : item.bundles) || []
     }) || 0);
+    const originalTaxableBase = getDiscountedTaxableBase({
+      basePrice: mainProductPrice,
+      discount: new import_decimal.default(0),
+      surchargeFee: new import_decimal.default((item == null ? void 0 : item.surcharge_fee) || 0)
+    });
     let originalTaxPerItemPrecise = getProductItemTax(
       {
         ...item,
-        total: mainProductPrice.add((item == null ? void 0 : item.surcharge_fee) || 0).toNumber(),
+        total: originalTaxableBase.toNumber(),
         quantity: 1
       },
       { bookingDetail, bookingId },
@@ -167,7 +181,11 @@ var processItemsTax = (items, { bookingDetail, bookingId }, options) => {
     if (unitPrice.greaterThan(0)) {
       mainItemDiscount = mainProductPrice.dividedBy(productExpectAmount).times(shopDiscount);
     }
-    const mainItemDiscountedUnitPrice = mainProductPrice.minus(mainItemDiscount).add((item == null ? void 0 : item.surcharge_fee) || 0);
+    const mainItemDiscountedUnitPrice = getDiscountedTaxableBase({
+      basePrice: mainProductPrice,
+      discount: mainItemDiscount,
+      surchargeFee: new import_decimal.default((item == null ? void 0 : item.surcharge_fee) || 0)
+    });
     const maxDiscountedTaxPerItemPrecise = getProductItemTax(
       {
         ...item,
@@ -190,16 +208,16 @@ var processItemsTax = (items, { bookingDetail, bookingId }, options) => {
         const _originTotal = new import_decimal.default(
           atItem.selling_price || atItem.price || 0
         );
-        let _discountedTotal = _originTotal;
-        if (productExpectAmount > 0) {
-          _discountedTotal = _originTotal.minus(
-            _originTotal.dividedBy(productExpectAmount).times(shopDiscount)
-          );
-        }
+        const addTimeDiscount = productExpectAmount > 0 ? _originTotal.dividedBy(productExpectAmount).times(shopDiscount) : new import_decimal.default(0);
+        const _discountedTotal = getDiscountedTaxableBase({
+          basePrice: _originTotal,
+          discount: addTimeDiscount,
+          surchargeFee: new import_decimal.default((atItem == null ? void 0 : atItem.surcharge_fee) || 0)
+        });
         const addTimeTaxPerItemPrecise = getProductItemTax(
           {
             ...atItem,
-            total: _discountedTotal.add((atItem == null ? void 0 : atItem.surcharge_fee) || 0).toNumber(),
+            total: _discountedTotal.toNumber(),
             quantity: atItem.product_quantity || atItem.num || 1
           },
           { bookingDetail, bookingId },
@@ -225,10 +243,15 @@ var processItemsTax = (items, { bookingDetail, bookingId }, options) => {
           const bundleUnitPrice = new import_decimal.default(
             bundleItem.bundle_selling_price ?? bundleItem.price ?? 0
           );
+          const bundleOriginalTaxableBase = getDiscountedTaxableBase({
+            basePrice: bundleUnitPrice,
+            discount: new import_decimal.default(0),
+            surchargeFee: new import_decimal.default((bundleItem == null ? void 0 : bundleItem.surcharge_fee) || 0)
+          });
           const bundleOriginalTaxPerItemPrecise = getProductItemTax(
             {
               ...bundleItem,
-              total: bundleUnitPrice.add((bundleItem == null ? void 0 : bundleItem.surcharge_fee) || 0).toNumber(),
+              total: bundleOriginalTaxableBase.toNumber(),
               quantity: 1
             },
             { bookingDetail, bookingId },
@@ -238,7 +261,11 @@ var processItemsTax = (items, { bookingDetail, bookingId }, options) => {
           if (productExpectAmount > 0) {
             bundleItemDiscount = bundleUnitPrice.dividedBy(productExpectAmount).times(shopDiscount);
           }
-          const bundleDiscountedUnitPrice = bundleUnitPrice.minus(bundleItemDiscount).add((bundleItem == null ? void 0 : bundleItem.surcharge_fee) || 0);
+          const bundleDiscountedUnitPrice = getDiscountedTaxableBase({
+            basePrice: bundleUnitPrice,
+            discount: bundleItemDiscount,
+            surchargeFee: new import_decimal.default((bundleItem == null ? void 0 : bundleItem.surcharge_fee) || 0)
+          });
           const bundleDiscountedTaxPerItemPrecise = getProductItemTax(
             {
               ...bundleItem,

package/lib/solution/BookingTicket/index.d.ts

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

package/package.json

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