@pisell/pisellos 3.0.29 → 3.0.31

package/dist/modules/Cart/index.js

@@ -112,7 +112,7 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
     key: "addItem",
     value: (function () {
       var _addItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var account, product, bundle, options, date, cartItem, items;
+        var account, product, bundle, options, date, cartItem, targetVariant, items;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -122,6 +122,18 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
                 _origin: createCartItemOrigin()
               };
               if (product) {
+                // 判断组合商品，然后直接修改 product 里的价格和 is_charge_tax
+                if (product.product_variant_id) {
+                  // 还需要判断 能从 variant 里找到对应的组合规格信息，才可以替换
+                  targetVariant = product.variant.find(function (n) {
+                    return n.id === product.product_variant_id;
+                  });
+                  if (targetVariant) {
+                    product.price = targetVariant.price;
+                    product.original_price = targetVariant.original_price;
+                    product.is_charge_tax = targetVariant.is_charge_tax;
+                  }
+                }
                 cartItem._productOrigin = cloneDeep(product);
                 cartItem._productInit = cloneDeep(product);
                 cartItem._bundleOrigin = cloneDeep(bundle);
@@ -130,7 +142,8 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
                   cartItem: cartItem,
                   product: product,
                   bundle: bundle,
-                  options: options
+                  options: options,
+                  product_variant_id: product.product_variant_id
                 });
               }
               if (account) {
@@ -234,6 +247,18 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
         tempCartItem = cartItem;
       }
       if (product) {
+        // 判断组合商品，然后直接修改 product 里的价格和 is_charge_tax
+        if (product.product_variant_id) {
+          // 还需要判断 能从 variant 里找到对应的组合规格信息，才可以替换
+          var targetVariant = product.variant.find(function (n) {
+            return n.id === product.product_variant_id;
+          });
+          if (targetVariant) {
+            product.price = targetVariant.price;
+            product.original_price = targetVariant.original_price;
+            product.is_charge_tax = targetVariant.is_charge_tax;
+          }
+        }
         tempCartItem._productOrigin = cloneDeep(product);
         tempCartItem._bundleOrigin = cloneDeep(bundle);
         tempCartItem._optionsOrigin = cloneDeep(options);
@@ -241,7 +266,8 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
           cartItem: tempCartItem,
           product: product,
           bundle: bundle,
-          options: options
+          options: options,
+          product_variant_id: product.product_variant_id
         });
       }
       if (discounts) {

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

@@ -140,6 +140,8 @@ export interface CartItem {
     _bundleOrigin?: any[];
     /** 商品规格原始数据 */
     _optionsOrigin?: any[];
+    /** 商品规格组合字符串，提供给 UI 展示的 */
+    product_option_string?: string;
 }
 /**
  * 购物车状态接口
@@ -168,6 +170,8 @@ export interface IAddItemParams {
         /** 结束时间 */
         endTime: string;
     };
+    /** 商品组合规格ID */
+    product_variant_id?: number;
 }
 /**
  * 更新购物车信息参数
@@ -209,6 +213,8 @@ export interface IUpdateItemParams {
         /** 关联表单记录ID */
         form_record_ids: number[];
     }[];
