@pisell/pisellos 1.0.120 → 1.0.122

package/dist/modules/Summary/utils.js

@@ -473,14 +473,18 @@ var processItemsTax = function processItemsTax(items, _ref2, options) {
  * @returns 精确的税费值（Decimal类型）
  */
 var getProductItemTax = function getProductItemTax(item, state, options) {
-  var _bookingDetail$tax_ra, _ref4, _bookingDetail$is_pri;
+  var _ref4, _item$quantity, _bookingDetail$tax_ra, _ref5, _bookingDetail$is_pri;
   var bookingDetail = state.bookingDetail;
   var tax_rate = options.tax_rate,
     is_price_include_tax = options.is_price_include_tax;
 
   // 折扣后的金额 = 商品金额 - 商品折扣
   var productDiscountPrice = new Decimal(item.total || 0);
-  var quantity = new Decimal(item.num || 1);
+  /**
+   * 注意：该函数被多处以“单件税费”方式调用（调用方会显式传入 quantity: 1），
+   * 因此这里必须优先使用 `item.quantity`，否则会出现数量被重复相乘（外层再乘一次 num）的情况。
+   */
+  var quantity = new Decimal((_ref4 = (_item$quantity = item.quantity) !== null && _item$quantity !== void 0 ? _item$quantity : item.num) !== null && _ref4 !== void 0 ? _ref4 : 1);
 
   // 如果商品金额小于或等于0，不计算税费
   if (productDiscountPrice.lte(0)) {
@@ -490,7 +494,7 @@ var getProductItemTax = function getProductItemTax(item, state, options) {
   // 优先从 bookingDetail 取税率和是否含税设置，取不到则从 options 中取（兼容新增模式）
   // 注意：bookingDetail中的tax_rate不需要除以100，options 中的tax_rate需要除以100
   var currentTaxRate = new Decimal((_bookingDetail$tax_ra = bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.tax_rate) !== null && _bookingDetail$tax_ra !== void 0 ? _bookingDetail$tax_ra : tax_rate ? tax_rate / 100 : 0);
-  var currentIsPriceIncludeTax = (_ref4 = (_bookingDetail$is_pri = bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.is_price_include_tax) !== null && _bookingDetail$is_pri !== void 0 ? _bookingDetail$is_pri : is_price_include_tax) !== null && _ref4 !== void 0 ? _ref4 : 0;
+  var currentIsPriceIncludeTax = (_ref5 = (_bookingDetail$is_pri = bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.is_price_include_tax) !== null && _bookingDetail$is_pri !== void 0 ? _bookingDetail$is_pri : is_price_include_tax) !== null && _ref5 !== void 0 ? _ref5 : 0;
   var singleItemTax = new Decimal(0);
 
   // 计算单个商品税费, 一次性商品 is_charge_tax 可能为空
@@ -566,9 +570,9 @@ export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
   if (!(items !== null && items !== void 0 && items.length)) {
     return '0.00';
   }
-  var _ref5 = shopInfo || {},
-    is_price_include_tax = _ref5.is_price_include_tax,
-    tax_rate = _ref5.tax_rate;
+  var _ref6 = shopInfo || {},
+    is_price_include_tax = _ref6.is_price_include_tax,
+    tax_rate = _ref6.tax_rate;
   var totalTaxFee = items.reduce(function (sum, item) {
     var cartItemTotalPrice = new Decimal(item.summaryTotal || 0);
     var taxRate = new Decimal(tax_rate || 0).div(100);
@@ -630,9 +634,9 @@ export var calculateDeposit = function calculateDeposit(items) {
  * @param options.isEdit 是否处于“编辑中”。`false` 时会优先走后端金额直取逻辑（若存在）
  * @returns 订单附加费金额（number，金额单位与商品价格一致）
  */
-export var getSurchargeAmount = function getSurchargeAmount(_ref6, surcharge, options) {
-  var bookingDetail = _ref6.bookingDetail,
-    bookingId = _ref6.bookingId;
+export var getSurchargeAmount = function getSurchargeAmount(_ref7, surcharge, options) {
+  var bookingDetail = _ref7.bookingDetail,
+    bookingId = _ref7.bookingId;
   var isEdit = options.isEdit;
   // 订单未变更过
   if (!isEdit) {
@@ -677,9 +681,9 @@ var getDiscountAmount = function getDiscountAmount(discounts) {
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
  */
 var getMainProductTotal = function getMainProductTotal(item) {
-  var _ref7, _ref8, _item$main_product_se, _item$metadata, _item$_origin3, _item$_originData$pro;
-  var total = new Decimal((_ref7 = (_ref8 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref8 !== void 0 ? _ref8 : item.price) !== null && _ref7 !== void 0 ? _ref7 : 0);
-  var discount = (item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.discount_list) || (item === null || item === void 0 || (_item$_originData$pro = item._originData.product) === null || _item$_originData$pro === void 0 || (_item$_originData$pro = _item$_originData$pro.discount_list) === null || _item$_originData$pro === void 0 ? void 0 : _item$_originData$pro.filter(function (item) {
+  var _ref8, _ref9, _item$main_product_se, _item$metadata, _item$_origin3, _item$_originData;
+  var total = new Decimal((_ref8 = (_ref9 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref9 !== void 0 ? _ref9 : item.price) !== null && _ref8 !== void 0 ? _ref8 : 0);
+  var discount = (item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.discount_list) || (item === null || item === void 0 || (_item$_originData = item._originData) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.product) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.discount_list) === null || _item$_originData === void 0 ? void 0 : _item$_originData.filter(function (item) {
     var _item$metadata2;
     return !(item !== null && item !== void 0 && (_item$metadata2 = item.metadata) !== null && _item$metadata2 !== void 0 && _item$metadata2.custom_product_bundle_map_id);
   })) || [];
@@ -698,11 +702,11 @@ var getMainProductTotal = function getMainProductTotal(item) {
     for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
       var bundleItem = _step4.value;
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-        var _ref9, _bundleItem$bundle_se2;
+        var _ref10, _bundleItem$bundle_se2;
         // 子商品折扣金额
         var discountAmount = getDiscountAmount(bundleItem.discount_list);
         // 子商品价格
-        var bundleItemPrice = new Decimal((_ref9 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref9 !== void 0 ? _ref9 : 0);
+        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);
         total = total.add(bundleItemTotal);
@@ -825,11 +829,11 @@ var isProductMatchSurchargeCondition = function isProductMatchSurchargeCondition
  * @param options.scheduleById schedule 映射表：`{ [scheduleId]: schedule }`（用于根据配置的 `available_schedule_ids` 做日程匹配）
  * @returns 附加费列表（仅返回金额 > 0 的项）
  */
-export var getSurcharge = function getSurcharge(_ref10, options) {
-  var service = _ref10.service,
-    addons = _ref10.addons,
-    bookingDetail = _ref10.bookingDetail,
-    bookingId = _ref10.bookingId;
+export var getSurcharge = function getSurcharge(_ref11, options) {
+  var service = _ref11.service,
+    addons = _ref11.addons,
+    bookingDetail = _ref11.bookingDetail,
+    bookingId = _ref11.bookingId;
   var isEdit = options.isEdit,
     isInScheduleByDate = options.isInScheduleByDate,
     surcharge_list = options.surcharge_list,
@@ -941,11 +945,11 @@ export var getSurcharge = function getSurcharge(_ref10, options) {
                 scheduleById: scheduleById || {},
                 isInScheduleByDate: isInScheduleByDate
               })) {
-                var _ref11, _bundleItem$bundle_se3;
+                var _ref12, _bundleItem$bundle_se3;
                 var _mainQuantity = item.num || 1;
                 matchedItems.push({
                   isMain: false,
-                  total: Number((_ref11 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref11 !== void 0 ? _ref11 : 0),
+                  total: Number((_ref12 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref12 !== void 0 ? _ref12 : 0),
                   quantity: bundleItem.num || bundleItem.quantity || 1,
                   item: bundleItem,
                   mainQuantity: _mainQuantity // 子商品的mainQuantity是所属主商品的quantity
@@ -1159,9 +1163,9 @@ export var getSurcharge = function getSurcharge(_ref10, options) {
   }
   return surchargeWithAmount;
 };
-function resetItemsSurchargeSideEffects(_ref12) {
-  var service = _ref12.service,
-    addons = _ref12.addons;
+function resetItemsSurchargeSideEffects(_ref13) {
+  var service = _ref13.service,
+    addons = _ref13.addons;
   var resetItem = function resetItem(item) {
     if (!item) return;
     item.surcharge_fee = 0;

package/lib/modules/Summary/utils.js

@@ -293,7 +293,7 @@ var getProductItemTax = (item, state, options) => {
   const { bookingDetail } = state;
   const { tax_rate, is_price_include_tax } = options;
   const productDiscountPrice = new import_decimal.default(item.total || 0);
-  const quantity = new import_decimal.default(item.num || 1);
+  const quantity = new import_decimal.default(item.quantity ?? item.num ?? 1);
   if (productDiscountPrice.lte(0)) {
     return new import_decimal.default(0);
   }
@@ -408,9 +408,9 @@ var getDiscountAmount = (discounts) => {
   }, new import_decimal.default(0)).toNumber();
 };
 var getMainProductTotal = (item) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   let total = new import_decimal.default((item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? item.price ?? 0);
-  const discount = ((_c = (_b = item == null ? void 0 : item._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_e = (_d = item == null ? void 0 : item._originData.product) == null ? void 0 : _d.discount_list) == null ? void 0 : _e.filter((item2) => {
+  const discount = ((_c = (_b = item == null ? void 0 : item._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_f = (_e = (_d = item == null ? void 0 : item._originData) == null ? void 0 : _d.product) == null ? void 0 : _e.discount_list) == null ? void 0 : _f.filter((item2) => {
     var _a2;
     return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
   })) || [];

package/package.json

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