@pisell/pisellos 0.0.404 → 0.0.406

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

@@ -315,7 +315,8 @@ export var formatBundle = function formatBundle(bundle) {
       options: formatOptions(item === null || item === void 0 ? void 0 : item.option),
       _bundle_product_id: item._bundle_product_id,
       discount_list: item.discount_list,
-      originBundleItem: item.originBundleItem || item
+      originBundleItem: item.originBundleItem || item,
+      is_charge_tax: item === null || item === void 0 ? void 0 : item.is_charge_tax
     };
   });
 };

package/dist/modules/Summary/index.js

@@ -15,9 +15,10 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 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 Decimal from 'decimal.js';
 import { BaseModule } from "../BaseModule";
 import { ScheduleModule } from "../Schedule";
-import { calculatePriceDetails, getSurcharge, getTax } from "./utils";
+import { calculatePriceDetails, getSurcharge, getSurchargeAmount, getTax } from "./utils";
 export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(SummaryModule, _BaseModule);
   var _super = _createSuper(SummaryModule);
@@ -186,8 +187,8 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSurchargeforUtils",
     value: function getSurchargeforUtils(items) {
-      var surchargeList = this.store.surchargeList;
-      var surchargeAmount = getSurcharge({
+      // const surchargeList = this.store.surchargeList;
+      var surchargeList = getSurcharge({
         service: items,
         addons: [],
         bookingDetail: null,
@@ -195,12 +196,18 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
       }, {
         isEdit: false,
         isInScheduleByDate: ScheduleModule.isInScheduleByDate,
-        surcharge_list: surchargeList,
+        surcharge_list: this.store.surchargeList,
         scheduleById: {}
       });
+      var surchargeAmount = new Decimal(getSurchargeAmount({
+        bookingDetail: null,
+        bookingId: undefined
+      }, surchargeList, {
+        isEdit: false
+      }));
       return {
         surchargeList: surchargeList,
-        surchargeAmount: surchargeAmount
+        surchargeAmount: surchargeAmount.toFixed(2)
       };
     }
   }]);

package/dist/modules/Summary/utils.js

@@ -55,10 +55,10 @@ export var calculatePriceDetails = function calculatePriceDetails(shopInfo, item
     }),
     tax = _getTax.tax,
     originTax = _getTax.originTax;
-  var total = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subtotal.plus(surchargeAmount) : subtotal.plus(totalTaxFee).plus(surchargeAmount);
+  var total = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subtotal.plus(surchargeAmount) : subtotal.plus(tax).plus(surchargeAmount);
 
   // 计算总价 不包含折扣卡商品券折扣信息价格
-  var originTotal = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subOriginTotal : subOriginTotal.plus(totalTaxFee);
+  var originTotal = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subOriginTotal.plus(surchargeAmount) : subOriginTotal.plus(totalTaxFee).plus(surchargeAmount);
 
   // 计算定金
   var deposit = calculateDeposit(items);
@@ -328,6 +328,7 @@ var processItemsTax = function processItemsTax(items, _ref2, options) {
       var bundlePreciseTax = new Decimal(0);
       var bundleRoundedOriginTax = new Decimal(0);
       var bundleRoundedTax = new Decimal(0);
+      debugger;
       if (Array.isArray(item === null || item === void 0 ? void 0 : item.bundle)) {
         var _iterator3 = _createForOfIteratorHelper(item === null || item === void 0 ? void 0 : item.bundle),
           _step3;
@@ -847,6 +848,14 @@ export var getSurcharge = function getSurcharge(_ref10, options) {
     }
     return [];
   }
+
+  // 用于“计算总价”的场景：每次调用都应重新计算（避免重复调用导致 surcharge_fee 累加）
+  // 注意：同一次调用内仍会在多条 surcharge 配置之间累加
+  resetItemsSurchargeSideEffects({
+    service: service,
+    addons: addons
+  });
+
   // 无附加费规则
   if (!Array.isArray(surcharge_list) || !(surcharge_list !== null && surcharge_list !== void 0 && surcharge_list.length)) return [];
 
@@ -1132,4 +1141,66 @@ export var getSurcharge = function getSurcharge(_ref10, options) {
     });
   }
   return surchargeWithAmount;
-};
+};
+function resetItemsSurchargeSideEffects(_ref12) {
+  var service = _ref12.service,
+    addons = _ref12.addons;
+  var resetItem = function resetItem(item) {
+    if (!item) return;
+    item.surcharge_fee = 0;
+    item.surcharge_rounding_remainder = 0;
+    item.relation_surcharge_ids = [];
+  };
+  if (Array.isArray(service)) {
+    var _iterator10 = _createForOfIteratorHelper(service),
+      _step10;
+    try {
+      for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+        var item = _step10.value;
+        resetItem(item);
+        var _iterator11 = _createForOfIteratorHelper((item === null || item === void 0 ? void 0 : item.bundle) || []),
+          _step11;
+        try {
+          for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+            var bundleItem = _step11.value;
+            resetItem(bundleItem);
+          }
+        } catch (err) {
+          _iterator11.e(err);
+        } finally {
+          _iterator11.f();
+        }
+        var _iterator12 = _createForOfIteratorHelper((item === null || item === void 0 ? void 0 : item.relation_details) || []),
+          _step12;
+        try {
+          for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+            var relationDetail = _step12.value;
+            resetItem(relationDetail);
+          }
+        } catch (err) {
+          _iterator12.e(err);
+        } finally {
+          _iterator12.f();
+        }
+      }
+    } catch (err) {
+      _iterator10.e(err);
+    } finally {
+      _iterator10.f();
+    }
+  }
+  if (Array.isArray(addons === null || addons === void 0 ? void 0 : addons.value)) {
+    var _iterator13 = _createForOfIteratorHelper(addons.value),
+      _step13;
+    try {
+      for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+        var _item3 = _step13.value;
+        resetItem(_item3);
+      }
+    } catch (err) {
+      _iterator13.e(err);
+    } finally {
+      _iterator13.f();
+    }
+  }
+}

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

