@pisell/pisellos 2.0.70 → 2.0.72

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

@@ -12,6 +12,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import Decimal from 'decimal.js';
 import { isNormalProduct } from "../../Product/utils";
+import { getDiscountAmount } from "../../../solution/ShopDiscount/utils";
 
 /**
  * @title 处理组合商品
@@ -192,8 +193,14 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
       // 不是商品券则代表折扣卡，计算打折后的价格
       // 一个商品折扣卡只能存在于一张
       if (currentValue.type !== 'good_pass') {
-        var discountPrice = new Decimal(100).minus(currentValue.discount.percent || 0).div(100).mul(new Decimal(price || 0)).toFixed(2);
-        price = Number(discountPrice);
+        var _currentValue$discoun;
+        price = getDiscountAmount({
+          tag: currentValue.type,
+          par_value: currentValue.discount.percent,
+          metadata: {
+            discount_card_type: currentValue === null || currentValue === void 0 || (_currentValue$discoun = currentValue.discount) === null || _currentValue$discoun === void 0 ? void 0 : _currentValue$discoun.discount_card_type
+          }
+        }, price, price);
       }
     });
   }

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

@@ -17,6 +17,23 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     getDateList(): ITime[];
     setDateList(dateList: ITime[]): void;
     fetchResourceDates(params: IGetAvailableTimeListParams): Promise<any>;
+    /**
+     * 将时间向上取整到下一个10分钟整数
+     *
+     * @param time dayjs 时间对象
+     * @returns 向上取整后的时间字符串 (YYYY-MM-DD HH:mm 格式)
+     */
+    private roundUpToNext10Minutes;
+    /**
+     * 校正资源时间段数据
+     *
+     * 如果时间段的 start_at 早于资源的 start_time，将其同步为 start_time 的下一个10分钟整数
+     * 如果修正后 end_at 也早于修正后的 start_time，则删除该时间段
+     *
+     * @param resourcesData 资源数据数组
+     * @returns 校正后的资源数据数组
+     */
+    private correctResourceTimeSlots;
     getResourceAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     clearDateRange(): void;
     storeChange(): void;

package/dist/modules/Date/index.js

@@ -1,4 +1,6 @@
 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 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -21,6 +23,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import dayjs from 'dayjs';
 import { BaseModule } from "../BaseModule";
 import { disableAllDates, generateMonthDates, handleAvailableDateByResource, handleAvailableDatesByRules } from "./utils";
 import cloneDeep from 'lodash-es/cloneDeep';
@@ -204,22 +207,111 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
               res = _context3.sent;
+              // 校正资源时间段数据
+              if (res !== null && res !== void 0 && res.data && Array.isArray(res.data)) {
+                res.data = this.correctResourceTimeSlots(res.data);
+              }
               return _context3.abrupt("return", res);
-            case 10:
-              _context3.prev = 10;
+            case 11:
+              _context3.prev = 11;
               _context3.t0 = _context3["catch"](3);
               console.error(_context3.t0);
-            case 13:
+            case 14:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[3, 10]]);
+        }, _callee3, this, [[3, 11]]);
       }));
       function fetchResourceDates(_x4) {
         return _fetchResourceDates.apply(this, arguments);
       }
       return fetchResourceDates;
     }()