+    /** 商品组合规格ID */
+    product_variant_id?: number;
 }
 /**
  * 折扣

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

@@ -40,12 +40,14 @@ export declare const formatProductToCartItem: (params: {
     product: ProductData;
     bundle?: any;
     options?: any;
+    product_variant_id?: number;
 }) => CartItem;
 export declare const formatProductToCartItemOrigin: (params: {
     cartItem: CartItem;
     product: ProductData;
     bundle?: any;
     options?: any;
+    product_variant_id?: number;
 }) => any;
 /**
  * 格式化折扣到购物车

package/dist/modules/Cart/utils.js

@@ -79,7 +79,8 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
   var cartItem = params.cartItem,
     product = params.product,
     bundle = params.bundle,
-    options = params.options;
+    options = params.options,
+    product_variant_id = params.product_variant_id;
   var num = 1; // 当前按照单个商品加入购物车
   if (product) {
     cartItem.id = product === null || product === void 0 ? void 0 : product.id;
@@ -110,6 +111,31 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
   if (options !== null && options !== void 0 && options.length) {
     cartItem.options = formatOptions(options);
   }
+  // 拼装出 product_option_string
+  if (product_variant_id) {
+    var _product$variant$find;
+    var sku_key = (_product$variant$find = product.variant.find(function (n) {
+      return n.id === product_variant_id;
+    })) === null || _product$variant$find === void 0 ? void 0 : _product$variant$find.sku_key;
+    if (sku_key) {
+      var sku_key_arr = sku_key.split('_');
+      var product_option_string = [];
+      sku_key_arr.forEach(function (item) {
+        var _targetVariantGroup$v;
+        var keyMap = item.split(':');
+        var targetVariantGroup = product.variant_group.find(function (n) {
+          return String(n.position_id) === keyMap[0];
+        });
+        var targetVariantItem = targetVariantGroup === null || targetVariantGroup === void 0 || (_targetVariantGroup$v = targetVariantGroup.variant_item) === null || _targetVariantGroup$v === void 0 ? void 0 : _targetVariantGroup$v.find(function (n) {
+          return String(n.position_id) === keyMap[1];
+        });
+        if (targetVariantGroup && targetVariantItem) {
+          product_option_string.push("".concat(targetVariantGroup.name, ":").concat(targetVariantItem.name));
+        }
+      });
+      cartItem.product_option_string = product_option_string.join(', ');
+    }
+  }
 
   // 如果商品有定金规则，则计算定金
   if ((product === null || product === void 0 || (_product$custom_depos = product.custom_deposit_data) === null || _product$custom_depos === void 0 ? void 0 : _product$custom_depos.has_deposit) == 1) {
@@ -129,14 +155,15 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
   var cartItem = params.cartItem,
     product = params.product,
     bundle = params.bundle,
-    options = params.options;
+    options = params.options,
+    product_variant_id = params.product_variant_id;
   var origin = cartItem._origin;
   if (product) {
     var _origin$product, _origin$product2, _product$duration, _product$duration2;
     origin.product = _objectSpread(_objectSpread({}, origin.product || {}), {}, {
       num: 1,
       product_id: product.id,
-      product_variant_id: (product === null || product === void 0 ? void 0 : product.product_variant_id) || 0,
+      product_variant_id: product_variant_id || 0,
       product_bundle: ((_origin$product = origin.product) === null || _origin$product === void 0 ? void 0 : _origin$product.product_bundle) || [],
       product_option_item: ((_origin$product2 = origin.product) === null || _origin$product2 === void 0 ? void 0 : _origin$product2.product_option_item) || []
     });
@@ -180,6 +207,12 @@ export var formatDiscountToCartItemOrigin = function formatDiscountToCartItemOri
       origin.product = {};
     }
     origin.product.discount_list = discounts;
+  } else {
+    // 如果折扣为空，则清空折扣列表
+    if (!origin.product) {
+      origin.product = {};
+    }
+    origin.product.discount_list = [];
   }
   return origin;
 };

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

@@ -10,7 +10,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     createOrder(params: CommitOrderParams['query']): {
-        type: string;
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;
@@ -18,6 +18,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         shop_note: string;
         schedule_date: string;
         is_deposit: number;
+        relation_products: any[];
+        relation_forms: any[];
     };
     checkBeforeSubmitOrder(params: {
         cartItems: CartItem[];

package/dist/modules/Order/index.js

@@ -1,4 +1,10 @@
 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 _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); }
+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 _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); }); }; }
@@ -55,14 +61,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "createOrder",
     value: function createOrder(params) {
       var order = {
-        type: 'appointment_booking',
+        type: params.type || 'appointment_booking',
+        // 要从外面拿，virtual
         platform: 'H5',
         sales_channel: 'my_pisel',
         order_sales_channel: 'online_store',
         bookings: [],
         shop_note: '',
         schedule_date: '',
-        is_deposit: 0
+        is_deposit: 0,
+        relation_products: [],
+        relation_forms: []
       };
       var is_deposit = 0; // 是否存在定金，0 不存在，1 存在
       if (params.cartItems.length > 0) {
@@ -74,13 +83,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             item._origin.duration = duration;
             item._origin.sub_type = durationType;
           }
-          order.bookings.push(item._origin);
+          // 零售都视为普通商品
+          if (order.type === 'virtual') {
+            var _order$relation_forms;
+            order.relation_products.push(item._origin.product);
+            var relationForms = item._origin.relation_forms || [];
+            (_order$relation_forms = order.relation_forms).push.apply(_order$relation_forms, _toConsumableArray(relationForms));
+            delete item._origin.relation_forms;
+          } else {
+            order.bookings.push(item._origin);
+          }
           if (item !== null && item !== void 0 && item.deposit) {
             is_deposit = 1;
           }
         });
-        var firstCartItem = params.cartItems[0];
-        order.schedule_date = firstCartItem.start_date + ' ' + firstCartItem.start_time + ':00';
+        if (order.type === 'appointment_booking') {
+          var firstCartItem = params.cartItems[0];
+          order.schedule_date = firstCartItem.start_date + ' ' + firstCartItem.start_time + ':00';
+        }
         order.is_deposit = is_deposit;
       }
       return order;

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

@@ -14,6 +14,7 @@ export interface CommitOrderParams {
     url?: string;
     query: {
         cartItems: CartItem[];
+        type: 'virtual' | 'appointment_booking';
     };
 }
 /**

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

@@ -132,6 +132,8 @@ export interface ProductData {
     base_price: string;
     /** 规格列表 */
     variant: any[];
+    /** 规格组，通过  variant.sku_key 映射出 variant_group */
+    variant_group: ProductVariantGroup[];
     /** 媒体 */
     media: ProductMedia[];
     /** 标签 */

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

@@ -167,7 +167,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         holder_id: string;
         resources_code: string | number;
         timeSlots?: TimeSliceItem;
