npm - @pisell/pisellos - Versions diffs - 0.0.444 → 0.0.446 - Mend

@pisell/pisellos 0.0.444 → 0.0.446

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/dist/modules/Cart/types.d.ts +2 -0
package/dist/modules/Cart/utils/cartProduct.js +19 -0
package/dist/modules/Cart/utils/changePrice.js +6 -0
package/dist/modules/Rules/index.js +14 -14
package/dist/modules/Summary/index.js +48 -6
package/dist/modules/Summary/utils.d.ts +4 -2
package/dist/modules/Summary/utils.js +52 -19
package/dist/solution/BookingByStep/index.d.ts +1 -1
package/dist/solution/BookingByStep/index.js +84 -35
package/lib/modules/Cart/types.d.ts +2 -0
package/lib/modules/Cart/utils/cartProduct.js +14 -0
package/lib/modules/Cart/utils/changePrice.js +5 -0
package/lib/modules/Rules/index.js +3 -3
package/lib/modules/Summary/index.js +21 -3
package/lib/modules/Summary/utils.d.ts +4 -2
package/lib/modules/Summary/utils.js +55 -19
package/lib/solution/BookingByStep/index.d.ts +1 -1
package/lib/solution/BookingByStep/index.js +34 -3
package/package.json +1 -1

package/dist/modules/Cart/types.d.ts CHANGED Viewed

