@pisell/pisellos 1.0.125 → 1.0.127

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

@@ -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/Summary/index.js

@@ -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) || {};
-              summary = calculatePriceDetails(shopInfo, cartItems, ScheduleModule.isInScheduleByDate, this.store.surchargeList);
+              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

@@ -1,7 +1,7 @@
 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

package/dist/modules/Summary/utils.js

@@ -16,7 +16,9 @@ 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) {
+import { isNormalProduct } from "../Product/utils";
+import dayjs from 'dayjs';
+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 +32,7 @@ export var calculatePriceDetails = function calculatePriceDetails(shopInfo, item
     isEdit: false,
     isInScheduleByDate: isInScheduleByDate,
     surcharge_list: surchargeList,
-    scheduleById: {}
+    scheduleById: scheduleById
   });
   // 订单附加费金额
   var surchargeAmount = new Decimal(getSurchargeAmount({
@@ -736,12 +738,8 @@ var getMainProductTotal = function getMainProductTotal(item) {
       var bundleItem = _step4.value;
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
         var _ref10, _bundleItem$bundle_se2;
-        // 子商品折扣金额
-        var discountAmount = getDiscountAmount(bundleItem.discount_list);
-        // 子商品价格
-        var bundleItemPrice = new Decimal((_ref10 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
-        // todo: 套餐子商品后不需要处理 子商品价格 - 子商品折扣金额
-        var bundleItemTotal = bundleItemPrice.minus(discountAmount);
+        // IMPORTANT: 套餐子商品如果应用了 discount，bundle_selling_price和 price 其实都已经是折后价格了，不需要单独再减一次
+        var bundleItemTotal = new Decimal((_ref10 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
         total = total.add(bundleItemTotal);
       }
     }
@@ -862,6 +860,7 @@ var isProductMatchSurchargeCondition = function isProductMatchSurchargeCondition
  * @returns 附加费列表（仅返回金额 > 0 的项）
  */
 export var getSurcharge = function getSurcharge(_ref11, options) {
+  var _service$filter;
   var service = _ref11.service,
     addons = _ref11.addons,
     bookingDetail = _ref11.bookingDetail,
@@ -870,6 +869,16 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
     isInScheduleByDate = options.isInScheduleByDate,
     surcharge_list = options.surcharge_list,
     scheduleById = options.scheduleById;
+  // 在所有商品里试着找 start_date，如果没有则用当前时间
+  var firstAppointmentCartItem = (_service$filter = service.filter(function (n) {
+    return !isNormalProduct(n._productOrigin);
+  })) === null || _service$filter === void 0 ? void 0 : _service$filter[0];
+  var startDate = '';
+  if (firstAppointmentCartItem) {
+    startDate = firstAppointmentCartItem.start_date + ' ' + firstAppointmentCartItem.start_time + ':00';
+  } else {
+    startDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+  }
   // 编辑状态, 且未修改商品时直接从详情取出
   if (!isEdit && bookingId) {
     if (Array.isArray(bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.surcharge)) {
@@ -936,7 +945,7 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
           // 主商品符合附加费条件
           if (isProductMatchSurchargeCondition({
             isCustomItem: item.isCustomItem,
-            startDate: (item === null || item === void 0 ? void 0 : item.startDate) || '',
+            startDate: startDate,
             product_id: item.id
           }, {
             surchargeConfig: surchargeConfig,
@@ -970,7 +979,7 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
               // bundle商品是原价且符合附加费条件
               if (getBundleItemIsOriginalPrice(bundleItem) && isProductMatchSurchargeCondition({
                 isCustomItem: false,
-                startDate: item.startDate,
+                startDate: startDate,
                 product_id: bundleItem._bundle_product_id
               }, {
                 surchargeConfig: surchargeConfig,
@@ -1002,7 +1011,7 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
               var relationDetail = _step7.value;
               if (isProductMatchSurchargeCondition({
                 isCustomItem: false,
-                startDate: item.startDate,
+                startDate: startDate,
                 product_id: relationDetail.product_id
               }, {
                 surchargeConfig: surchargeConfig,
@@ -1039,7 +1048,9 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
       try {
         for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
           var _item = _step8.value;
-          if (isProductMatchSurchargeCondition(_item, {
+          if (isProductMatchSurchargeCondition(_objectSpread(_objectSpread({}, _item), {}, {
+            startDate: startDate
+          }), {
             surchargeConfig: surchargeConfig,
             scheduleById: scheduleById || {},
             isInScheduleByDate: isInScheduleByDate

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

@@ -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/Summary/index.js

@@ -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,
@@ -74,14 +74,18 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     this.store.surchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
   }
   async getSummary(cartItems) {
-    var _a, _b;
+    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,
-      import_Schedule.ScheduleModule.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;
   }
@@ -115,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

@@ -1,7 +1,7 @@
 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

package/lib/modules/Summary/utils.js

@@ -43,11 +43,13 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
-var calculatePriceDetails = (shopInfo, items, isInScheduleByDate, surchargeList) => {
+var import_utils = require("../Product/utils");
+var import_dayjs = __toESM(require("dayjs"));
+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: {
@@ -456,9 +458,7 @@ var getMainProductTotal = (item) => {
   }
   for (let bundleItem of (item == null ? void 0 : item.bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-      const discountAmount = getDiscountAmount(bundleItem.discount_list);
-      const bundleItemPrice = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
-      const bundleItemTotal = bundleItemPrice.minus(discountAmount);
+      const bundleItemTotal = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
       total = total.add(bundleItemTotal);
     }
   }
@@ -522,8 +522,17 @@ var isProductMatchSurchargeCondition = (item, options) => {
   return isProductMatch && isScheduleMatch;
 };
 var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const { isEdit, isInScheduleByDate, surcharge_list, scheduleById } = options;
+  const firstAppointmentCartItem = (_a = service.filter(
+    (n) => !(0, import_utils.isNormalProduct)(n._productOrigin)
+  )) == null ? void 0 : _a[0];
+  let startDate = "";
+  if (firstAppointmentCartItem) {
+    startDate = firstAppointmentCartItem.start_date + " " + firstAppointmentCartItem.start_time + ":00";
+  } else {
+    startDate = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+  }
   if (!isEdit && bookingId) {
     if (Array.isArray(bookingDetail == null ? void 0 : bookingDetail.surcharge)) {
       return ((bookingDetail == null ? void 0 : bookingDetail.surcharge) || []).filter((d) => Number(d.amount) > 0).map(
@@ -570,7 +579,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
         if (isProductMatchSurchargeCondition(
           {
             isCustomItem: item.isCustomItem,
-            startDate: (item == null ? void 0 : item.startDate) || "",
+            startDate,
             product_id: item.id
           },
           {
@@ -602,7 +611,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
           if (getBundleItemIsOriginalPrice(bundleItem) && isProductMatchSurchargeCondition(
             {
               isCustomItem: false,
-              startDate: item.startDate,
+              startDate,
               product_id: bundleItem._bundle_product_id
             },
             {
@@ -628,7 +637,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
           if (isProductMatchSurchargeCondition(
             {
               isCustomItem: false,
-              startDate: item.startDate,
+              startDate,
               product_id: relationDetail.product_id
             },
             {
@@ -640,7 +649,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
             matchedItems.push({
               isMain: false,
               total: Number(
-                (relationDetail == null ? void 0 : relationDetail.price) || ((_a = relationDetail == null ? void 0 : relationDetail.metadata) == null ? void 0 : _a.main_product_attached_bundle_selling_price)
+                (relationDetail == null ? void 0 : relationDetail.price) || ((_b = relationDetail == null ? void 0 : relationDetail.metadata) == null ? void 0 : _b.main_product_attached_bundle_selling_price)
               ),
               quantity: relationDetail.num || relationDetail.quantity || 1,
               item: relationDetail,
@@ -653,7 +662,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
     }
     if (Array.isArray(addons == null ? void 0 : addons.value)) {
       for (let item of addons.value) {
-        if (isProductMatchSurchargeCondition(item, {
+        if (isProductMatchSurchargeCondition({ ...item, startDate }, {
           surchargeConfig,
           scheduleById: scheduleById || {},
           isInScheduleByDate
@@ -714,13 +723,13 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
               const surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
               productTotalSurcharge = productTotalSurcharge.plus(new import_decimal.default(surchargeFee).times(itemQuantity).toNumber());
               item.item.surcharge_fee = surchargeFee;
-              item.item.relation_surcharge_ids = [...((_b = item.item) == null ? void 0 : _b.relation_surcharge_ids) || [], id];
+              item.item.relation_surcharge_ids = [...((_c = item.item) == null ? void 0 : _c.relation_surcharge_ids) || [], id];
             } else {
               const originSurchargeFee = new import_decimal.default(item.item.surcharge_fee || 0);
               const surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
               productTotalSurcharge = productTotalSurcharge.plus(new import_decimal.default(surchargeFee).times(itemQuantity).toNumber());
               item.item.surcharge_fee = surchargeFee;
-              item.item.relation_surcharge_ids = [...((_c = item.item) == null ? void 0 : _c.relation_surcharge_ids) || [], id];
+              item.item.relation_surcharge_ids = [...((_d = item.item) == null ? void 0 : _d.relation_surcharge_ids) || [], id];
             }
           }
           if (isLast && configTotal.minus(productTotalSurcharge).gt(0)) {

package/package.json

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