-        countMap: Record<number, number>;
+        countMap: Record<number, {
+            pax: number;
+            time: TimeSliceItem;
+        }[]>;
         capacity?: number;
     }): {
         selectedResource: any;
@@ -209,4 +212,18 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
     getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    /**
+     * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
+     *
+     * @param {string} cartItemId
+     * @param {string} resourceCode
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
+    getResourcesByCartItemAndCode(cartItemId: string, resourceCode: string): any;
+    getAvailableDateForSession(params?: {
+        startDate?: string;
+        endDate?: string;
+        type?: 'month';
+    }): Promise<ITime[]>;
 }

package/dist/solution/BookingByStep/index.js

@@ -233,7 +233,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 0,
-                extension_type: ['product_appointment', 'appointment_ticket', 'session_product', 'session_ticket'],
+                extension_type: ['product_appointment', 'appointment_ticket', 'session_product', 'session_ticket', 'normal'],
                 with: ['category', 'collection', 'resourceRelation'],
                 status: 'published',
                 num: 500,
@@ -1060,40 +1060,44 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "submitOrder",
     value: function () {
       var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
-        var cartItems, newCartItems;
+        var cartItems, newCartItems, type;
         return _regeneratorRuntime().wrap(function _callee21$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
               cartItems = this.store.cart.getItems();
               newCartItems = cloneDeep(cartItems); // 先整个临时的逻辑，把购物车里所有商品的资源给他格式化一下
               newCartItems.forEach(function (item) {
-                var _item$_productOrigin, _item$_origin;
-                item._origin.resources = item._origin.resources.map(function (n) {
-                  var newResourcesItem = cloneDeep(n);
-                  delete newResourcesItem.id;
-                  delete newResourcesItem.main_field;
-                  delete newResourcesItem.resourceType;
-                  return _objectSpread({}, newResourcesItem);
-                });
-                var formatCapacity = formatDefaultCapacitys({
-                  capacity: (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.capacity,
-                  product_bundle: item._origin.product.product_bundle
-                });
-                var currentCapacity = getSumCapacity({
-                  capacity: formatCapacity
-                });
-                if (!((_item$_origin = item._origin) !== null && _item$_origin !== void 0 && _item$_origin.metadata)) {
-                  item._origin.metadata = {};
+                if (item._origin.resources && item._origin.resources.length) {
+                  var _item$_productOrigin, _item$_origin;
+                  item._origin.resources = item._origin.resources.map(function (n) {
+                    var newResourcesItem = cloneDeep(n);
+                    delete newResourcesItem.id;
+                    delete newResourcesItem.main_field;
+                    delete newResourcesItem.resourceType;
+                    return _objectSpread({}, newResourcesItem);
+                  });
+                  var formatCapacity = formatDefaultCapacitys({
+                    capacity: (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.capacity,
+                    product_bundle: item._origin.product.product_bundle
+                  });
+                  var currentCapacity = getSumCapacity({
+                    capacity: formatCapacity
+                  });
+                  if (!((_item$_origin = item._origin) !== null && _item$_origin !== void 0 && _item$_origin.metadata)) {
+                    item._origin.metadata = {};
+                  }
+                  item._origin.metadata.capacity = formatCapacity;
+                  item._origin.number = currentCapacity;
                 }
-                item._origin.metadata.capacity = formatCapacity;
-                item._origin.number = currentCapacity;
               });
+              type = this.otherParams.isRetailTemplate ? 'virtual' : 'appointment_booking';
               return _context22.abrupt("return", this.store.order.submitOrder({
                 query: {
-                  cartItems: newCartItems
+                  cartItems: newCartItems,
+                  type: type
                 }
               }));
-            case 4:
+            case 5:
             case "end":
               return _context22.stop();
           }
@@ -1211,6 +1215,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
       }
       this.store.cart.updateItem(params);
+      if (this.otherParams.isRetailTemplate) {
+        return;
+      }
       var allOriginResources = [];
       var dateRange = this.store.date.getDateRange();
       if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
@@ -1796,7 +1803,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               //   resourcesUseableMap[n.id] = false;
               //   continue
               // }
-              var recordCount = countMap[n.id] || 0;
+              // const recordCount = countMap[n.id] || 0;
               // n.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
               // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
               // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
@@ -1807,13 +1814,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               if (mTimes.length === 0) {
                 return 0; // continue
               }
+              // 计算在时间片内有交集的预约容量总和
+              var totalCapacity = (countMap[n.id] || []).reduce(function (sum, item) {
+                var hasOverlap = !dayjs(item.time.start_at).isAfter(dayjs(timeSlots.start_at)) && !dayjs(item.time.end_at).isBefore(dayjs(timeSlots.end_at));
+                return hasOverlap ? sum + item.pax : sum;
+              }, 0);
               var canUseTime = mTimes.find(function (item) {
                 var _cartItem$_productOri10;
                 var res = getIsUsableByTimeItem({
                   timeSlice: timeSlots,
                   time: item,
                   resource: n,
-                  currentCount: recordCount + (capacity || 0),
+                  currentCount: totalCapacity + (capacity || 0),
                   resourcesUseableMap: resourcesUseableMap,
                   cut_off_time: (_cartItem$_productOri10 = cartItem._productOrigin) === null || _cartItem$_productOri10 === void 0 ? void 0 : _cartItem$_productOri10.cut_off_time
                 });
@@ -1884,6 +1896,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 一个账号一个账号处理
       var errorList = [];
       var selectResourcesMap = {};
+      var selectResourcesWithTimeSlots = {};
       var accountList = this.store.accountList.getAccounts();
       var selectForCartResources = function selectForCartResources(cartItems) {
         var recordTimeSlots = cloneDeep(timeSlots);
@@ -1916,8 +1929,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             var currentResourceConfig = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.product_resource) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.resources) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.find(function (n) {
               return n.code === resources_code;
             });
+            var resourceBookingType = (currentResourceConfig === null || currentResourceConfig === void 0 ? void 0 : currentResourceConfig.type) || 'single';
             // 只有 duration 类商品需要这个操作
-            if (index !== 0 && recordTimeSlots && (currentResourceConfig === null || currentResourceConfig === void 0 ? void 0 : currentResourceConfig.type) === 'single' && (_item$_productOrigin5 = item._productOrigin) !== null && _item$_productOrigin5 !== void 0 && _item$_productOrigin5.duration) {
+            if (index !== 0 && recordTimeSlots && resourceBookingType === 'single' && (_item$_productOrigin5 = item._productOrigin) !== null && _item$_productOrigin5 !== void 0 && _item$_productOrigin5.duration) {
               var _item$_productOrigin$, _item$_productOrigin6, _ref9, _item$_productOrigin7, _item$_productOrigin$2, _item$_productOrigin8, _ref10, _item$_productOrigin9;
               var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref9 = (_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.duration) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.type) !== null && _ref9 !== void 0 ? _ref9 : 'minutes');
               var end_at = start_at.add((_item$_productOrigin$2 = (_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.duration) === null || _item$_productOrigin8 === void 0 ? void 0 : _item$_productOrigin8.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref10 = (_item$_productOrigin9 = item._productOrigin) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.duration) === null || _item$_productOrigin9 === void 0 ? void 0 : _item$_productOrigin9.type) !== null && _ref10 !== void 0 ? _ref10 : 'minutes');
@@ -1934,7 +1948,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               holder_id: item.holder_id,
               resources_code: resources_code,
               timeSlots: recordTimeSlots,
-              countMap: selectResourcesMap,
+              countMap: selectResourcesWithTimeSlots,
               capacity: currentCapacity
             });
             // // 如果购物车里已经有同类型的 form_id 的资源了，则不处理
@@ -1942,10 +1956,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             //   return
             // }
             if (res !== null && res !== void 0 && res.selectedResource) {
-              if (!selectResourcesMap[res.selectedResource.id]) {
-                selectResourcesMap[res.selectedResource.id] = currentCapacity;
+              if (!selectResourcesWithTimeSlots[res.selectedResource.id]) {
+                selectResourcesWithTimeSlots[res.selectedResource.id] = [{
+                  pax: currentCapacity,
+                  time: recordTimeSlots
+                }];
               } else {
-                selectResourcesMap[res.selectedResource.id] += currentCapacity;
+                selectResourcesWithTimeSlots[res.selectedResource.id].push({
+                  pax: currentCapacity,
+                  time: recordTimeSlots
+                });
               }
               res.selectedResource.capacity = currentCapacity;
               checkSubResourcesCapacity(res.selectedResource);
@@ -2476,6 +2496,173 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return getProductTypeById;
     }()
+    /**
+     * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
+     *
+     * @param {string} cartItemId
+     * @param {string} resourceCode
+     * @return {*} 
+     * @memberof BookingByStepImpl
+     */
+  }, {
+    key: "getResourcesByCartItemAndCode",
+    value: function getResourcesByCartItemAndCode(cartItemId, resourceCode) {
+      var _cartItem$_productOri11, _cartItem$_productOri12;
+      var dateRange = this.store.date.getDateRange();
+      var resources = [];
+      if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
+        dateRange.forEach(function (n) {
+          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+        });
+      }
+      if (!resources.length) {
+        var dateList = this.store.date.getDateList();
+        dateList.forEach(function (n) {
+          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+        });
+      }
+      var resourcesMap = getResourcesMap(cloneDeep(resources));
+      var cartItems = this.store.cart.getItems();
+      var cartItem = cartItems.find(function (item) {
+        return item._id === cartItemId;
+      });
+      if (!cartItem) return [];
+      var selectedResources = [];
+      var formatCapacity = formatDefaultCapacitys({
+        capacity: (_cartItem$_productOri11 = cartItem._productOrigin) === null || _cartItem$_productOri11 === void 0 ? void 0 : _cartItem$_productOri11.capacity,
+        product_bundle: cartItem._origin.product.product_bundle
+      });
+      cartItem._origin.metadata.capacity = formatCapacity;
+      var currentCapacity = getSumCapacity({
+        capacity: formatCapacity
+      });
+      if (cartItem.holder_id) {
+        selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
+      } else {
+        selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap);
+      }
+      var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri12 = cartItem._productOrigin) === null || _cartItem$_productOri12 === void 0 || (_cartItem$_productOri12 = _cartItem$_productOri12.product_resource) === null || _cartItem$_productOri12 === void 0 ? void 0 : _cartItem$_productOri12.resources) || [], selectedResources, currentCapacity);
+      var targetResource = productResources.find(function (resource) {
+        return resource.code === resourceCode;
+      });
+      if (!targetResource) return [];
+      if (cartItem._origin.start_time) {
+        var startTime = dayjs("".concat(cartItem._origin.start_date, " ").concat(cartItem._origin.start_time));
+        var endTime = dayjs("".concat(cartItem._origin.end_date, " ").concat(cartItem._origin.end_time));
+        var resourcesUseableMap = {};
+        targetResource.renderList = targetResource.renderList.sort(function (a, b) {
+          var _a$metadata5, _b$metadata5;
+          var aIsCombined = ((_a$metadata5 = a.metadata) === null || _a$metadata5 === void 0 || (_a$metadata5 = _a$metadata5.combined_resource) === null || _a$metadata5 === void 0 ? void 0 : _a$metadata5.status) === 1;
+          var bIsCombined = ((_b$metadata5 = b.metadata) === null || _b$metadata5 === void 0 || (_b$metadata5 = _b$metadata5.combined_resource) === null || _b$metadata5 === void 0 ? void 0 : _b$metadata5.status) === 1;
+          if (aIsCombined && !bIsCombined) return 1;
+          if (!aIsCombined && bIsCombined) return -1;
+          return 0;
+        });
+        targetResource.renderList = targetResource.renderList.filter(function (m) {
+          var mTimes = m.times.filter(function (n) {
+            return !dayjs(n.start_at).isAfter(dayjs(startTime)) && !dayjs(n.end_at).isBefore(dayjs(endTime));
+          });
+          if (mTimes.length === 0) return false;
+          var canUseArr = mTimes.map(function (item) {
+            var _cartItem$_productOri13;
+            var res = getIsUsableByTimeItem({
+              timeSlice: {
+                start_time: startTime.format('HH:mm'),
+                end_time: endTime.format('HH:mm'),
+                start_at: startTime,
+                end_at: endTime
+              },
+              time: item,
+              resource: m,
+              currentCount: currentCapacity || 0,
+              resourcesUseableMap: resourcesUseableMap,
+              cut_off_time: (_cartItem$_productOri13 = cartItem._productOrigin) === null || _cartItem$_productOri13 === void 0 ? void 0 : _cartItem$_productOri13.cut_off_time
+            });
+            if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
+              resourcesUseableMap[m.id] = res.usable;
+            }
+            return res.usable;
+          });
+          if (m.onlyComputed) return false;
+          return !canUseArr.some(function (n) {
+            return n === false;
+          });
+        });
+      } else {
+        targetResource.renderList = targetResource.renderList.filter(function (n) {
+          var _cartItem$_productOri14;
+          var recordCount = n.capacity || 0;
+          if (n.onlyComputed) return false;
+          var timeSlots = getTimeSlicesByResource({
+            resource: n,
+            duration: ((_cartItem$_productOri14 = cartItem._productOrigin) === null || _cartItem$_productOri14 === void 0 || (_cartItem$_productOri14 = _cartItem$_productOri14.duration) === null || _cartItem$_productOri14 === void 0 ? void 0 : _cartItem$_productOri14.value) || 0,
+            split: 10,
+            currentDate: dateRange[0].date
+          });
+          return recordCount >= currentCapacity && timeSlots.length > 0;
+        });
+      }
+      return targetResource.renderList;
+    }
+  }, {
+    key: "getAvailableDateForSession",
+    value: function () {
+      var _getAvailableDateForSession = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
+        var params,
+          startDate,
+          endDate,
+          type,
+          tempProducts,
+          _ref15,
+          resourceIds,
+          rules,
+          resourcesMap,
+          res,
+          _args29 = arguments;
+        return _regeneratorRuntime().wrap(function _callee28$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
+            case 0:
+              params = _args29.length > 0 && _args29[0] !== undefined ? _args29[0] : {};
+              // 开始日期如果小于今天，直接以今天当做开始日期
+              startDate = params.startDate, endDate = params.endDate, type = params.type; // 前端传递的 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');
+              }
+              // 不管前端传什么 endDate 默认查一个月的，以今天为开始日期。用于找到一个月内最近可用的日期
+              endDate = dayjs().add(1, 'month').format('YYYY-MM-DD');
+              tempProducts = []; // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
+              if (this.store.currentProduct) {
+                tempProducts = [_objectSpread(_objectSpread({}, this.store.currentProduct.getData()), {}, {
+                  _schedule: this.store.currentProduct.getOtherParams()['schedule']
+                })];
+              }
+              // 在这里需要把能收集到的数据都收集上来，拼装好给 date 模块去查询
+              _ref15 = getAvailableProductResources(tempProducts) || {}, resourceIds = _ref15.resourceIds, rules = _ref15.rules, resourcesMap = _ref15.resourcesMap;
+              this.otherParams.currentResourcesMap = resourcesMap;
+              _context29.next = 10;
+              return this.store.date.getResourceDates({
+                query: {
+                  start_date: startDate || '',
+                  end_date: endDate || '',
+                  resource_ids: resourceIds
+                },
+                rules: rules,
+                type: type
+              });
+            case 10:
+              res = _context29.sent;
+              return _context29.abrupt("return", res);
+            case 12:
+            case "end":
+              return _context29.stop();
+          }
+        }, _callee28, this);
+      }));
+      function getAvailableDateForSession() {
+        return _getAvailableDateForSession.apply(this, arguments);
+      }
+      return getAvailableDateForSession;
+    }()
   }]);
   return BookingByStepImpl;
 }(BaseModule);