@@ -148,6 +148,8 @@ export interface CartItem {
     _optionsOrigin?: any[];
     /** 操作系统提示 */
     osWarnTips?: string[];
+    /** 金额差值 */
+    totalDifference?: number;
 }
 /**
  * 购物车状态接口

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

@@ -13,6 +13,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import Decimal from 'decimal.js';
 import { isNormalProduct } from "../../Product/utils";
 import { getDiscountAmount } from "../../../solution/ShopDiscount/utils";
+import { calcDiscountListDifference } from "../../Summary/utils";
 /**
  * @title 处理组合商品
@@ -70,6 +71,11 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
       num: num,
       discounts: discounts
     });
+    cartItem.totalDifference = getTotalDifference({
+      product: product,
+      bundle: bundle,
+      discounts: discounts
+    });
     cartItem.summaryTotal = cartItem.total * (num || 1);
     cartItem.origin_total = getProductOriginTotalPrice({
       product: product,
@@ -229,6 +235,19 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
   }
   return Math.max(0, price);
 };
+var getTotalDifference = function getTotalDifference(params) {
+  var bundle = params.bundle,
+    discounts = params.discounts;
+  var bundleDiscountList = [];
+  if (bundle !== null && bundle !== void 0 && bundle.length) {
+    bundle.forEach(function (currentValue) {
+      bundleDiscountList.push.apply(bundleDiscountList, _toConsumableArray((currentValue === null || currentValue === void 0 ? void 0 : currentValue.discount_list) || []));
+    });
+  }
+  var allDiscounts = [].concat(_toConsumableArray(discounts || []), bundleDiscountList);
+  var productDiscountProductDiscountDifference = calcDiscountListDifference(allDiscounts);
+  return productDiscountProductDiscountDifference || 0;
+};
 /**
  * 获取商品原始总价

package/dist/modules/Cart/utils/changePrice.js CHANGED Viewed

@@ -57,6 +57,12 @@ function _updateAllCartItemPrice() {
                       if (targetBundleItem.price_type === 'markdown') {
                         targetBundleItem.price = new Decimal(targetBundleItem.price || 0).mul(-1).toNumber();
                       }
+                      // 如果有选择 option，还需要加上 option 的价格
+                      if (n.option) {
+                        targetBundleItem.price = new Decimal(targetBundleItem.price || 0).add(n.option.reduce(function (pre, cur) {
+                          return pre + new Decimal(cur.price || 0).mul(cur.num || 1).toNumber();
+                        }, 0)).toNumber();
+                      }
                       if (targetBundleItem) {
                         return _objectSpread(_objectSpread({}, n), {}, {
                           price: targetBundleItem.price,

package/dist/modules/Rules/index.js CHANGED Viewed

@@ -760,7 +760,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 收集该折扣卡适用的商品（排除被其他专属折扣卡占用的商品）
         var applicableProducts = [];
         sortedFlattenedList.forEach(function (flatItem) {
-          var _flatItem$parentProdu2, _product$price, _ref5, _flatItem$original_pr;
+          var _flatItem$parentProdu2, _flatItem$parentProdu3, _product$price, _ref5, _flatItem$original_pr;
           // 🔥 检查该商品是否被其他专属折扣卡占用
           var occupyingDiscountId = occupiedItems.get(flatItem._id);
           if (occupyingDiscountId !== undefined && occupyingDiscountId !== discount.id) {
@@ -784,7 +784,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // 对于 bundle 子商品，quantity 需要乘以主商品的购买数量
-          var quantity = flatItem.type === 'main' ? product.quantity || 1 : (product.num || 1) * (((_flatItem$parentProdu2 = flatItem.parentProduct) === null || _flatItem$parentProdu2 === void 0 ? void 0 : _flatItem$parentProdu2.quantity) || 1);
+          var quantity = flatItem.type === 'main' ? product.num || product.quantity || 1 : (product.num || product.quantity || 1) * (((_flatItem$parentProdu2 = flatItem.parentProduct) === null || _flatItem$parentProdu2 === void 0 ? void 0 : _flatItem$parentProdu2.num) || ((_flatItem$parentProdu3 = flatItem.parentProduct) === null || _flatItem$parentProdu3 === void 0 ? void 0 : _flatItem$parentProdu3.quantity) || 1);
           // 对于主商品：使用 price
           // 对于子商品：优先使用 flatItem.original_price，否则使用 flatItem.price
@@ -799,8 +799,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 子商品需要传递主商品数量
           if (flatItem.type === 'bundle') {
-            var _flatItem$parentProdu3;
-            productData.parentQuantity = ((_flatItem$parentProdu3 = flatItem.parentProduct) === null || _flatItem$parentProdu3 === void 0 ? void 0 : _flatItem$parentProdu3.quantity) || 1;
+            var _flatItem$parentProdu4;
+            productData.parentQuantity = ((_flatItem$parentProdu4 = flatItem.parentProduct) === null || _flatItem$parentProdu4 === void 0 ? void 0 : _flatItem$parentProdu4.quantity) || 1;
           }
           applicableProducts.push(productData);
         });
@@ -827,10 +827,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           product = flatItem.product;
           originProduct = flatItem.originProduct;
         } else {
-          var _flatItem$parentProdu4;
+          var _flatItem$parentProdu5;
           // bundle子商品：构造虚拟商品对象
           product = {
-            startDate: flatItem === null || flatItem === void 0 || (_flatItem$parentProdu4 = flatItem.parentProduct) === null || _flatItem$parentProdu4 === void 0 ? void 0 : _flatItem$parentProdu4.startDate,
+            startDate: flatItem === null || flatItem === void 0 || (_flatItem$parentProdu5 = flatItem.parentProduct) === null || _flatItem$parentProdu5 === void 0 ? void 0 : _flatItem$parentProdu5.startDate,
             _id: flatItem._id,
             id: flatItem.id,
             price: flatItem.price,
@@ -918,10 +918,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           product = flatItem.product;
           originProduct = flatItem.originProduct;
         } else {
-          var _flatItem$parentProdu5, _flatItem$bundleItem5, _flatItem$bundleItem6, _flatItem$bundleItem7;
+          var _flatItem$parentProdu6, _flatItem$bundleItem5, _flatItem$bundleItem6, _flatItem$bundleItem7;
           // bundle子商品
           product = {
-            startDate: flatItem === null || flatItem === void 0 || (_flatItem$parentProdu5 = flatItem.parentProduct) === null || _flatItem$parentProdu5 === void 0 ? void 0 : _flatItem$parentProdu5.startDate,
+            startDate: flatItem === null || flatItem === void 0 || (_flatItem$parentProdu6 = flatItem.parentProduct) === null || _flatItem$parentProdu6 === void 0 ? void 0 : _flatItem$parentProdu6.startDate,
             _id: flatItem._id,
             id: flatItem.id,
             price: flatItem.price,
@@ -1067,11 +1067,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            var _product$discount_lis7, _flatItem$parentProdu6;
+            var _product$discount_lis7, _flatItem$parentProdu7;
             if ((_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.some(function (item) {
               var _item$discount2;
               return ((_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.resource_id) === options.discountId;
-            }) || (_flatItem$parentProdu6 = flatItem.parentProduct) !== null && _flatItem$parentProdu6 !== void 0 && (_flatItem$parentProdu6 = _flatItem$parentProdu6.discount_list) !== null && _flatItem$parentProdu6 !== void 0 && _flatItem$parentProdu6.some(function (item) {
+            }) || (_flatItem$parentProdu7 = flatItem.parentProduct) !== null && _flatItem$parentProdu7 !== void 0 && (_flatItem$parentProdu7 = _flatItem$parentProdu7.discount_list) !== null && _flatItem$parentProdu7 !== void 0 && _flatItem$parentProdu7.some(function (item) {
               var _item$discount3;
               return ((_item$discount3 = item.discount) === null || _item$discount3 === void 0 ? void 0 : _item$discount3.resource_id) === options.discountId;
             })) {
@@ -1093,14 +1093,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            var _product$discount_lis9, _flatItem$parentProdu7;
+            var _product$discount_lis9, _flatItem$parentProdu8;
             if ((_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
               var _options$selectedList2;
               return options === null || options === void 0 || (_options$selectedList2 = options.selectedList) === null || _options$selectedList2 === void 0 ? void 0 : _options$selectedList2.some(function (n) {
                 var _item$discount5;
                 return n.discountId === ((_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.resource_id);
               });
-            }) || (_flatItem$parentProdu7 = flatItem.parentProduct) !== null && _flatItem$parentProdu7 !== void 0 && (_flatItem$parentProdu7 = _flatItem$parentProdu7.discount_list) !== null && _flatItem$parentProdu7 !== void 0 && _flatItem$parentProdu7.some(function (item) {
+            }) || (_flatItem$parentProdu8 = flatItem.parentProduct) !== null && _flatItem$parentProdu8 !== void 0 && (_flatItem$parentProdu8 = _flatItem$parentProdu8.discount_list) !== null && _flatItem$parentProdu8 !== void 0 && _flatItem$parentProdu8.some(function (item) {
               var _options$selectedList3;
               return options === null || options === void 0 || (_options$selectedList3 = options.selectedList) === null || _options$selectedList3 === void 0 ? void 0 : _options$selectedList3.some(function (n) {
                 var _item$discount6;
@@ -1384,7 +1384,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }));
             }
           } else {
-            var _selectedDiscount3$me, _selectedDiscount3$me2, _flatItem$parentProdu8;
+            var _selectedDiscount3$me, _selectedDiscount3$me2, _flatItem$parentProdu9;
             // 折扣卡：不拆分数量，直接应用
             var _selectedDiscount3 = selectedDiscountCard || applicableDiscounts[0];
             usedDiscounts.set(_selectedDiscount3.id, true);
@@ -1437,7 +1437,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 product_discount_difference: _productDiscountDifference
               }),
               config: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.config,
-              _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu8 = flatItem.parentProduct) === null || _flatItem$parentProdu8 === void 0 ? void 0 : _flatItem$parentProdu8.num) || 1)
+              _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu9 = flatItem.parentProduct) === null || _flatItem$parentProdu9 === void 0 ? void 0 : _flatItem$parentProdu9.num) || 1)
             };
             // 记录实际应用的折扣

package/dist/modules/Summary/index.js CHANGED Viewed

@@ -1,4 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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 _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); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -86,7 +89,7 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return this.request.get('/order/custom-surcharge/available', {
+              return this.request.get('/order/custom-surcharge/available/v2', {
                 channel: 'online-store',
                 is_assemble_product_data: 1,
                 is_assemble_schedule_data: 1,
@@ -111,15 +114,34 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(cartItems) {
         var _this$shopStore$get;
-        var shopInfo, summary;
+        var shopInfo, scheduleModule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              shopInfo = ((_this$shopStore$get = this.shopStore.get('core')) === null || _this$shopStore$get === void 0 || (_this$shopStore$get = _this$shopStore$get.core) === null || _this$shopStore$get === void 0 ? void 0 : _this$shopStore$get.shop) || {}; // const scheduleModule = this.core.getModule<ScheduleModule>('appointmentBooking_schedule');
-              summary = calculatePriceDetails(shopInfo, cartItems, ScheduleModule === null || ScheduleModule === void 0 ? void 0 : ScheduleModule.isInScheduleByDate, this.store.surchargeList);
+              shopInfo = ((_this$shopStore$get = this.shopStore.get('core')) === null || _this$shopStore$get === void 0 || (_this$shopStore$get = _this$shopStore$get.core) === null || _this$shopStore$get === void 0 ? void 0 : _this$shopStore$get.shop) || {};
+              scheduleModule = this.core.getModule('appointmentBooking_schedule');
+              needScheduleIds = this.store.surchargeList.map(function (item) {
+                return item.available_schedule_ids;
+              }).flat();
+              scheduleList = scheduleModule === null || scheduleModule === void 0 ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
+              scheduleById = {};
+              if (Array.isArray(scheduleList)) {
+                _iterator = _createForOfIteratorHelper(scheduleList);
+                try {
+                  for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                    item = _step.value;
+                    scheduleById[item.id] = item;
+                  }
+                } catch (err) {
+                  _iterator.e(err);
+                } finally {
+                  _iterator.f();
+                }
+              }
+              summary = calculatePriceDetails(shopInfo, cartItems, ScheduleModule === null || ScheduleModule === void 0 ? void 0 : ScheduleModule.isInScheduleByDate, this.store.surchargeList, scheduleById);
               this.store.summary = summary;
               return _context3.abrupt("return", this.store.summary);
-            case 4:
+            case 9:
             case "end":
               return _context3.stop();
           }
@@ -187,6 +209,26 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
     key: "getSurchargeforUtils",
     value: function getSurchargeforUtils(items) {
       // const surchargeList = this.store.surchargeList;
+      var scheduleModule = this.core.getModule('appointmentBooking_schedule');
+      var needScheduleIds = this.store.surchargeList.map(function (item) {
+        return item.available_schedule_ids;
+      }).flat();
+      var scheduleList = scheduleModule === null || scheduleModule === void 0 ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
+      var scheduleById = {};
+      if (Array.isArray(scheduleList)) {
+        var _iterator2 = _createForOfIteratorHelper(scheduleList),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var item = _step2.value;
+            scheduleById[item.id] = item;
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
       var surchargeList = getSurcharge({
         service: items,
         addons: [],
@@ -196,7 +238,7 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
         isEdit: false,
         isInScheduleByDate: ScheduleModule.isInScheduleByDate,
         surcharge_list: this.store.surchargeList,
-        scheduleById: {}
+        scheduleById: scheduleById
       });
       var surchargeAmount = new Decimal(getSurchargeAmount({
         bookingDetail: null,

package/dist/modules/Summary/utils.d.ts CHANGED Viewed

@@ -1,12 +1,14 @@
 import Decimal from 'decimal.js';
 import { CartItem } from '../Cart/types';
 import { ISummaryState } from './types';
-export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], isInScheduleByDate: any, surchargeList: any[]) => ISummaryState['summary'];
+export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], isInScheduleByDate: any, surchargeList: any[], scheduleById: Record<string, any>) => ISummaryState['summary'];
 /**
  * 获取子商品折扣信息
  * @param item
  */
 export declare const getBundleDiscountList: (bundle: any[]) => any[];