@@ -280,7 +280,8 @@ var formatBundle = (bundle) => {
       options: formatOptions(item == null ? void 0 : item.option),
       _bundle_product_id: item._bundle_product_id,
       discount_list: item.discount_list,
-      originBundleItem: item.originBundleItem || item
+      originBundleItem: item.originBundleItem || item,
+      is_charge_tax: item == null ? void 0 : item.is_charge_tax
     };
   });
 };

package/lib/modules/Summary/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)
@@ -14,6 +16,14 @@ 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/modules/Summary/index.ts
@@ -22,6 +32,7 @@ __export(Summary_exports, {
   SummaryModule: () => SummaryModule
 });
 module.exports = __toCommonJS(Summary_exports);
+var import_decimal = __toESM(require("decimal.js"));
 var import_BaseModule = require("../BaseModule");
 var import_Schedule = require("../Schedule");
 var import_utils = require("./utils");
@@ -100,11 +111,11 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     });
   }
   getSurchargeforUtils(items) {
-    const surchargeList = this.store.surchargeList;
-    const surchargeAmount = (0, import_utils.getSurcharge)({ service: items, addons: [], bookingDetail: null, bookingId: void 0 }, { isEdit: false, isInScheduleByDate: import_Schedule.ScheduleModule.isInScheduleByDate, surcharge_list: surchargeList, scheduleById: {} });
+    const surchargeList = (0, import_utils.getSurcharge)({ service: items, addons: [], bookingDetail: null, bookingId: void 0 }, { isEdit: false, isInScheduleByDate: import_Schedule.ScheduleModule.isInScheduleByDate, surcharge_list: this.store.surchargeList, scheduleById: {} });
+    const surchargeAmount = new import_decimal.default((0, import_utils.getSurchargeAmount)({ bookingDetail: null, bookingId: void 0 }, surchargeList, { isEdit: false }));
     return {
       surchargeList,
-      surchargeAmount
+      surchargeAmount: surchargeAmount.toFixed(2)
     };
   }
 };

package/lib/modules/Summary/utils.js

@@ -56,8 +56,8 @@ var calculatePriceDetails = (shopInfo, items, isInScheduleByDate, surchargeList)
     tax_rate: shopInfo == null ? void 0 : shopInfo.tax_rate,
     is_price_include_tax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax
   });
-  const total = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subtotal.plus(surchargeAmount) : subtotal.plus(totalTaxFee).plus(surchargeAmount);
-  const originTotal = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subOriginTotal : subOriginTotal.plus(totalTaxFee);
+  const total = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subtotal.plus(surchargeAmount) : subtotal.plus(tax).plus(surchargeAmount);
+  const originTotal = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subOriginTotal.plus(surchargeAmount) : subOriginTotal.plus(totalTaxFee).plus(surchargeAmount);
   const deposit = calculateDeposit(items);
   return {
     subtotal: subtotal.toFixed(2),
@@ -202,6 +202,7 @@ var processItemsTax = (items, { bookingDetail, bookingId }, options) => {
     let bundlePreciseTax = new import_decimal.default(0);
     let bundleRoundedOriginTax = new import_decimal.default(0);
     let bundleRoundedTax = new import_decimal.default(0);
+    debugger;
     if (Array.isArray(item == null ? void 0 : item.bundle)) {
       for (let bundleItem of item == null ? void 0 : item.bundle) {
         if (getBundleItemIsOriginalPrice(bundleItem)) {
@@ -501,6 +502,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
     }
     return [];
   }
+  resetItemsSurchargeSideEffects({ service, addons });
   if (!Array.isArray(surcharge_list) || !(surcharge_list == null ? void 0 : surcharge_list.length))
     return [];
   const surchargeWithAmount = [];
@@ -708,6 +710,28 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
   }
   return surchargeWithAmount;
 };
+function resetItemsSurchargeSideEffects({ service, addons }) {
+  const resetItem = (item) => {
+    if (!item)
+      return;
+    item.surcharge_fee = 0;
+    item.surcharge_rounding_remainder = 0;
+    item.relation_surcharge_ids = [];
+  };
+  if (Array.isArray(service)) {
+    for (let item of service) {
+      resetItem(item);
+      for (let bundleItem of (item == null ? void 0 : item.bundle) || [])
+        resetItem(bundleItem);
+      for (let relationDetail of (item == null ? void 0 : item.relation_details) || [])
+        resetItem(relationDetail);
+    }
+  }
+  if (Array.isArray(addons == null ? void 0 : addons.value)) {
+    for (let item of addons.value)
+      resetItem(item);
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   calculateDeposit,

package/package.json

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