package/lib/modules/Cart/index.js

@@ -76,6 +76,14 @@ var CartModule = class extends import_BaseModule.BaseModule {
       _origin: (0, import_utils.createCartItemOrigin)()
     };
     if (product) {
+      if (product.product_variant_id) {
+        const targetVariant = product.variant.find((n) => n.id === product.product_variant_id);
+        if (targetVariant) {
+          product.price = targetVariant.price;
+          product.original_price = targetVariant.original_price;
+          product.is_charge_tax = targetVariant.is_charge_tax;
+        }
+      }
       cartItem._productOrigin = (0, import_lodash_es.cloneDeep)(product);
       cartItem._productInit = (0, import_lodash_es.cloneDeep)(product);
       cartItem._bundleOrigin = (0, import_lodash_es.cloneDeep)(bundle);
@@ -84,7 +92,8 @@ var CartModule = class extends import_BaseModule.BaseModule {
         cartItem,
         product,
         bundle,
-        options
+        options,
+        product_variant_id: product.product_variant_id
       });
     }
     if (account) {
@@ -140,6 +149,14 @@ var CartModule = class extends import_BaseModule.BaseModule {
       tempCartItem = cartItem;
     }
     if (product) {
+      if (product.product_variant_id) {
+        const targetVariant = product.variant.find((n) => n.id === product.product_variant_id);
+        if (targetVariant) {
+          product.price = targetVariant.price;
+          product.original_price = targetVariant.original_price;
+          product.is_charge_tax = targetVariant.is_charge_tax;
+        }
+      }
       tempCartItem._productOrigin = (0, import_lodash_es.cloneDeep)(product);
       tempCartItem._bundleOrigin = (0, import_lodash_es.cloneDeep)(bundle);
       tempCartItem._optionsOrigin = (0, import_lodash_es.cloneDeep)(options);
@@ -147,7 +164,8 @@ var CartModule = class extends import_BaseModule.BaseModule {
         cartItem: tempCartItem,
         product,
         bundle,
-        options
+        options,
+        product_variant_id: product.product_variant_id
       });
     }
     if (discounts) {

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

@@ -140,6 +140,8 @@ export interface CartItem {
     _bundleOrigin?: any[];
     /** 商品规格原始数据 */
     _optionsOrigin?: any[];
+    /** 商品规格组合字符串，提供给 UI 展示的 */
+    product_option_string?: string;
 }
 /**
  * 购物车状态接口
@@ -168,6 +170,8 @@ export interface IAddItemParams {
         /** 结束时间 */
         endTime: string;
     };
