@pisell/pisellos 3.0.40 → 3.0.42

package/dist/modules/Cart/utils/changePrice.d.ts

@@ -0,0 +1,3 @@
+import { Product } from "../../Product";
+import { CartItem, IUpdateItemParams } from "../types";
+export declare function updateAllCartItemPrice(cartItems: CartItem[], priceData: any, getProduct: (id: number) => Promise<Product | undefined>, updateCart: (item: IUpdateItemParams) => void): Promise<void>;

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

@@ -0,0 +1,104 @@
+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 _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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _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 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); }); }; }
+import Decimal from "decimal.js";
+export function updateAllCartItemPrice(_x, _x2, _x3, _x4) {
+  return _updateAllCartItemPrice.apply(this, arguments);
+}
+function _updateAllCartItemPrice() {
+  _updateAllCartItemPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(cartItems, priceData, getProduct, updateCart) {
+    var _iterator, _step, _loop;
+    return _regeneratorRuntime().wrap(function _callee$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _iterator = _createForOfIteratorHelper(cartItems);
+          _context2.prev = 1;
+          _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
+            var _bundle;
+            var item, targetProduct, cartProduct, productInfo, bundle;
+            return _regeneratorRuntime().wrap(function _loop$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  item = _step.value;
+                  targetProduct = priceData.find(function (n) {
+                    return n.id === item.id;
+                  });
+                  _context.next = 4;
+                  return getProduct(item.id);
+                case 4:
+                  cartProduct = _context.sent;
+                  productInfo = cartProduct === null || cartProduct === void 0 ? void 0 : cartProduct.getData();
+                  bundle = item._bundleOrigin;
+                  productInfo.price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.price;
+                  productInfo.base_price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.base_price;
+                  bundle = (_bundle = bundle) === null || _bundle === void 0 ? void 0 : _bundle.map(function (n) {
+                    var _targetProduct$bundle;
+                    // 更新 bundle 的价格
+                    var targetBundle = targetProduct === null || targetProduct === void 0 || (_targetProduct$bundle = targetProduct.bundle_group) === null || _targetProduct$bundle === void 0 ? void 0 : _targetProduct$bundle.find(function (m) {
+                      return m.id === n.group_id;
+                    });
+                    if (targetBundle) {
+                      var targetBundleItem = targetBundle.bundle_item.find(function (m) {
+                        return m.id === n.id;
+                      });
+                      if (targetBundleItem.price_type === 'markdown') {
+                        targetBundleItem.price = new Decimal(targetBundleItem.price || 0).mul(-1).toNumber();
+                      }
+                      if (targetBundleItem) {
+                        return _objectSpread(_objectSpread({}, n), {}, {
+                          price: targetBundleItem.price,
+                          base_price: targetBundleItem.base_price
+                        });
+                      }
+                    }
+                    return n;
+                  });
+                  updateCart({
+                    _id: item._id,
+                    product: productInfo,
+                    bundle: bundle
+                  });
+                case 11:
+                case "end":
+                  return _context.stop();
+              }
+            }, _loop);
+          });
+          _iterator.s();
+        case 4:
+          if ((_step = _iterator.n()).done) {
+            _context2.next = 8;
+            break;
+          }
+          return _context2.delegateYield(_loop(), "t0", 6);
+        case 6:
+          _context2.next = 4;
+          break;
+        case 8:
+          _context2.next = 13;
+          break;
+        case 10:
+          _context2.prev = 10;
+          _context2.t1 = _context2["catch"](1);
+          _iterator.e(_context2.t1);
+        case 13:
+          _context2.prev = 13;
+          _iterator.f();
+          return _context2.finish(13);
+        case 16:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee, null, [[1, 10, 13, 16]]);
+  }));
+  return _updateAllCartItemPrice.apply(this, arguments);
+}

package/dist/modules/Date/index.js

