@pisell/pisellos 0.0.410 → 0.0.412

package/dist/modules/Summary/utils.js

@@ -3,12 +3,12 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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); }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -153,7 +153,12 @@ export var getTax = function getTax(_ref, options) {
   if (service || addons) {
     // 处理服务商品
     if (service !== null && service !== void 0 && service.length) {
-      var serviceResult = processItemsTax(service, {
+      var serviceResult = processItemsTax(service.map(function (item) {
+        return _objectSpread(_objectSpread({}, item), {}, {
+          option: (item === null || item === void 0 ? void 0 : item.option) || (item === null || item === void 0 ? void 0 : item.options) || [],
+          bundle: (item === null || item === void 0 ? void 0 : item.bundle) || (item === null || item === void 0 ? void 0 : item.bundles) || []
+        });
+      }), {
         bookingDetail: bookingDetail,
         bookingId: bookingId
       }, {
@@ -222,7 +227,10 @@ var processItemsTax = function processItemsTax(items, _ref2, options) {
       var item = _step.value;
       var quantity = new Decimal(item.num || 1);
       var unitPrice = new Decimal(item.total || 0);
-      var mainProductPrice = new Decimal(getMainProductTotal(item) || 0);
+      var mainProductPrice = new Decimal(getMainProductTotal(_objectSpread(_objectSpread({}, item), {}, {
+        option: (item === null || item === void 0 ? void 0 : item.option) || (item === null || item === void 0 ? void 0 : item.options) || [],
+        bundle: (item === null || item === void 0 ? void 0 : item.bundle) || (item === null || item === void 0 ? void 0 : item.bundles) || []
+      })) || 0);
 
       // 计算原始税费（折扣前）- 单个商品（精确值）
       var originalTaxPerItemPrecise = getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
@@ -895,7 +903,10 @@ export var getSurcharge = function getSurcharge(_ref10, options) {
             isInScheduleByDate: isInScheduleByDate
           })) {
             // 主商品加价减价后的总价
-            var total = getMainProductTotal(item);
+            var total = getMainProductTotal(_objectSpread(_objectSpread({}, item), {}, {
+              option: (item === null || item === void 0 ? void 0 : item.option) || (item === null || item === void 0 ? void 0 : item.options) || [],
+              bundle: (item === null || item === void 0 ? void 0 : item.bundle) || (item === null || item === void 0 ? void 0 : item.bundles) || []
+            }));
             var mainQuantity = item.num || 1;
             matchedItems.push({
               total: total,
@@ -908,8 +919,9 @@ export var getSurcharge = function getSurcharge(_ref10, options) {
               mainQuantity: mainQuantity // 主商品的mainQuantity等于自己的quantity
             });
           }
+          var arr = (item === null || item === void 0 ? void 0 : item.bundle) || (item === null || item === void 0 ? void 0 : item.bundles) || [];
           // 遍历子商品 原价商品符合附加费条件
-          var _iterator6 = _createForOfIteratorHelper((item === null || item === void 0 ? void 0 : item.bundle) || []),
+          var _iterator6 = _createForOfIteratorHelper(arr),
             _step6;
           try {
             for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
@@ -1158,7 +1170,8 @@ function resetItemsSurchargeSideEffects(_ref12) {
       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) || []),
+        var arr = (item === null || item === void 0 ? void 0 : item.bundle) || (item === null || item === void 0 ? void 0 : item.bundles) || [];
+        var _iterator11 = _createForOfIteratorHelper(arr),
           _step11;
         try {
           for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {

package/lib/modules/Summary/utils.js

@@ -99,7 +99,13 @@ var getTax = ({ service, addons, bookingDetail, bookingId }, options) => {
   let totalTax = new import_decimal.default(0);
   if (service || addons) {
     if (service == null ? void 0 : service.length) {
-      const serviceResult = processItemsTax(service, { bookingDetail, bookingId }, {
+      const serviceResult = processItemsTax(service.map((item) => {
+        return {
+          ...item,
+          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) || []
+        };
+      }), { bookingDetail, bookingId }, {
         tax_rate,
         is_price_include_tax,
         computed
@@ -133,7 +139,11 @@ var processItemsTax = (items, { bookingDetail, bookingId }, options) => {
   for (let item of items) {
     const quantity = new import_decimal.default(item.num || 1);
     const unitPrice = new import_decimal.default(item.total || 0);
-    const mainProductPrice = new import_decimal.default(getMainProductTotal(item) || 0);
+    const mainProductPrice = new import_decimal.default(getMainProductTotal({
+      ...item,
+      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);
     let originalTaxPerItemPrecise = getProductItemTax(
       {
         ...item,
@@ -531,7 +541,11 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
             isInScheduleByDate
           }
         )) {
-          const total = getMainProductTotal(item);
+          const total = getMainProductTotal({
+            ...item,
+            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) || []
+          });
           const mainQuantity = item.num || 1;
           matchedItems.push({
             total,
@@ -545,7 +559,8 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
             // 主商品的mainQuantity等于自己的quantity
           });
         }
-        for (let bundleItem of (item == null ? void 0 : item.bundle) || []) {
+        const arr = (item == null ? void 0 : item.bundle) || (item == null ? void 0 : item.bundles) || [];
+        for (let bundleItem of arr) {
           if (getBundleItemIsOriginalPrice(bundleItem) && isProductMatchSurchargeCondition(
             {
               isCustomItem: false,
@@ -721,7 +736,8 @@ function resetItemsSurchargeSideEffects({ service, addons }) {
   if (Array.isArray(service)) {
     for (let item of service) {
       resetItem(item);
-      for (let bundleItem of (item == null ? void 0 : item.bundle) || [])
+      const arr = (item == null ? void 0 : item.bundle) || (item == null ? void 0 : item.bundles) || [];
+      for (let bundleItem of arr)
         resetItem(bundleItem);
       for (let relationDetail of (item == null ? void 0 : item.relation_details) || [])
         resetItem(relationDetail);

package/package.json

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