+    /** 商品组合规格ID */
+    product_variant_id?: number;
 }
 /**
  * 更新购物车信息参数
@@ -209,6 +213,8 @@ export interface IUpdateItemParams {
         /** 关联表单记录ID */
         form_record_ids: number[];
     }[];
+    /** 商品组合规格ID */
+    product_variant_id?: number;
 }
 /**
  * 折扣

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

@@ -40,12 +40,14 @@ export declare const formatProductToCartItem: (params: {
     product: ProductData;
     bundle?: any;
     options?: any;
+    product_variant_id?: number;
 }) => CartItem;
 export declare const formatProductToCartItemOrigin: (params: {
     cartItem: CartItem;
     product: ProductData;
     bundle?: any;
     options?: any;
+    product_variant_id?: number;
 }) => any;
 /**
  * 格式化折扣到购物车

package/lib/modules/Cart/utils.js

@@ -109,8 +109,8 @@ var createCartItemOrigin = () => {
   };
 };
 var formatProductToCartItem = (params) => {
-  var _a;
-  const { cartItem, product, bundle, options } = params;
+  var _a, _b;
+  const { cartItem, product, bundle, options, product_variant_id } = params;
   const num = 1;
   if (product) {
     cartItem.id = product == null ? void 0 : product.id;
@@ -136,7 +136,24 @@ var formatProductToCartItem = (params) => {
   if (options == null ? void 0 : options.length) {
     cartItem.options = formatOptions(options);
   }
-  if (((_a = product == null ? void 0 : product.custom_deposit_data) == null ? void 0 : _a.has_deposit) == 1) {
+  if (product_variant_id) {
+    const sku_key = (_a = product.variant.find((n) => n.id === product_variant_id)) == null ? void 0 : _a.sku_key;
+    if (sku_key) {
+      const sku_key_arr = sku_key.split("_");
+      const product_option_string = [];
+      sku_key_arr.forEach((item) => {
+        var _a2;
+        const keyMap = item.split(":");
+        const targetVariantGroup = product.variant_group.find((n) => String(n.position_id) === keyMap[0]);
+        const targetVariantItem = (_a2 = targetVariantGroup == null ? void 0 : targetVariantGroup.variant_item) == null ? void 0 : _a2.find((n) => String(n.position_id) === keyMap[1]);
+        if (targetVariantGroup && targetVariantItem) {
+          product_option_string.push(`${targetVariantGroup.name}:${targetVariantItem.name}`);
+        }
+      });
+      cartItem.product_option_string = product_option_string.join(", ");
+    }
+  }
+  if (((_b = product == null ? void 0 : product.custom_deposit_data) == null ? void 0 : _b.has_deposit) == 1) {
     cartItem.deposit = getProductDeposit({
       cartItem,
       product,
@@ -151,14 +168,14 @@ var formatProductToCartItem = (params) => {
 };
 var formatProductToCartItemOrigin = (params) => {
   var _a, _b, _c, _d;
-  const { cartItem, product, bundle, options } = params;
+  const { cartItem, product, bundle, options, product_variant_id } = params;
   let origin = cartItem._origin;
   if (product) {
     origin.product = {
       ...origin.product || {},
       num: 1,
       product_id: product.id,
-      product_variant_id: (product == null ? void 0 : product.product_variant_id) || 0,
+      product_variant_id: product_variant_id || 0,
       product_bundle: ((_a = origin.product) == null ? void 0 : _a.product_bundle) || [],
       product_option_item: ((_b = origin.product) == null ? void 0 : _b.product_option_item) || []
     };
@@ -187,6 +204,11 @@ var formatDiscountToCartItemOrigin = (params) => {
       origin.product = {};
     }
     origin.product.discount_list = discounts;
+  } else {
+    if (!origin.product) {
+      origin.product = {};
+    }
+    origin.product.discount_list = [];
   }
   return origin;
 };

package/lib/modules/Order/index.d.ts

@@ -10,7 +10,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     createOrder(params: CommitOrderParams['query']): {
-        type: string;
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;
@@ -18,6 +18,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         shop_note: string;
         schedule_date: string;
         is_deposit: number;
+        relation_products: any[];
+        relation_forms: any[];
     };
     checkBeforeSubmitOrder(params: {
         cartItems: CartItem[];

package/lib/modules/Order/index.js

@@ -37,14 +37,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   createOrder(params) {
     const order = {
-      type: "appointment_booking",
+      type: params.type || "appointment_booking",
+      // 要从外面拿，virtual
       platform: "H5",
       sales_channel: "my_pisel",
       order_sales_channel: "online_store",
       bookings: [],
       shop_note: "",
       schedule_date: "",
-      is_deposit: 0
+      is_deposit: 0,
+      relation_products: [],
+      relation_forms: []
     };
     let is_deposit = 0;
     if (params.cartItems.length > 0) {
@@ -54,13 +57,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           item._origin.duration = duration;
           item._origin.sub_type = durationType;
         }
-        order.bookings.push(item._origin);
+        if (order.type === "virtual") {
+          order.relation_products.push(item._origin.product);
+          const relationForms = item._origin.relation_forms || [];
+          order.relation_forms.push(...relationForms);
+          delete item._origin.relation_forms;
+        } else {
+          order.bookings.push(item._origin);
+        }
         if (item == null ? void 0 : item.deposit) {
           is_deposit = 1;
         }
       });
-      const firstCartItem = params.cartItems[0];
-      order.schedule_date = firstCartItem.start_date + " " + firstCartItem.start_time + ":00";
+      if (order.type === "appointment_booking") {
+        const firstCartItem = params.cartItems[0];
+        order.schedule_date = firstCartItem.start_date + " " + firstCartItem.start_time + ":00";
+      }
       order.is_deposit = is_deposit;
     }
     return order;

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

@@ -14,6 +14,7 @@ export interface CommitOrderParams {
     url?: string;
     query: {
         cartItems: CartItem[];
+        type: 'virtual' | 'appointment_booking';
     };
 }
 /**

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

@@ -132,6 +132,8 @@ export interface ProductData {
     base_price: string;
     /** 规格列表 */
     variant: any[];