@@ -121,11 +121,11 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
     key: "fetchResourceDates",
     value: function () {
       var _fetchResourceDates = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var url, query, fetchUrl, _ref, start_date, end_date, resource_ids, res;
+        var url, query, _params$useCache, useCache, fetchUrl, _ref, start_date, end_date, resource_ids, res;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              url = params.url, query = params.query;
+              url = params.url, query = params.query, _params$useCache = params.useCache, useCache = _params$useCache === void 0 ? true : _params$useCache;
               fetchUrl = url || '/schedule/resource/list';
               _ref = query || {}, start_date = _ref.start_date, end_date = _ref.end_date, resource_ids = _ref.resource_ids;
               _context3.prev = 3;
@@ -134,9 +134,9 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
                 start_date: start_date,
                 end_date: end_date,
                 resource_ids: resource_ids,
-                front_end_cache_id: this.cacheId
+                front_end_cache_id: useCache && this.cacheId
               }, {
-                useCache: true
+                useCache: useCache
               });
             case 6:
               res = _context3.sent;

package/dist/modules/Date/types.d.ts

@@ -43,6 +43,8 @@ export interface DateModuleAPI {
 }
 export interface IGetAvailableTimeListParams {
     url?: string;
+    /** 是否使用缓存 */
+    useCache?: boolean;
     /** 查询参数 */
     query?: {
         /** 开始日期 */

package/dist/modules/Schedule/utils.js

@@ -140,7 +140,11 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
     for (var i = 0; i < frequency_date.length; i++) {
       var item = frequency_date[i];
       var _start = startTmp.day(item);
+      // 如果周结束的那一天还超过了deadline，则需要把_end置为deadline
       var _end = _start.add(scheduleDiff, 'second');
+      if (_end.isAfter(deadline, 'day')) {
+        _end = deadline;
+      }
       if (isGetRange) {
         if (excludedDaysMap.has(_start.format('YYYY-MM-DD'))) {
           startTmp = startTmp.day(1).add(frequency, 'day');

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

@@ -86,6 +86,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getCart(): CartItem[];
     getAvailableDate(params?: {
         url?: string;
+        useCache?: boolean;
         products?: ProductData[];
         startDate?: string;
         endDate?: string;

package/dist/solution/BookingByStep/index.js

@@ -279,7 +279,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
         var _schedule$product_ids;
-        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, schedule, otherProductsIds, allProductIds;
+        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, newProductIds, schedule, otherProductsIds, allProductIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -296,11 +296,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 week: '',
                 weekNum: 0
               }]);
-              // const scheduleIds = scheduleList
+              newProductIds = []; // const scheduleIds = scheduleList
               //   .filter((n) => n.date === date)
               //   .flatMap((n) => n.schedule_id)
               //   .filter((n) => n !== null && n !== undefined);
-
               // 如果外面没传 product_ids，尝试从对应 schedule 里拿 product_ids
               // if (!product_ids?.length) {
               //   const schedule = scheduleList.find((n) => n.date === date);
@@ -313,23 +312,23 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 return n.date === date;
               });
               if (schedule && (_schedule$product_ids = schedule.product_ids) !== null && _schedule$product_ids !== void 0 && _schedule$product_ids.length) {
-                product_ids = schedule.product_ids;
+                newProductIds = schedule.product_ids;
               }
               // 尝试去拿schedule 里的 other_product_ids 和 product_ids 拼在一起去重
               otherProductsIds = this.store.schedule.getOtherProductsIds() || [];
-              allProductIds = [].concat(_toConsumableArray(product_ids), _toConsumableArray(otherProductsIds)).filter(function (n, index, self) {
+              allProductIds = [].concat(_toConsumableArray(newProductIds), _toConsumableArray(otherProductsIds)).filter(function (n, index, self) {
                 return self.indexOf(n) === index;
               });
-              _context3.next = 9;
+              _context3.next = 10;
               return this.loadProducts({
                 // schedule_ids: scheduleIds,
                 product_ids: allProductIds,
                 category_ids: category_ids,
                 schedule_date: date
               });
-            case 9:
-              return _context3.abrupt("return", _context3.sent);
             case 10:
+              return _context3.abrupt("return", _context3.sent);
+            case 11:
             case "end":
               return _context3.stop();
           }
@@ -870,6 +869,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           startDate,
           endDate,
           type,
+          _params$useCache,
+          useCache,
           tempProducts,
           dateRange,
           tempStartDate,
@@ -885,7 +886,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             case 0:
               params = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
               // 开始日期如果小于今天，直接以今天当做开始日期
-              products = params.products, startDate = params.startDate, endDate = params.endDate, type = params.type; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
+              products = params.products, startDate = params.startDate, endDate = params.endDate, type = params.type, _params$useCache = params.useCache, useCache = _params$useCache === void 0 ? true : _params$useCache; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
               if (dayjs(startDate).isBefore(dayjs(), 'day') && (dayjs(endDate).isAfter(dayjs(), 'day') || dayjs(endDate).isSame(dayjs(), 'day'))) {
                 startDate = dayjs().format('YYYY-MM-DD');
               }
@@ -927,7 +928,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   resource_ids: resourceIds
                 },
                 rules: rules,
-                type: type
+                type: type,
+                useCache: useCache
               });
             case 15:
               res = _context15.sent;