+export declare const calcDiscountListDifference: (discountList: any[]) => any;
+export declare const getProductDiscountProductDiscountDifference: (item: CartItem) => any;
 /**
  * 计算订单税费（折扣前/折扣后），并把单品税费信息回写到商品数据上（用于明细展示/后续计算）。
  *
@@ -70,7 +72,7 @@ export declare const calculateOriginSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * @title: 计算定金
  * @param items - 购物车商品数组

package/dist/modules/Summary/utils.js CHANGED Viewed

@@ -16,7 +16,7 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import Decimal from 'decimal.js';
-export var calculatePriceDetails = function calculatePriceDetails(shopInfo, items, isInScheduleByDate, surchargeList) {
+export var calculatePriceDetails = function calculatePriceDetails(shopInfo, items, isInScheduleByDate, surchargeList, scheduleById) {
   var subtotal = new Decimal(calculateSubtotal(items));
   var subOriginTotal = new Decimal(calculateOriginSubtotal(items));
   var totalTaxFee = new Decimal(calculateTaxFee(shopInfo, items));
@@ -30,7 +30,7 @@ export var calculatePriceDetails = function calculatePriceDetails(shopInfo, item
     isEdit: false,
     isInScheduleByDate: isInScheduleByDate,
     surcharge_list: surchargeList,
-    scheduleById: {}
+    scheduleById: scheduleById
   });
   // 订单附加费金额
   var surchargeAmount = new Decimal(getSurchargeAmount({
@@ -94,14 +94,18 @@ export var getBundleDiscountList = function getBundleDiscountList(bundle) {
   });
   return discountList;
 };
-var getProductDiscountProductDiscountDifference = function getProductDiscountProductDiscountDifference(item) {
+export var calcDiscountListDifference = function calcDiscountListDifference(discountList) {
+  return discountList.reduce(function (pre, cur) {
+    var _cur$metadata;
+    return pre + ((cur === null || cur === void 0 || (_cur$metadata = cur.metadata) === null || _cur$metadata === void 0 ? void 0 : _cur$metadata.product_discount_difference) || 0);
+  }, 0);
+};
+export var getProductDiscountProductDiscountDifference = function getProductDiscountProductDiscountDifference(item) {
   var _item$_origin, _item$_origin2;
   var mainDiscountList = ((_item$_origin = item._origin) === null || _item$_origin === void 0 || (_item$_origin = _item$_origin.product) === null || _item$_origin === void 0 ? void 0 : _item$_origin.discount_list) || [];
   var bundleDiscountList = getBundleDiscountList(((_item$_origin2 = item._origin) === null || _item$_origin2 === void 0 || (_item$_origin2 = _item$_origin2.product) === null || _item$_origin2 === void 0 ? void 0 : _item$_origin2.product_bundle) || []);
   var discountList = [].concat(_toConsumableArray(mainDiscountList), _toConsumableArray(bundleDiscountList));
-  return discountList.reduce(function (pre, cur) {
-    return pre + (cur.metadata.product_discount_difference || 0);
-  }, 0);
+  return calcDiscountListDifference(discountList);
 };
 /**
@@ -189,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);
+}
 /**
  * 处理商品税费计算（折扣前后）
@@ -233,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,
@@ -255,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), {}, {
@@ -295,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,
@@ -349,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,
@@ -367,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), {}, {
@@ -719,7 +752,6 @@ var getMainProductTotal = function getMainProductTotal(item) {
   }
   return total.toNumber();
 };
 /**
  * 判断商品是否符合附加费条件
  */