+    /** 规格组，通过  variant.sku_key 映射出 variant_group */
+    variant_group: ProductVariantGroup[];
     /** 媒体 */
     media: ProductMedia[];
     /** 标签 */

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

@@ -167,7 +167,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         holder_id: string;
         resources_code: string | number;
         timeSlots?: TimeSliceItem;
-        countMap: Record<number, number>;
+        countMap: Record<number, {
+            pax: number;
+            time: TimeSliceItem;
+        }[]>;
         capacity?: number;
     }): {
         selectedResource: any;
@@ -209,4 +212,18 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
     getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    /**
+     * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
+     *
+     * @param {string} cartItemId
+     * @param {string} resourceCode
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
+    getResourcesByCartItemAndCode(cartItemId: string, resourceCode: string): any;
+    getAvailableDateForSession(params?: {
+        startDate?: string;
+        endDate?: string;
+        type?: 'month';
+    }): Promise<ITime[]>;
 }

package/lib/solution/BookingByStep/index.js

@@ -186,7 +186,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           "product_appointment",
           "appointment_ticket",
           "session_product",
-          "session_ticket"
+          "session_ticket",
+          "normal"
         ],
         with: ["category", "collection", "resourceRelation"],
         status: "published",
@@ -534,25 +535,28 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const newCartItems = (0, import_lodash_es.cloneDeep)(cartItems);
     newCartItems.forEach((item) => {
       var _a, _b;
-      item._origin.resources = item._origin.resources.map((n) => {
-        const newResourcesItem = (0, import_lodash_es.cloneDeep)(n);
-        delete newResourcesItem.id;
-        delete newResourcesItem.main_field;
-        delete newResourcesItem.resourceType;
-        return { ...newResourcesItem };
-      });
-      const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
-        capacity: (_a = item._productOrigin) == null ? void 0 : _a.capacity,
-        product_bundle: item._origin.product.product_bundle
-      });
-      const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
-      if (!((_b = item._origin) == null ? void 0 : _b.metadata)) {
-        item._origin.metadata = {};
+      if (item._origin.resources && item._origin.resources.length) {
+        item._origin.resources = item._origin.resources.map((n) => {
+          const newResourcesItem = (0, import_lodash_es.cloneDeep)(n);
+          delete newResourcesItem.id;
+          delete newResourcesItem.main_field;
+          delete newResourcesItem.resourceType;
+          return { ...newResourcesItem };
+        });
+        const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+          capacity: (_a = item._productOrigin) == null ? void 0 : _a.capacity,
+          product_bundle: item._origin.product.product_bundle
+        });
+        const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
+        if (!((_b = item._origin) == null ? void 0 : _b.metadata)) {
+          item._origin.metadata = {};
+        }
+        item._origin.metadata.capacity = formatCapacity;
+        item._origin.number = currentCapacity;
       }
-      item._origin.metadata.capacity = formatCapacity;
-      item._origin.number = currentCapacity;
     });
-    return this.store.order.submitOrder({ query: { cartItems: newCartItems } });
+    const type = this.otherParams.isRetailTemplate ? "virtual" : "appointment_booking";
+    return this.store.order.submitOrder({ query: { cartItems: newCartItems, type } });
   }
   // 拉起支付模块
   async pay() {
@@ -592,6 +596,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
     }
     this.store.cart.updateItem(params);
+    if (this.otherParams.isRetailTemplate) {
+      return;
+    }
     const allOriginResources = [];
     const dateRange = this.store.date.getDateRange();
     if (dateRange == null ? void 0 : dateRange.length) {
@@ -1134,20 +1141,23 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (timeSlots) {
       let targetResource = null;
       for (const n of resources) {
-        const recordCount = countMap[n.id] || 0;
         const mTimes = n.times.filter((n2) => {
           return !(0, import_dayjs.default)(n2.start_at).isAfter((0, import_dayjs.default)(timeSlots.start_at)) && !(0, import_dayjs.default)(n2.end_at).isBefore((0, import_dayjs.default)(timeSlots.end_at));
         });
         if (mTimes.length === 0) {
           continue;
         }
+        const totalCapacity = (countMap[n.id] || []).reduce((sum, item) => {
+          const hasOverlap = !(0, import_dayjs.default)(item.time.start_at).isAfter((0, import_dayjs.default)(timeSlots.start_at)) && !(0, import_dayjs.default)(item.time.end_at).isBefore((0, import_dayjs.default)(timeSlots.end_at));
+          return hasOverlap ? sum + item.pax : sum;
+        }, 0);
         const canUseTime = mTimes.find((item) => {
           var _a2;
           const res = (0, import_resources.getIsUsableByTimeItem)({
             timeSlice: timeSlots,
             time: item,
             resource: n,
-            currentCount: recordCount + (capacity || 0),
+            currentCount: totalCapacity + (capacity || 0),
             resourcesUseableMap,
             cut_off_time: (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.cut_off_time
           });
@@ -1198,6 +1208,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const errorList = [];
     const selectResourcesMap = {};
+    const selectResourcesWithTimeSlots = {};
     const accountList = this.store.accountList.getAccounts();
     const selectForCartResources = (cartItems2) => {
       let recordTimeSlots = (0, import_lodash_es.cloneDeep)(timeSlots);
@@ -1218,7 +1229,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
         if (recordTimeSlots) {
           const currentResourceConfig = (_d = (_c = (_b = item._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.find((n) => n.code === resources_code);
-          if (index !== 0 && recordTimeSlots && (currentResourceConfig == null ? void 0 : currentResourceConfig.type) === "single" && ((_e = item._productOrigin) == null ? void 0 : _e.duration)) {
+          const resourceBookingType = (currentResourceConfig == null ? void 0 : currentResourceConfig.type) || "single";
+          if (index !== 0 && recordTimeSlots && resourceBookingType === "single" && ((_e = item._productOrigin) == null ? void 0 : _e.duration)) {
             let start_at = (0, import_dayjs.default)(recordTimeSlots.end_time).add(
               ((_g = (_f = item._productOrigin) == null ? void 0 : _f.duration) == null ? void 0 : _g.value) ?? 0,
               ((_i = (_h = item._productOrigin) == null ? void 0 : _h.duration) == null ? void 0 : _i.type) ?? "minutes"
@@ -1239,14 +1251,22 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             holder_id: item.holder_id,
             resources_code,
             timeSlots: recordTimeSlots,
-            countMap: selectResourcesMap,
+            countMap: selectResourcesWithTimeSlots,
             capacity: currentCapacity
           });
           if (res == null ? void 0 : res.selectedResource) {
-            if (!selectResourcesMap[res.selectedResource.id]) {
-              selectResourcesMap[res.selectedResource.id] = currentCapacity;
+            if (!selectResourcesWithTimeSlots[res.selectedResource.id]) {
+              selectResourcesWithTimeSlots[res.selectedResource.id] = [
+                {
+                  pax: currentCapacity,
+                  time: recordTimeSlots
+                }
+              ];
             } else {
-              selectResourcesMap[res.selectedResource.id] += currentCapacity;
+              selectResourcesWithTimeSlots[res.selectedResource.id].push({
+                pax: currentCapacity,
+                time: recordTimeSlots
+              });
             }
             res.selectedResource.capacity = currentCapacity;
             (0, import_resources.checkSubResourcesCapacity)(res.selectedResource);
@@ -1692,6 +1712,158 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     return "normal";
   }
+  /**
+   * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
+   *
+   * @param {string} cartItemId
+   * @param {string} resourceCode
+   * @return {*} 
+   * @memberof BookingByStepImpl
+   */
+  getResourcesByCartItemAndCode(cartItemId, resourceCode) {
+    var _a, _b, _c;
+    const dateRange = this.store.date.getDateRange();
+    const resources = [];
+    if (dateRange == null ? void 0 : dateRange.length) {
+      dateRange.forEach((n) => {
+        if (n.resource)
+          resources.push(...n.resource);
+      });
+    }
+    if (!resources.length) {
+      const dateList = this.store.date.getDateList();
+      dateList.forEach((n) => {
+        if (n.resource)
+          resources.push(...n.resource);
+      });
+    }
+    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
+    const cartItems = this.store.cart.getItems();
+    const cartItem = cartItems.find((item) => item._id === cartItemId);
+    if (!cartItem)
+      return [];
+    let selectedResources = [];
+    const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+      capacity: (_a = cartItem._productOrigin) == null ? void 0 : _a.capacity,
+      product_bundle: cartItem._origin.product.product_bundle
+    });
+    cartItem._origin.metadata.capacity = formatCapacity;
+    const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
+    if (cartItem.holder_id) {
+      selectedResources = (0, import_resources.getOthersSelectedResources)(
+        cartItems,
+        cartItem.holder_id,
+        resourcesMap
+      );
+    } else {
+      selectedResources = (0, import_resources.getOthersCartSelectedResources)(
+        cartItems,
+        cartItem._id,
+        resourcesMap
+      );
+    }
+    const productResources = (0, import_resources.getResourcesByProduct)(
+      resourcesMap,
+      ((_c = (_b = cartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
+      selectedResources,
+      currentCapacity
+    );
+    const targetResource = productResources.find((resource) => resource.code === resourceCode);
+    if (!targetResource)
+      return [];
+    if (cartItem._origin.start_time) {
+      const startTime = (0, import_dayjs.default)(
+        `${cartItem._origin.start_date} ${cartItem._origin.start_time}`
+      );
+      const endTime = (0, import_dayjs.default)(
+        `${cartItem._origin.end_date} ${cartItem._origin.end_time}`
+      );
+      const resourcesUseableMap = {};
+      targetResource.renderList = targetResource.renderList.sort((a, b) => {
+        var _a2, _b2, _c2, _d;
+        const aIsCombined = ((_b2 = (_a2 = a.metadata) == null ? void 0 : _a2.combined_resource) == null ? void 0 : _b2.status) === 1;
+        const bIsCombined = ((_d = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d.status) === 1;
+        if (aIsCombined && !bIsCombined)
+          return 1;
+        if (!aIsCombined && bIsCombined)
+          return -1;
+        return 0;
+      });
+      targetResource.renderList = targetResource.renderList.filter((m) => {
+        const mTimes = m.times.filter((n) => {
+          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(startTime)) && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(endTime));
+        });
+        if (mTimes.length === 0)
+          return false;
+        const canUseArr = mTimes.map((item) => {
+          var _a2;
+          const res = (0, import_resources.getIsUsableByTimeItem)({
+            timeSlice: {
+              start_time: startTime.format("HH:mm"),
+              end_time: endTime.format("HH:mm"),
+              start_at: startTime,
+              end_at: endTime
+            },
+            time: item,
+            resource: m,
+            currentCount: currentCapacity || 0,
+            resourcesUseableMap,
+            cut_off_time: (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.cut_off_time
+          });
+          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
+            resourcesUseableMap[m.id] = res.usable;
+          }
+          return res.usable;
+        });
+        if (m.onlyComputed)
+          return false;
+        return !canUseArr.some((n) => n === false);
+      });
+    } else {
+      targetResource.renderList = targetResource.renderList.filter((n) => {
+        var _a2, _b2;
+        const recordCount = n.capacity || 0;
+        if (n.onlyComputed)
+          return false;
+        const timeSlots = (0, import_resources.getTimeSlicesByResource)({
+          resource: n,
+          duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 0,
+          split: 10,
+          currentDate: dateRange[0].date
+        });
+        return recordCount >= currentCapacity && timeSlots.length > 0;
+      });
+    }
+    return targetResource.renderList;
+  }
+  async getAvailableDateForSession(params = {}) {
+    let { startDate, endDate, type } = 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");
+    }
+    endDate = (0, import_dayjs.default)().add(1, "month").format("YYYY-MM-DD");
+    let tempProducts = [];
+    if (this.store.currentProduct) {
+      tempProducts = [
+        {
+          ...this.store.currentProduct.getData(),
+          _schedule: this.store.currentProduct.getOtherParams()["schedule"]
+        }
+      ];
+    }
+    const { resourceIds, rules, resourcesMap } = (0, import_products.getAvailableProductResources)(tempProducts) || {};
+    this.otherParams.currentResourcesMap = resourcesMap;
+    const res = await this.store.date.getResourceDates({
+      query: {
+        start_date: startDate || "",
+        end_date: endDate || "",
+        resource_ids: resourceIds
+      },
+      rules,
+      type
+    });
+    return res;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

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