@@ -2649,6 +2651,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             _this13.store.cart.removeItem(n._id);
           });
         }
+        // 如果 date.startTime 和 dateRange 里的 startTime 不一样，需要修正 dateRange
+        var dateRange = this.store.date.getDateRange();
+        if (dateRange !== null && dateRange !== void 0 && dateRange[0] && !dayjs(dateRange[0].date).isSame(dayjs(date.startTime), 'day')) {
+          this.setDateRange([{
+            date: dayjs(date.startTime).format('YYYY-MM-DD'),
+            status: 'available',
+            week: '',
+            weekNum: 0
+          }, {
+            date: dayjs(date.endTime).format('YYYY-MM-DD'),
+            status: 'available',
+            week: '',
+            weekNum: 0
+          }]);
+        }
       }
     }
   }, {
@@ -3138,7 +3155,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                       });
 
                       // 如果 firstAvailableDate 距离 startDate 大于 14 天了，则后面就不需要再找了，也是一种性能保护
-                      if (!(firstAvailableDate && dayjs(currentDate).diff(dayjs(startDate), 'day') > 14)) {
+                      if (!(firstAvailableDate && dayjs(currentDate).diff(dayjs(startDate), 'day') > 31)) {
                         _context31.next = 9;
                         break;
                       }

package/lib/modules/Cart/utils/changePrice.d.ts

@@ -0,0 +1,3 @@
+import { Product } from "../../Product";
+import { CartItem, IUpdateItemParams } from "../types";
+export declare function updateAllCartItemPrice(cartItems: CartItem[], priceData: any, getProduct: (id: number) => Promise<Product | undefined>, updateCart: (item: IUpdateItemParams) => void): Promise<void>;

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

@@ -0,0 +1,78 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Cart/utils/changePrice.ts
+var changePrice_exports = {};
+__export(changePrice_exports, {
+  updateAllCartItemPrice: () => updateAllCartItemPrice
+});
+module.exports = __toCommonJS(changePrice_exports);
+var import_decimal = __toESM(require("decimal.js"));
+async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCart) {
+  for (const item of cartItems) {
+    const targetProduct = priceData.find((n) => n.id === item.id);
+    const cartProduct = await getProduct(
+      item.id
+    );
+    const productInfo = cartProduct == null ? void 0 : cartProduct.getData();
+    let bundle = item._bundleOrigin;
+    productInfo.price = targetProduct == null ? void 0 : targetProduct.price;
+    productInfo.base_price = targetProduct == null ? void 0 : targetProduct.base_price;
+    bundle = bundle == null ? void 0 : bundle.map((n) => {
+      var _a;
+      const targetBundle = (_a = targetProduct == null ? void 0 : targetProduct.bundle_group) == null ? void 0 : _a.find(
+        (m) => m.id === n.group_id
+      );
+      if (targetBundle) {
+        const targetBundleItem = targetBundle.bundle_item.find(
+          (m) => m.id === n.id
+        );
+        if (targetBundleItem.price_type === "markdown") {
+          targetBundleItem.price = new import_decimal.default(targetBundleItem.price || 0).mul(-1).toNumber();
+        }
+        if (targetBundleItem) {
+          return {
+            ...n,
+            price: targetBundleItem.price,
+            base_price: targetBundleItem.base_price
+          };
+        }
+      }
+      return n;
+    });
+    updateCart({
+      _id: item._id,
+      product: productInfo,
+      bundle
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  updateAllCartItemPrice
+});

package/lib/modules/Date/index.js

@@ -69,7 +69,7 @@ var DateModule = class extends import_BaseModule.BaseModule {
     this.store.dateList = dateList;
   }
   async fetchResourceDates(params) {
-    const { url, query } = params;
+    const { url, query, useCache = true } = params;
     const fetchUrl = url || "/schedule/resource/list";
     const { start_date, end_date, resource_ids } = query || {};
     try {
@@ -77,9 +77,9 @@ var DateModule = class extends import_BaseModule.BaseModule {
         start_date,
         end_date,
         resource_ids,
-        front_end_cache_id: this.cacheId
+        front_end_cache_id: useCache && this.cacheId
       }, {
-        useCache: true
+        useCache
       });
       return res;
     } catch (error) {

package/lib/modules/Date/types.d.ts

@@ -43,6 +43,8 @@ export interface DateModuleAPI {
 }
 export interface IGetAvailableTimeListParams {
     url?: string;
+    /** 是否使用缓存 */
+    useCache?: boolean;
     /** 查询参数 */
     query?: {
         /** 开始日期 */

package/lib/modules/Schedule/utils.js

@@ -140,7 +140,10 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
     for (let i = 0; i < frequency_date.length; i++) {
       const item = frequency_date[i];
       const _start = startTmp.day(item);
-      const _end = _start.add(scheduleDiff, "second");
+      let _end = _start.add(scheduleDiff, "second");
+      if (_end.isAfter(deadline, "day")) {
+        _end = deadline;
+      }
       if (isGetRange) {
         if (excludedDaysMap.has(_start.format("YYYY-MM-DD"))) {
           startTmp = startTmp.day(1).add(frequency, "day");

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

@@ -86,6 +86,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getCart(): CartItem[];
     getAvailableDate(params?: {
         url?: string;
+        useCache?: boolean;
         products?: ProductData[];
         startDate?: string;
         endDate?: string;

package/lib/solution/BookingByStep/index.js

@@ -219,12 +219,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       { date, status: "available", week: "", weekNum: 0 },
       { date, status: "available", week: "", weekNum: 0 }
     ]);
+    let newProductIds = [];
     const schedule = scheduleList.find((n) => n.date === date);
     if (schedule && ((_a = schedule.product_ids) == null ? void 0 : _a.length)) {
-      product_ids = schedule.product_ids;
+      newProductIds = schedule.product_ids;
     }
     const otherProductsIds = this.store.schedule.getOtherProductsIds() || [];
-    const allProductIds = [...product_ids, ...otherProductsIds].filter(
+    const allProductIds = [...newProductIds, ...otherProductsIds].filter(
       (n, index, self) => self.indexOf(n) === index
     );
     return await this.loadProducts({
@@ -468,7 +469,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 获取商品/服务的可用日期
   async getAvailableDate(params = {}) {
     var _a, _b, _c;
-    let { products, startDate, endDate, type } = params;
+    let { products, startDate, endDate, type, useCache = true } = params;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
@@ -505,7 +506,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         resource_ids: resourceIds
       },
       rules,
-      type
+      type,
+      useCache
     });
     return res;
   }
@@ -1846,6 +1848,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           this.store.cart.removeItem(n._id);
         });
       }
+      const dateRange = this.store.date.getDateRange();
+      if ((dateRange == null ? void 0 : dateRange[0]) && !(0, import_dayjs.default)(dateRange[0].date).isSame((0, import_dayjs.default)(date.startTime), "day")) {
+        this.setDateRange([
+          { date: (0, import_dayjs.default)(date.startTime).format("YYYY-MM-DD"), status: "available", week: "", weekNum: 0 },
+          { date: (0, import_dayjs.default)(date.endTime).format("YYYY-MM-DD"), status: "available", week: "", weekNum: 0 }
+        ]);
+      }
     }
   }
   setOtherData(key, value) {
@@ -2210,7 +2219,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         weekNum: (0, import_dayjs.default)(currentDate).day(),
         status
       });
-      if (firstAvailableDate && (0, import_dayjs.default)(currentDate).diff((0, import_dayjs.default)(startDate), "day") > 14) {
+      if (firstAvailableDate && (0, import_dayjs.default)(currentDate).diff((0, import_dayjs.default)(startDate), "day") > 31) {
         break;
       }
       currentDate = (0, import_dayjs.default)(currentDate).add(1, "day");

package/package.json

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