+    /**
+     * 将时间向上取整到下一个10分钟整数
+     * 
+     * @param time dayjs 时间对象
+     * @returns 向上取整后的时间字符串 (YYYY-MM-DD HH:mm 格式)
+     */
+  }, {
+    key: "roundUpToNext10Minutes",
+    value: function roundUpToNext10Minutes(time) {
+      var minutes = time.minute();
+      var remainder = minutes % 10;
+      if (remainder === 0) {
+        // 如果已经是10分钟的整数，保持不变
+        return time.format('YYYY-MM-DD HH:mm');
+      } else {
+        // 向上取整到下一个10分钟
+        var minutesToAdd = 10 - remainder;
+        var roundedTime = time.add(minutesToAdd, 'minute');
+        return roundedTime.format('YYYY-MM-DD HH:mm');
+      }
+    }
+
+    /**
+     * 校正资源时间段数据
+     * 
+     * 如果时间段的 start_at 早于资源的 start_time，将其同步为 start_time 的下一个10分钟整数
+     * 如果修正后 end_at 也早于修正后的 start_time，则删除该时间段
+     * 
+     * @param resourcesData 资源数据数组
+     * @returns 校正后的资源数据数组
+     */
+  }, {
+    key: "correctResourceTimeSlots",
+    value: function correctResourceTimeSlots(resourcesData) {
+      var _this2 = this;
+      return resourcesData.map(function (resource) {
+        // 检查资源是否有 times 数组和 start_time
+        if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
+          return resource;
+        }
+        // 如果resource.advanced 为 null 或者 resource.advanced.unit 为 0，则不进行修正
+        if (!resource.advanced || resource.advanced.unit === 0) {
+          return resource;
+        }
+        var resourceStartTime = dayjs(resource.start_time);
+
+        // 过滤和修正时间段
+        var correctedTimes = resource.times.map(function (timeSlot) {
+          if (!timeSlot.start_at || !timeSlot.end_at) {
+            return timeSlot;
+          }
+          var startAt = dayjs(timeSlot.start_at);
+          var endAt = dayjs(timeSlot.end_at);
+
+          // 如果 start_at 早于资源的 start_time，需要修正
+          if (startAt.isBefore(resourceStartTime)) {
+            // 将 start_time 向上取整到下一个10分钟整数
+            var roundedStartTime = _this2.roundUpToNext10Minutes(resourceStartTime);
+            var roundedStartTimeDayjs = dayjs(roundedStartTime);
+            console.log("[DateModule] \u4FEE\u6B63\u65F6\u95F4\u6BB5\u5F00\u59CB\u65F6\u95F4: ".concat(timeSlot.start_at, " -> ").concat(roundedStartTime, " (\u8D44\u6E90ID: ").concat(resource.id, ", \u539F\u59CBstart_time: ").concat(resource.start_time, ")"));
+
+            // 将 start_at 修正为向上取整后的时间
+            var correctedTimeSlot = _objectSpread(_objectSpread({}, timeSlot), {}, {
+              start_at: roundedStartTime
+            });
+
+            // 检查修正后的 end_at 是否也早于修正后的 start_time
+            if (endAt.isBefore(roundedStartTimeDayjs)) {
+              console.log("[DateModule] \u65F6\u95F4\u6BB5\u65E0\u6548\uFF0C\u5C06\u88AB\u5220\u9664: ".concat(timeSlot.start_at, " - ").concat(timeSlot.end_at, " (\u8D44\u6E90ID: ").concat(resource.id, ", \u4FEE\u6B63\u540Estart_time: ").concat(roundedStartTime, ")"));
+              return null; // 标记为删除
+            }
+            return correctedTimeSlot;
+          }
+
+          // 不需要修正的时间段直接返回
+          return timeSlot;
+        }).filter(function (timeSlot) {
+          return timeSlot !== null;
+        }); // 过滤掉被删除的时间段
+
+        return _objectSpread(_objectSpread({}, resource), {}, {
+          times: correctedTimes
+        });
+      });
+    }
   }, {
     key: "getResourceAvailableTimeList",
     value: function () {

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

@@ -70,6 +70,9 @@ export interface Discount {
     limited_relation_product_data: Limitedrelationproductdata;
     balance: string;
     format_title: Formattitle;
+    metadata?: {
+        discount_card_type?: 'fixed_amount' | 'percent';
+    };
     product: Product;
     type: "product" | 'good_pass';
     resource_id?: number;

package/dist/modules/Order/index.js

@@ -5,6 +5,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 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; }
+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 _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); }); }; }
@@ -61,7 +63,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrder",
     value: function createOrder(params) {
-      var order = {
+      var order = _objectSpread({
         type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
         platform: (params === null || params === void 0 ? void 0 : params.platform) === 'pc' ? 'PC' : 'H5',
@@ -73,7 +75,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         is_deposit: 0,
         relation_products: [],
         relation_forms: []
-      };
+      }, (params === null || params === void 0 ? void 0 : params.extraData) || {});
       var is_deposit = 0; // 是否存在定金，0 不存在，1 存在
       if (params.cartItems.length > 0) {
         params.cartItems.forEach(function (item) {

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

@@ -16,6 +16,7 @@ export interface CommitOrderParams {
         cartItems: CartItem[];
         type: 'virtual' | 'appointment_booking';
         platform?: 'pc' | 'h5';
+        extraData?: Record<string, any>;
     };
 }
 /**

package/dist/modules/ProductList/index.js

@@ -132,7 +132,8 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 schedule_date: schedule_date,
                 with_schedule: with_schedule,
                 schedule_datetime: schedule_datetime,
-                application_code: (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel
+                application_code: (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel,
+                is_eject: 1
               }, {
                 useCache: true
               });
@@ -141,9 +142,16 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
               });
+              if (sortedList.length) {
+                sortedList.forEach(function (n) {
+                  if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
+                    n.is_eject = 1;
+                  }
+                });
+              }
               this.addProduct(sortedList);
               return _context3.abrupt("return", sortedList);
-            case 10:
+            case 11:
             case "end":
               return _context3.stop();
           }

package/dist/modules/Rules/index.js

@@ -25,7 +25,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
 import { RulesHooks } from "./types";
-import { uniqueById } from "../../solution/ShopDiscount/utils";
+import { uniqueById, getDiscountAmount } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
@@ -189,8 +189,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       });
 
       // 优惠力度排序，传进来的数据里可能有商品券，也可能有优惠券
-      // 商品券（n.tag=good_pass）视为最优惠（免费），折扣券（n.tag=product_discount_card）按照n.par_value排序
-      // 如果最后拍出来商品券有多个，或者说没有商品券，但是有多个相同折扣的折扣券（比如 6 折券有 3张），则按照过期时间(n.expire_time)排序
+      // 1. 商品券（n.tag=good_pass）视为最优惠（免费）
+      // 2. 折扣券（n.tag=product_discount_card）按照新的优先级排序：
+      //    - 固定金额优先于百分比（固定金额 > 百分比）
+      //    - 固定金额内部：金额越大越优先
+      //    - 百分比内部：折扣越大越优先（par_value越小越优先）
+      // 3. 相同类型和金额的情况下，按照过期时间(n.expire_time)排序
       var sortedDiscountList = _toConsumableArray(filteredDiscountList).sort(function (a, b) {
         // 1. 商品券优先级最高
         if (a.tag === 'good_pass' && b.tag !== 'good_pass') return -1;
@@ -201,13 +205,34 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 都是商品券，按照过期时间排序
           return compareByExpireTime(a, b);
         } else if (a.tag === 'product_discount_card' && b.tag === 'product_discount_card') {
-          // 都是折扣券，按照par_value排序（折扣越大越优先，即par_value越小越优先）
-          if (a.par_value !== b.par_value) {
-            var valueA = new Decimal(100).minus(a.par_value || 0);
-            var valueB = new Decimal(100).minus(b.par_value || 0);
-            return valueA.minus(valueB).toNumber();
+          var _a$metadata, _b$metadata;
+          // 都是折扣券，按照新的优先级排序：固定金额优先于百分比
+          var typeA = ((_a$metadata = a.metadata) === null || _a$metadata === void 0 ? void 0 : _a$metadata.discount_card_type) || 'percent'; // 默认为百分比
+          var typeB = ((_b$metadata = b.metadata) === null || _b$metadata === void 0 ? void 0 : _b$metadata.discount_card_type) || 'percent'; // 默认为百分比
+
+          // 1. 固定金额优先于百分比
+          if (typeA === 'fixed_amount' && typeB === 'percent') return -1;
+          if (typeA === 'percent' && typeB === 'fixed_amount') return 1;
+
+          // 2. 都是固定金额时，金额越大越优先
+          if (typeA === 'fixed_amount' && typeB === 'fixed_amount') {
+            if (a.par_value !== b.par_value) {
+              var valueA = new Decimal(a.par_value || 0);
+              var valueB = new Decimal(b.par_value || 0);
+              return valueB.minus(valueA).toNumber(); // 金额大的在前
+            }
           }
-          // 相同折扣的情况下，按照过期时间排序
+
+          // 3. 都是百分比时，折扣越大越优先（par_value越小越优先）
+          if (typeA === 'percent' && typeB === 'percent') {
+            if (a.par_value !== b.par_value) {
+              var _valueA = new Decimal(100).minus(a.par_value || 0);
+              var _valueB = new Decimal(100).minus(b.par_value || 0);
+              return _valueB.minus(_valueA).toNumber(); // 折扣大的在前
+            }
+          }
+
+          // 相同类型和金额的情况下，按照过期时间排序
           return compareByExpireTime(a, b);
         }
 
@@ -291,7 +316,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 判断优惠券是否适用于该商品
           if (isAvailableProduct && isLimitedProduct) {
-            var _discountApplicabilit;
+            var _discountApplicabilit, _discount$metadata;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
 
@@ -303,6 +328,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               type: discountType,
               tag: discountType,
               discount: {
+                discount_card_type: discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type,
+                fixed_amount: product.price,
                 resource_id: discount.id,
                 title: discount.format_title,
                 original_amount: product.origin_total,
@@ -435,7 +462,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }));
         }
         for (var i = 0; i < splitCount; i++) {
-          var _product$discount_lis11, _originProduct$_produ;
+          var _product$discount_lis11, _originProduct$_produ, _selectedDiscount$met;
           // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
           var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
           // 标记优惠券为已使用
@@ -456,12 +483,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total
-          var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(productOriginTotal).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(productOriginTotal)).toNumber();
+          var targetProductTotal = getDiscountAmount(_selectedDiscount, productOriginTotal, product.price);
           var discountType = _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag;
           var discountDetail = {
             amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).toNumber(),
             type: discountType,
             discount: {
+              discount_card_type: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met = _selectedDiscount.metadata) === null || _selectedDiscount$met === void 0 ? void 0 : _selectedDiscount$met.discount_card_type,
+              fixed_amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).toNumber(),
               resource_id: _selectedDiscount.id,
               title: _selectedDiscount.format_title,
               original_amount: productOriginTotal,

package/dist/plugins/request.d.ts

@@ -49,6 +49,7 @@ export interface RequestOptions {
     responseType?: 'json' | 'text' | 'arraybuffer' | 'blob';
     withCredentials?: boolean;
     useCache?: boolean;
+    customToast?: () => void;
 }
 /**
  * 响应接口

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

@@ -166,7 +166,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @returns boolean
      */
     checkBeforeSubmitOrder(type: 'holder' | 'account'): boolean;
-    submitOrder(): Promise<void>;
+    submitOrder(extraData?: Record<string, any>): Promise<void>;
     pay(): Promise<void>;
     getPayInfo(): Promise<void>;
     setOtherParams(params: Record<string, any>, { cover }?: {
@@ -180,7 +180,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @param {ProductData} productData
      * @memberof BookingByStepImpl
      */
-    storeProduct(productData: ProductData): Promise<void>;
+    storeProduct(productData: ProductData): {
+        success: boolean;
+        errorCode?: string;
+    };
     /**
      * 往购物车加商品数据
      *
@@ -203,7 +206,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
             endTime: string;
         } | null;
         account?: Account | null;
-    }): void;
+    }): {
+        success: boolean;
+        errorCode?: string;
+    };
     /**
      * 添加完购物车以后做的一些检测，比如日期是否在同一天
      *
@@ -294,8 +300,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     getTimeSlotByAllResources(resources_code: string): any[];
     submitTimeSlot(timeSlots: TimeSliceItem): void;
-    clearCache(): void;
-    clearCacheByModule(module: string): void;
     private getScheduleDataByIds;
     openProductDetail(productId: number): Promise<void>;
     closeProductDetail(): void;
@@ -312,6 +316,30 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
     }[];
+    /**
+     * 找到多个资源的公共可用时间段
+     */
+    private findCommonAvailableTimeSlots;
+    checkMaxDurationCapacity(): {
+        success: boolean;
+        minAvailableCount: number;
+    };
+    /**
+     * 将 ProductData 转换为 CartItem，但不添加到购物车
+     * 参考 addProductToCart 方法的实现
+     */
+    private convertProductToCartItem;
+    checkMaxDurationCapacityForDetailNums({ product, date, account, }: {
+        product: ProductData;
+        date?: {
+            startTime: string;
+            endTime: string;
+        } | null;
+        account?: Account | null;
+    }): {
+        success: boolean;
+        minAvailableCount: number;
+    };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
     getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
@@ -346,4 +374,8 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     isCartHasDurationProduct(): boolean;
     isTargetNormalProduct(product: ProductData): boolean;
     isTargetCartIdNormalProduct(id: string): boolean | undefined;
+    /**
+     * 获取联系信息
+    */
+    getContactInfo(params: any): Promise<any>;
 }