@@ -834,6 +866,7 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
     addons = _ref11.addons,
     bookingDetail = _ref11.bookingDetail,
     bookingId = _ref11.bookingId;
+  debugger;
   var isEdit = options.isEdit,
     isInScheduleByDate = options.isInScheduleByDate,
     surcharge_list = options.surcharge_list,
@@ -904,7 +937,7 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
           // 主商品符合附加费条件
           if (isProductMatchSurchargeCondition({
             isCustomItem: item.isCustomItem,
-            startDate: (item === null || item === void 0 ? void 0 : item.startDate) || '',
+            startDate: (item === null || item === void 0 ? void 0 : item.startDate) || (item === null || item === void 0 ? void 0 : item.start_date) || '',
             product_id: item.id
           }, {
             surchargeConfig: surchargeConfig,
@@ -938,7 +971,7 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
               // bundle商品是原价且符合附加费条件
               if (getBundleItemIsOriginalPrice(bundleItem) && isProductMatchSurchargeCondition({
                 isCustomItem: false,
-                startDate: item.startDate,
+                startDate: item.startDate || item.start_date || '',
                 product_id: bundleItem._bundle_product_id
               }, {
                 surchargeConfig: surchargeConfig,
@@ -970,7 +1003,7 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
               var relationDetail = _step7.value;
               if (isProductMatchSurchargeCondition({
                 isCustomItem: false,
-                startDate: item.startDate,
+                startDate: item.startDate || item.start_date || '',
                 product_id: relationDetail.product_id
               }, {
                 surchargeConfig: surchargeConfig,

package/dist/solution/BookingByStep/index.d.ts CHANGED Viewed

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 4 | 3 | 1 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingByStep/index.js CHANGED Viewed

@@ -2554,14 +2554,63 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               var targetResourceTimes = allResources === null || allResources === void 0 || (_allResources$find = allResources.find(function (n) {
                 return n.id === resource.id;
               })) === null || _allResources$find === void 0 ? void 0 : _allResources$find.times;
+              // 找到最晚的 end_at 还没用，因为可能存在资源工作时间是 10:00-19:00，但是资源的 times 里有 16:30-19:00 被 block 的情况
+              // 所以还需要排除掉 block 时间
+              function getEarliestBlockedStartTime(_ref11) {
+                var _earliestBlockStart;
+                var currentStartTime = _ref11.currentStartTime,
+                  times = _ref11.times;
+                var currentStart = dayjs(currentStartTime);
+                var earliestBlockStart;
+                var _iterator3 = _createForOfIteratorHelper(times || []),
+                  _step3;
+                try {
+                  for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                    var time = _step3.value;
+                    var _iterator4 = _createForOfIteratorHelper(time.event_list || []),
+                      _step4;
+                    try {
+                      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                        var event = _step4.value;
+                        var eventStart = dayjs(event.start_at);
+                        var eventEnd = dayjs(event.end_at);
+                        if (eventStart.isBefore(currentStart) && eventEnd.isAfter(currentStart)) {
+                          return currentStart.format('YYYY-MM-DD HH:mm');
+                        }
+                        if (eventStart.isAfter(currentStart)) {
+                          if (!earliestBlockStart || eventStart.isBefore(earliestBlockStart)) {
+                            earliestBlockStart = eventStart;
+                          }
+                        }
+                      }
+                    } catch (err) {
+                      _iterator4.e(err);
+                    } finally {
+                      _iterator4.f();
+                    }
+                  }
+                } catch (err) {
+                  _iterator3.e(err);
+                } finally {
+                  _iterator3.f();
+                }
+                return (_earliestBlockStart = earliestBlockStart) === null || _earliestBlockStart === void 0 ? void 0 : _earliestBlockStart.format('YYYY-MM-DD HH:mm');
+              }
               var resourcesEndTime = targetResourceTimes.reduce(function (acc, curr) {
                 return dayjs(curr.end_at).isAfter(dayjs(acc.end_at)) ? curr : acc;
               }, targetResourceTimes[0]);
+              var earliestBlockedStartTime = getEarliestBlockedStartTime({
+                currentStartTime: currentStartTime,
+                times: targetResourceTimes
+              });
               // 将 operating_day_boundary 转换为与 resourcesEndTime.end_at 相同日期的完整日期时间
               var resourceDate = dayjs(resourcesEndTime.end_at).format('YYYY-MM-DD');
               var operatingBoundaryDateTime = "".concat(resourceDate, " ").concat(operating_day_boundary.type === 'start_time' ? '23:59' : operating_day_boundary.time);
-              var endTime = dayjs(resourcesEndTime.end_at).isBefore(dayjs(operatingBoundaryDateTime)) ? resourcesEndTime.end_at : operatingBoundaryDateTime;
+              var endTimeCandidates = [resourcesEndTime.end_at, operatingBoundaryDateTime].concat(_toConsumableArray(earliestBlockedStartTime ? [earliestBlockedStartTime] : []));
+              var endTime = endTimeCandidates.reduce(function (earliest, value) {
+                return dayjs(value).isBefore(dayjs(earliest)) ? value : earliest;
+              }, endTimeCandidates[0]);
               // 修复：如果 endTime 只是时间格式（如 "17:00"），需要加上日期
               var formattedEndTime;
               if (typeof endTime === 'string' && endTime.includes(':') && !endTime.includes(' ') && !endTime.includes('T')) {
@@ -2702,14 +2751,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     // 通过商品和 schedule 来获取视频可用的时间片、时间片内资源可用的数据
   }, {
     key: "getTimeslotBySchedule",
-    value: function getTimeslotBySchedule(_ref11) {
+    value: function getTimeslotBySchedule(_ref12) {
       var _this$store$currentPr2,
         _targetProductData$pr,
         _this15 = this;
-      var date = _ref11.date,
-        scheduleIds = _ref11.scheduleIds,
-        resources = _ref11.resources,
-        product = _ref11.product;
+      var date = _ref12.date,
+        scheduleIds = _ref12.scheduleIds,
+        resources = _ref12.resources,
+        product = _ref12.product;
       var targetProduct = this.store.currentProduct;
       // 如果外面传递了product 优先用外面的
       var targetProductData = product || targetProduct;
@@ -3268,12 +3317,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 检查资源类型（单个预约 vs 多个预约）
             // 从商品配置中获取资源类型信息
             var resourceTypeConfig = null;
-            var _iterator3 = _createForOfIteratorHelper(items),
-              _step3;
+            var _iterator5 = _createForOfIteratorHelper(items),
+              _step5;
             try {
-              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
                 var _cartItem$_productOri12;
-                var cartItem = _step3.value;
+                var cartItem = _step5.value;
                 if ((_cartItem$_productOri12 = cartItem._productOrigin) !== null && _cartItem$_productOri12 !== void 0 && (_cartItem$_productOri12 = _cartItem$_productOri12.product_resource) !== null && _cartItem$_productOri12 !== void 0 && _cartItem$_productOri12.resources) {
                   resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(function (r) {
                     return r.code === resourceCode && r.status === 1;
@@ -3282,9 +3331,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               }
             } catch (err) {
-              _iterator3.e(err);
+              _iterator5.e(err);
             } finally {
-              _iterator3.f();
+              _iterator5.f();
             }
             var isMultipleBooking = ((_resourceTypeConfig = resourceTypeConfig) === null || _resourceTypeConfig === void 0 ? void 0 : _resourceTypeConfig.type) === 'multiple';
             var totalAvailable;
@@ -3487,17 +3536,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
      */
   }, {
     key: "convertProductToCartItem",
-    value: function convertProductToCartItem(_ref12) {
-      var product = _ref12.product,
-        date = _ref12.date,
-        account = _ref12.account;
-      var _ref13 = product || {},
-        bundle = _ref13.bundle,
-        options = _ref13.options,
-        origin = _ref13.origin,
-        product_variant_id = _ref13.product_variant_id,
-        _ref13$quantity = _ref13.quantity,
-        quantity = _ref13$quantity === void 0 ? 1 : _ref13$quantity;
+    value: function convertProductToCartItem(_ref13) {
+      var product = _ref13.product,
+        date = _ref13.date,
+        account = _ref13.account;
+      var _ref14 = product || {},
+        bundle = _ref14.bundle,
+        options = _ref14.options,
+        origin = _ref14.origin,
+        product_variant_id = _ref14.product_variant_id,
+        _ref14$quantity = _ref14.quantity,
+        quantity = _ref14$quantity === void 0 ? 1 : _ref14$quantity;
       // 处理商品数据，类似 addProductToCart 中的逻辑
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
@@ -3552,11 +3601,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "checkMaxDurationCapacityForDetailNums",
-    value: function checkMaxDurationCapacityForDetailNums(_ref14) {
+    value: function checkMaxDurationCapacityForDetailNums(_ref15) {
       var _this17 = this;
-      var product = _ref14.product,
-        date = _ref14.date,
-        account = _ref14.account;
+      var product = _ref15.product,
+        date = _ref15.date,
+        account = _ref15.account;
       var cartItems = this.store.cart.getItems().filter(function (item) {
         return !isNormalProduct(item._productOrigin);
       });
@@ -3701,12 +3750,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 检查资源类型（单个预约 vs 多个预约）
             // 从商品配置中获取资源类型信息
             var resourceTypeConfig = null;
-            var _iterator4 = _createForOfIteratorHelper(items),
-              _step4;
+            var _iterator6 = _createForOfIteratorHelper(items),
+              _step6;
             try {
-              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+              for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
                 var _cartItem$_productOri15;
-                var cartItem = _step4.value;
+                var cartItem = _step6.value;
                 if ((_cartItem$_productOri15 = cartItem._productOrigin) !== null && _cartItem$_productOri15 !== void 0 && (_cartItem$_productOri15 = _cartItem$_productOri15.product_resource) !== null && _cartItem$_productOri15 !== void 0 && _cartItem$_productOri15.resources) {
                   resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(function (r) {
                     return r.code === resourceCode && r.status === 1;
@@ -3715,9 +3764,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               }
             } catch (err) {
-              _iterator4.e(err);
+              _iterator6.e(err);
             } finally {
-              _iterator4.f();
+              _iterator6.f();
             }
             var isMultipleBooking = ((_resourceTypeConfig2 = resourceTypeConfig) === null || _resourceTypeConfig2 === void 0 ? void 0 : _resourceTypeConfig2.type) === 'multiple';
             var totalAvailable;
@@ -4088,12 +4137,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeslotsScheduleByDateRange",
     value: (function () {
-      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(_ref15) {
+      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(_ref16) {
         var startDate, endDate, scheduleIds, resources, dates, currentDate, end, results, _i5, _dates, date;
         return _regeneratorRuntime().wrap(function _callee27$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              startDate = _ref15.startDate, endDate = _ref15.endDate, scheduleIds = _ref15.scheduleIds, resources = _ref15.resources;
+              startDate = _ref16.startDate, endDate = _ref16.endDate, scheduleIds = _ref16.scheduleIds, resources = _ref16.resources;
               console.log('appoimentBooking-session-date-getTimeslotsScheduleByDateRange', {
                 startDate: startDate,
                 endDate: endDate,

package/lib/modules/Cart/types.d.ts CHANGED Viewed

@@ -148,6 +148,8 @@ export interface CartItem {
     _optionsOrigin?: any[];
     /** 操作系统提示 */
     osWarnTips?: string[];
+    /** 金额差值 */
+    totalDifference?: number;
 }
 /**
  * 购物车状态接口

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

@@ -45,6 +45,7 @@ module.exports = __toCommonJS(cartProduct_exports);
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../Product/utils");
 var import_utils2 = require("../../../solution/ShopDiscount/utils");
+var import_utils3 = require("../../Summary/utils");
 var handleVariantProduct = (product) => {
   var _a;
   if (product == null ? void 0 : product.product_variant_id) {
@@ -80,6 +81,7 @@ var formatProductToCartItem = (params) => {
     cartItem.price = product == null ? void 0 : product.price;
     cartItem.num = num;
     cartItem.total = getProductTotalPrice({ product, bundle, options, num, discounts });
+    cartItem.totalDifference = getTotalDifference({ product, bundle, discounts });
     cartItem.summaryTotal = cartItem.total * (num || 1);
     cartItem.origin_total = getProductOriginTotalPrice({
       product,
@@ -216,6 +218,18 @@ var getProductTotalPrice = (params) => {
   }
   return Math.max(0, price);
 };
+var getTotalDifference = (params) => {
+  const { bundle, discounts } = params;
+  const bundleDiscountList = [];
+  if (bundle == null ? void 0 : bundle.length) {
+    bundle.forEach((currentValue) => {
+      bundleDiscountList.push(...(currentValue == null ? void 0 : currentValue.discount_list) || []);
+    });
+  }
+  const allDiscounts = [...discounts || [], ...bundleDiscountList];
+  const productDiscountProductDiscountDifference = (0, import_utils3.calcDiscountListDifference)(allDiscounts);
+  return productDiscountProductDiscountDifference || 0;
+};
 var getProductOriginTotalPrice = (params) => {
   const { product, bundle, options, discounts } = params;
   const num = (params == null ? void 0 : params.num) || 1;

package/lib/modules/Cart/utils/changePrice.js CHANGED Viewed

@@ -60,6 +60,11 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
         if (targetBundleItem.price_type === "markdown") {
           targetBundleItem.price = new import_decimal.default(targetBundleItem.price || 0).mul(-1).toNumber();
         }
+        if (n.option) {
+          targetBundleItem.price = new import_decimal.default(targetBundleItem.price || 0).add(n.option.reduce((pre, cur) => {
+            return pre + new import_decimal.default(cur.price || 0).mul(cur.num || 1).toNumber();
+          }, 0)).toNumber();
+        }
         if (targetBundleItem) {
           return {
             ...n,

package/lib/modules/Rules/index.js CHANGED Viewed

@@ -505,7 +505,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       const applicableProducts = [];
       sortedFlattenedList.forEach((flatItem) => {
-        var _a, _b;
+        var _a, _b, _c;
         const occupyingDiscountId = occupiedItems.get(flatItem._id);
         if (occupyingDiscountId !== void 0 && occupyingDiscountId !== discount.id) {
           return;
@@ -525,7 +525,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             num: flatItem.num
           };
         }
-        const quantity = flatItem.type === "main" ? product.quantity || 1 : (product.num || 1) * (((_a = flatItem.parentProduct) == null ? void 0 : _a.quantity) || 1);
+        const quantity = flatItem.type === "main" ? product.num || product.quantity || 1 : (product.num || product.quantity || 1) * (((_a = flatItem.parentProduct) == null ? void 0 : _a.num) || ((_b = flatItem.parentProduct) == null ? void 0 : _b.quantity) || 1);
         const originalAmount = flatItem.type === "main" ? Number(product.price ?? 0) : Number(flatItem.original_price ?? flatItem.price ?? 0);
         const productData = {
           productId: flatItem._id,
@@ -533,7 +533,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           quantity
         };
         if (flatItem.type === "bundle") {
-          productData.parentQuantity = ((_b = flatItem.parentProduct) == null ? void 0 : _b.quantity) || 1;
+          productData.parentQuantity = ((_c = flatItem.parentProduct) == null ? void 0 : _c.quantity) || 1;
         }
         applicableProducts.push(productData);
       });

package/lib/modules/Summary/index.js CHANGED Viewed

@@ -65,7 +65,7 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     this.getSurchargeList();
   }
   async getSurchargeList() {
-    const surchargeList = await this.request.get("/order/custom-surcharge/available", {
+    const surchargeList = await this.request.get("/order/custom-surcharge/available/v2", {
       channel: "online-store",
       is_assemble_product_data: 1,
       is_assemble_schedule_data: 1,
@@ -76,7 +76,16 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
   async getSummary(cartItems) {
     var _a, _b, _c;
     const shopInfo = ((_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.shop) || {};
-    const summary = (0, import_utils.calculatePriceDetails)(shopInfo, cartItems, (_c = import_Schedule.ScheduleModule) == null ? void 0 : _c.isInScheduleByDate, this.store.surchargeList);
+    const scheduleModule = this.core.getModule("appointmentBooking_schedule");
+    const needScheduleIds = this.store.surchargeList.map((item) => item.available_schedule_ids).flat();
+    const scheduleList = scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
+    const scheduleById = {};
+    if (Array.isArray(scheduleList)) {
+      for (let item of scheduleList) {
+        scheduleById[item.id] = item;
+      }
+    }
+    const summary = (0, import_utils.calculatePriceDetails)(shopInfo, cartItems, (_c = import_Schedule.ScheduleModule) == null ? void 0 : _c.isInScheduleByDate, this.store.surchargeList, scheduleById);
     this.store.summary = summary;
     return this.store.summary;
   }
@@ -110,7 +119,16 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     });
   }
   getSurchargeforUtils(items) {
-    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 scheduleModule = this.core.getModule("appointmentBooking_schedule");
+    const needScheduleIds = this.store.surchargeList.map((item) => item.available_schedule_ids).flat();
+    const scheduleList = scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
+    const scheduleById = {};
+    if (Array.isArray(scheduleList)) {
+      for (let item of scheduleList) {
+        scheduleById[item.id] = item;
+      }
+    }
+    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,

package/lib/modules/Summary/utils.d.ts CHANGED Viewed

@@ -1,12 +1,14 @@
 import Decimal from 'decimal.js';
 import { CartItem } from '../Cart/types';
 import { ISummaryState } from './types';
-export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], isInScheduleByDate: any, surchargeList: any[]) => ISummaryState['summary'];
+export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], isInScheduleByDate: any, surchargeList: any[], scheduleById: Record<string, any>) => ISummaryState['summary'];
 /**
  * 获取子商品折扣信息
  * @param item
  */
 export declare const getBundleDiscountList: (bundle: any[]) => any[];
+export declare const calcDiscountListDifference: (discountList: any[]) => any;
+export declare const getProductDiscountProductDiscountDifference: (item: CartItem) => any;
 /**
  * 计算订单税费（折扣前/折扣后），并把单品税费信息回写到商品数据上（用于明细展示/后续计算）。
  *
@@ -70,7 +72,7 @@ export declare const calculateOriginSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * @title: 计算定金
  * @param items - 购物车商品数组

package/lib/modules/Summary/utils.js CHANGED Viewed

@@ -29,23 +29,25 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Summary/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  calcDiscountListDifference: () => calcDiscountListDifference,
   calculateDeposit: () => calculateDeposit,
   calculateOriginSubtotal: () => calculateOriginSubtotal,
   calculatePriceDetails: () => calculatePriceDetails,
   calculateSubtotal: () => calculateSubtotal,
   calculateTaxFee: () => calculateTaxFee,
   getBundleDiscountList: () => getBundleDiscountList,
+  getProductDiscountProductDiscountDifference: () => getProductDiscountProductDiscountDifference,
   getSurcharge: () => getSurcharge,
   getSurchargeAmount: () => getSurchargeAmount,
   getTax: () => getTax
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
-var calculatePriceDetails = (shopInfo, items, isInScheduleByDate, surchargeList) => {
+var calculatePriceDetails = (shopInfo, items, isInScheduleByDate, surchargeList, scheduleById) => {
   const subtotal = new import_decimal.default(calculateSubtotal(items));
   const subOriginTotal = new import_decimal.default(calculateOriginSubtotal(items));
   const totalTaxFee = new import_decimal.default(calculateTaxFee(shopInfo, items));
-  const surcharge = getSurcharge({ service: items, addons: [], bookingDetail: null, bookingId: void 0 }, { isEdit: false, isInScheduleByDate, surcharge_list: surchargeList, scheduleById: {} });
+  const surcharge = getSurcharge({ service: items, addons: [], bookingDetail: null, bookingId: void 0 }, { isEdit: false, isInScheduleByDate, surcharge_list: surchargeList, scheduleById });
   const surchargeAmount = new import_decimal.default(getSurchargeAmount({ bookingDetail: null, bookingId: void 0 }, surcharge, { isEdit: false }));
   const { tax, originTax } = getTax({ service: items, bookingDetail: null, bookingId: void 0 }, {
     computed: {
@@ -84,14 +86,18 @@ var getBundleDiscountList = (bundle) => {
   });
   return discountList;
 };
+var calcDiscountListDifference = (discountList) => {
+  return discountList.reduce((pre, cur) => {
+    var _a;
+    return pre + (((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
+  }, 0);
+};
 var getProductDiscountProductDiscountDifference = (item) => {
   var _a, _b, _c, _d;
   const mainDiscountList = ((_b = (_a = item._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
   const bundleDiscountList = getBundleDiscountList(((_d = (_c = item._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.product_bundle) || []);
   const discountList = [...mainDiscountList, ...bundleDiscountList];
-  return discountList.reduce((pre, cur) => {
-    return pre + (cur.metadata.product_discount_difference || 0);
-  }, 0);
+  return calcDiscountListDifference(discountList);
 };
 var getTax = ({ service, addons, bookingDetail, bookingId }, options) => {
   const { isEdit, computed, tax_rate, is_price_include_tax } = options;
@@ -128,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;
@@ -144,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 },
@@ -161,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,
@@ -184,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 },
@@ -219,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 },
@@ -232,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,
@@ -490,6 +523,7 @@ var isProductMatchSurchargeCondition = (item, options) => {
 };
 var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
   var _a, _b, _c;
+  debugger;
   const { isEdit, isInScheduleByDate, surcharge_list, scheduleById } = options;
   if (!isEdit && bookingId) {
     if (Array.isArray(bookingDetail == null ? void 0 : bookingDetail.surcharge)) {
@@ -537,7 +571,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
         if (isProductMatchSurchargeCondition(
           {
             isCustomItem: item.isCustomItem,
-            startDate: (item == null ? void 0 : item.startDate) || "",
+            startDate: (item == null ? void 0 : item.startDate) || (item == null ? void 0 : item.start_date) || "",
             product_id: item.id
           },
           {
@@ -569,7 +603,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
           if (getBundleItemIsOriginalPrice(bundleItem) && isProductMatchSurchargeCondition(
             {
               isCustomItem: false,
-              startDate: item.startDate,
+              startDate: item.startDate || item.start_date || "",
               product_id: bundleItem._bundle_product_id
             },
             {
@@ -595,7 +629,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
           if (isProductMatchSurchargeCondition(
             {
               isCustomItem: false,
-              startDate: item.startDate,
+              startDate: item.startDate || item.start_date || "",
               product_id: relationDetail.product_id
             },
             {
@@ -755,12 +789,14 @@ function resetItemsSurchargeSideEffects({ service, addons }) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  calcDiscountListDifference,
   calculateDeposit,
   calculateOriginSubtotal,
   calculatePriceDetails,
   calculateSubtotal,
   calculateTaxFee,
   getBundleDiscountList,
+  getProductDiscountProductDiscountDifference,
   getSurcharge,
   getSurchargeAmount,
   getTax

package/lib/solution/BookingByStep/index.d.ts CHANGED Viewed

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 4 | 3 | 1 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingByStep/index.js CHANGED Viewed

@@ -1768,6 +1768,28 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         newResources.forEach((resource) => {
           var _a3, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k;
           if (((_b2 = (_a3 = item._productOrigin) == null ? void 0 : _a3.duration) == null ? void 0 : _b2.type) === "flexible") {
+            let getEarliestBlockedStartTime = function({
+              currentStartTime: currentStartTime2,
+              times
+            }) {
+              const currentStart = (0, import_dayjs.default)(currentStartTime2);
+              let earliestBlockStart;
+              for (const time of times || []) {
+                for (const event of time.event_list || []) {
+                  const eventStart = (0, import_dayjs.default)(event.start_at);
+                  const eventEnd = (0, import_dayjs.default)(event.end_at);
+                  if (eventStart.isBefore(currentStart) && eventEnd.isAfter(currentStart)) {
+                    return currentStart.format("YYYY-MM-DD HH:mm");
+                  }
+                  if (eventStart.isAfter(currentStart)) {
+                    if (!earliestBlockStart || eventStart.isBefore(earliestBlockStart)) {
+                      earliestBlockStart = eventStart;
+                    }
+                  }
+                }
+              }
+              return earliestBlockStart == null ? void 0 : earliestBlockStart.format("YYYY-MM-DD HH:mm");
+            };
             item.duration = {
               type: "minutes",
               value: 10
@@ -1782,13 +1804,22 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               },
               targetResourceTimes[0]
             );
+            const earliestBlockedStartTime = getEarliestBlockedStartTime({
+              currentStartTime,
+              times: targetResourceTimes
+            });
             const resourceDate = (0, import_dayjs.default)(resourcesEndTime.end_at).format(
               "YYYY-MM-DD"
             );
             const operatingBoundaryDateTime = `${resourceDate} ${operating_day_boundary.type === "start_time" ? "23:59" : operating_day_boundary.time}`;
-            const endTime = (0, import_dayjs.default)(resourcesEndTime.end_at).isBefore(
-              (0, import_dayjs.default)(operatingBoundaryDateTime)
-            ) ? resourcesEndTime.end_at : operatingBoundaryDateTime;
+            const endTimeCandidates = [
+              resourcesEndTime.end_at,
+              operatingBoundaryDateTime,
+              ...earliestBlockedStartTime ? [earliestBlockedStartTime] : []
+            ];
+            const endTime = endTimeCandidates.reduce((earliest, value) => {
+              return (0, import_dayjs.default)(value).isBefore((0, import_dayjs.default)(earliest)) ? value : earliest;
+            }, endTimeCandidates[0]);
             let formattedEndTime;
             if (typeof endTime === "string" && endTime.includes(":") && !endTime.includes(" ") && !endTime.includes("T")) {
               const currentDate = timeSlots.start_at.format("YYYY-MM-DD");

package/package.json CHANGED Viewed

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