@pisell/pisellos 0.0.226 → 0.0.228

package/dist/modules/BaseModule.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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -39,7 +41,7 @@ export var BaseModule = /*#__PURE__*/function () {
           var currentCacheData = window.sessionStorage.getItem(fatherModule);
           var currentCacheDataObj = JSON.parse(currentCacheData || '{}');
           if (!currentCacheData || !currentCacheDataObj[cacheId]) {
-            currentCacheDataObj = _defineProperty({}, cacheId, _defineProperty({}, this.name, {}));
+            currentCacheDataObj = _objectSpread(_defineProperty({}, cacheId, _defineProperty({}, this.name, {})), currentCacheDataObj);
           }
           if (!currentCacheDataObj[cacheId][this.name]) {
             currentCacheDataObj[cacheId][this.name] = {};
@@ -50,17 +52,17 @@ export var BaseModule = /*#__PURE__*/function () {
           window.sessionStorage.setItem(fatherModule, JSON.stringify(currentCacheDataObj));
         } else {
           var _currentCacheData = window.sessionStorage.getItem(cacheId);
-          var _currentCacheDataObj2 = JSON.parse(_currentCacheData || '{}');
-          if (!_currentCacheDataObj2) {
-            _currentCacheDataObj2 = {};
+          var _currentCacheDataObj = JSON.parse(_currentCacheData || '{}');
+          if (!_currentCacheDataObj) {
+            _currentCacheDataObj = {};
           }
-          if (!_currentCacheDataObj2[this.name]) {
-            _currentCacheDataObj2[this.name] = {};
+          if (!_currentCacheDataObj[this.name]) {
+            _currentCacheDataObj[this.name] = {};
           }
           cacheKey.forEach(function (key) {
-            _currentCacheDataObj2[_this.name][key] = store[key];
+            _currentCacheDataObj[_this.name][key] = store[key];
           });
-          window.sessionStorage.setItem(cacheId, JSON.stringify(_currentCacheDataObj2));
+          window.sessionStorage.setItem(cacheId, JSON.stringify(_currentCacheDataObj));
         }
       }
     }

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

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

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

@@ -36,7 +36,7 @@ function _updateAllCartItemPrice() {
                   return getProduct(item.id);
                 case 4:
                   cartProduct = _context.sent;
-                  productInfo = cartProduct === null || cartProduct === void 0 ? void 0 : cartProduct.getData();
+                  productInfo = cartProduct;
                   if (!productInfo) {
                     productInfo = item._productOrigin;
                   }

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

@@ -1,6 +1,5 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Product } from '../Product';
 import { ProductData } from '../Product/types';
 export * from './types';
 export declare class ProductList extends BaseModule implements Module {
@@ -31,7 +30,7 @@ export declare class ProductList extends BaseModule implements Module {
         channel?: string;
     }): Promise<any>;
     getProducts(): Promise<ProductData[]>;
-    getProduct(id: number): Promise<Product | undefined>;
+    getProduct(id: number): Promise<ProductData | undefined>;
     addProduct(products: ProductData[]): Promise<void>;
     selectProducts(products: ProductData[]): Promise<void>;
     /**

package/dist/modules/ProductList/index.js

@@ -16,7 +16,6 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { BaseModule } from "../BaseModule";
-import { Product } from "../Product";
 import { ProductListHooks } from "./types";
 import { cloneDeep } from 'lodash-es';
 export * from "./types";
@@ -46,12 +45,12 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               this.store = options.store;
               this.otherParams = options.otherParams || {};
               if (Array.isArray((_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.list)) {
-                this.store.list = options.initialState.list;
+                this.store.list = options.initialState.list.slice().sort(function (a, b) {
+                  return Number(b.sort) - Number(a.sort);
+                });
                 this.core.effects.emit("".concat(this.name, ":changed"), this.store.list);
-                this.storeChange();
               } else {
                 this.store.list = [];
-                this.store.productMap = new Map();
                 this.store.selectProducts = [];
               }
               this.request = core.getPlugin('request');
@@ -70,28 +69,13 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     key: "storeChange",
     value: function () {
       var _storeChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(path, value) {
-        var _this$store$list,
-          _this2 = this;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              (_this$store$list = this.store.list) === null || _this$store$list === void 0 || _this$store$list.forEach(function (product) {
-                var productModule = _this2.store.productMap.get("product-".concat(product.id));
-                if (!productModule) {
-                  var newProductModule = new Product("product_".concat(product.id.toString()));
-                  _this2.core.registerModule(newProductModule, {
-                    initialState: product
-                  });
-                  _this2.store.productMap.set(product.id.toString(), newProductModule);
-                } else {
-                  productModule.updateData(product);
-                }
-              });
-            case 1:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this);
+        }, _callee2);
       }));
       function storeChange(_x3, _x4) {
         return _storeChange.apply(this, arguments);
@@ -103,7 +87,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
         var _this$otherParams;
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$menu_list_ids, menu_list_ids, paramsCustomerId, _ref$with_count, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, userPlugin, customer_id, _userPlugin$get, productsData;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$menu_list_ids, menu_list_ids, paramsCustomerId, _ref$with_count, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, userPlugin, customer_id, _userPlugin$get, productsData, sortedList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -127,9 +111,8 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               } catch (error) {
                 console.error(error);
               }
-              debugger;
               // 如果没传schedule_date，则从
-              _context3.next = 7;
+              _context3.next = 6;
               return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 0,
@@ -153,10 +136,13 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               }, {
                 useCache: true
               });
-            case 7:
+            case 6:
               productsData = _context3.sent;
-              this.addProduct(productsData.data.list);
-              return _context3.abrupt("return", productsData.data.list);
+              sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
+                return Number(b.sort) - Number(a.sort);
+              });
+              this.addProduct(sortedList);
+              return _context3.abrupt("return", sortedList);
             case 10:
             case "end":
               return _context3.stop();
@@ -233,15 +219,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               _context6.next = 2;
               return this.core.effects.emit(ProductListHooks.onGetProduct, this.store.list);
             case 2:
-              product = this.store.productMap.get("".concat(id));
-              if (!product) {
-                _context6.next = 5;
-                break;
-              }
-              return _context6.abrupt("return", product);
-            case 5:
-              return _context6.abrupt("return", undefined);
-            case 6:
+              product = this.store.list.find(function (product) {
+                return product.id === id;
+              });
+              return _context6.abrupt("return", product ? cloneDeep(product) : undefined);
+            case 4:
             case "end":
               return _context6.stop();
           }
@@ -256,27 +238,30 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     key: "addProduct",
     value: function () {
       var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(products) {
-        var _this3 = this;
+        var _this2 = this;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              // 加到 list 以后上面的storeChange 会自动初始化商品详情的 module 实例
               // list 需要根据 id 去重
               if (!this.store.list) {
                 this.store.list = [];
               }
               products.forEach(function (n) {
-                var index = _this3.store.list.findIndex(function (m) {
+                var index = _this2.store.list.findIndex(function (m) {
                   return m.id === n.id;
                 });
                 if (index === -1) {
-                  _this3.store.list.push(n);
+                  _this2.store.list.push(n);
                 } else {
-                  _this3.store.list[index] = n;
+                  _this2.store.list[index] = n;
                 }
               });
-              this.storeChange();
-            case 3:
+              // 根据 sort 值做降序排序（数字越大越靠前）
+              this.store.list.sort(function (a, b) {
+                return Number(b.sort) - Number(a.sort);
+              });
+              this.core.effects.emit("".concat(this.name, ":changed"), this.store.list);
+            case 4:
             case "end":
               return _context7.stop();
           }

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

@@ -1,7 +1,6 @@
 import { ProductData } from '../Product/types';
 export interface ProductListData {
     list: ProductData[];
-    productMap: Map<string, any>;
     selectProducts: ProductData[];
 }
 export declare enum ProductListHooks {

package/dist/solution/BookingByStep/index.js

@@ -701,6 +701,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           _params$useCache,
           useCache,
           tempProducts,
+          _this$store$currentPr,
           dateRange,
           tempStartDate,
           tempEndDate,
@@ -732,8 +733,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
               // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
               if (this.store.currentProduct) {
-                tempProducts = [_objectSpread(_objectSpread({}, this.store.currentProduct.getData()), {}, {
-                  _schedule: this.store.currentProduct.getOtherParams()['schedule']
+                tempProducts = [_objectSpread(_objectSpread({}, this.store.currentProduct), {}, {
+                  _schedule: (_this$store$currentPr = this.store.currentProductMeta) === null || _this$store$currentPr === void 0 ? void 0 : _this$store$currentPr['schedule']
                 })];
               }
               dateRange = this.store.date.getDateRange();
@@ -1416,13 +1417,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this$store$cart, _this$store$step, _this$store$products, _this$store$guests, _this$store$date, _this$store$accountLi;
+      var _this$store$cart, _this$store$step, _this$store$products, _this$store$guests, _this$store$date, _this$store$accountLi, _this$store$schedule, _this$store$summary, _this$store$order;
       (_this$store$cart = this.store.cart) === null || _this$store$cart === void 0 || _this$store$cart.destroy();
       (_this$store$step = this.store.step) === null || _this$store$step === void 0 || _this$store$step.destroy();
       (_this$store$products = this.store.products) === null || _this$store$products === void 0 || _this$store$products.destroy();
       (_this$store$guests = this.store.guests) === null || _this$store$guests === void 0 || _this$store$guests.destroy();
       (_this$store$date = this.store.date) === null || _this$store$date === void 0 || _this$store$date.destroy();
       (_this$store$accountLi = this.store.accountList) === null || _this$store$accountLi === void 0 || _this$store$accountLi.destroy();
+      (_this$store$schedule = this.store.schedule) === null || _this$store$schedule === void 0 || _this$store$schedule.destroy();
+      (_this$store$summary = this.store.summary) === null || _this$store$summary === void 0 || _this$store$summary.destroy();
+      (_this$store$order = this.store.order) === null || _this$store$order === void 0 || _this$store$order.destroy();
       this.core.effects.offByModuleDestroy(this.name);
       this.core.unregisterModule(this);
     }
@@ -2286,41 +2290,42 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "openProductDetail",
     value: function () {
       var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(productId) {
-        var targetProduct, targetProductData, newScheduleArr, dateRange;
+        var targetProductData, newScheduleArr, dateRange;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
               _context25.next = 2;
               return this.store.products.getProduct(productId);
             case 2:
-              targetProduct = _context25.sent;
-              if (!targetProduct) {
-                _context25.next = 16;
+              targetProductData = _context25.sent;
+              if (!targetProductData) {
+                _context25.next = 17;
                 break;
               }
-              targetProductData = targetProduct.getData();
-              this.store.currentProduct = targetProduct;
+              this.store.currentProduct = targetProductData;
+              this.store.currentProductMeta = {};
               // 资源预加载，如果是 duration 类型的商品，且是先选日期的流程，在这里预拉取资源数据
               if (!targetProductData['schedule.ids']) {
-                _context25.next = 11;
+                _context25.next = 12;
                 break;
               }
               newScheduleArr = this.getScheduleDataByIds(targetProductData['schedule.ids']);
-              targetProduct.setOtherParams('schedule', newScheduleArr);
-              _context25.next = 16;
+              if (!this.store.currentProductMeta) this.store.currentProductMeta = {};
+              this.store.currentProductMeta.schedule = newScheduleArr;
+              _context25.next = 17;
               break;
-            case 11:
+            case 12:
               if (!targetProductData.duration) {
-                _context25.next = 16;
+                _context25.next = 17;
                 break;
               }
               dateRange = this.store.date.getDateRange(); // 如果不是先选日期的流程 duration 商品就啥也不做
               if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
-                _context25.next = 15;
+                _context25.next = 16;
                 break;
               }
               return _context25.abrupt("return");
-            case 15:
+            case 16:
               // this.store.date.getResourceDates({
               //   query: {
               //     start_date: dateRange[0].date,
@@ -2333,7 +2338,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 endDate: dateRange[dateRange.length - 1].date,
                 products: [targetProductData]
               });
-            case 16:
+            case 17:
             case "end":
               return _context25.stop();
           }
@@ -2347,8 +2352,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "closeProductDetail",
     value: function closeProductDetail() {
-      var _this$store$currentPr;
-      (_this$store$currentPr = this.store.currentProduct) === null || _this$store$currentPr === void 0 || _this$store$currentPr.setOtherParams('schedule', []);
+      if (this.store.currentProductMeta) {
+        this.store.currentProductMeta.schedule = [];
+      }
       this.store.currentProduct = undefined;
     }
   }, {
@@ -2361,7 +2367,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         product = _ref10.product;
       var targetProduct = this.store.currentProduct;
       // 如果外面传递了product 优先用外面的
-      var targetProductData = product || (targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData());
+      var targetProductData = product || targetProduct;
       var targetSchedules = [];
       // 如果外面传递了 scheduleIds,优先取入参
       if (scheduleIds !== null && scheduleIds !== void 0 && scheduleIds.length) {
@@ -2376,7 +2382,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var cartItems = cloneDeep(this.store.cart.getItems());
       var resourcesMap = getResourcesMap((targetResourceDate === null || targetResourceDate === void 0 ? void 0 : targetResourceDate.resource) || []);
       var selectedResources = getOthersSelectedResources(cartItems, '', resourcesMap);
-      var productResources = getResourcesByProduct(resourcesMap, resources || ((_this$store$currentPr2 = this.store.currentProduct) === null || _this$store$currentPr2 === void 0 || (_this$store$currentPr2 = _this$store$currentPr2.getData()) === null || _this$store$currentPr2 === void 0 || (_this$store$currentPr2 = _this$store$currentPr2.product_resource) === null || _this$store$currentPr2 === void 0 ? void 0 : _this$store$currentPr2.resources) || [], selectedResources, 1);
+      var productResources = getResourcesByProduct(resourcesMap, resources || ((_this$store$currentPr2 = this.store.currentProduct) === null || _this$store$currentPr2 === void 0 || (_this$store$currentPr2 = _this$store$currentPr2.product_resource) === null || _this$store$currentPr2 === void 0 ? void 0 : _this$store$currentPr2.resources) || [], selectedResources, 1);
       var minTimeMaxTime = calcMinTimeMaxTimeBySchedules(targetSchedules, {}, date);
       var scheduleTimeSlots = getAllSortedDateRanges(minTimeMaxTime);
       // 当前所有待选择资源的集合，先提出来，提升性能
@@ -2496,22 +2502,34 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getProductTypeById",
     value: function () {
       var _getProductTypeById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(id) {
-        var product;
+        var productData, _productData$schedule;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
               _context26.next = 2;
               return this.store.products.getProduct(id);
             case 2:
-              product = _context26.sent;
-              if (!product) {
-                _context26.next = 5;
+              productData = _context26.sent;
+              if (!productData) {
+                _context26.next = 9;
                 break;
               }
-              return _context26.abrupt("return", product.getProductType());
-            case 5:
-              return _context26.abrupt("return", 'normal');
+              if (!productData.duration) {
+                _context26.next = 6;
+                break;
+              }
+              return _context26.abrupt("return", 'duration');
             case 6:
+              if (!((_productData$schedule = productData['schedule.ids']) !== null && _productData$schedule !== void 0 && _productData$schedule.length)) {
+                _context26.next = 8;
+                break;
+              }
+              return _context26.abrupt("return", 'session');
+            case 8:
+              return _context26.abrupt("return", 'normal');
+            case 9:
+              return _context26.abrupt("return", 'normal');
+            case 10:
             case "end":
               return _context26.stop();
           }
@@ -2683,7 +2701,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getAvailableDateForSessionOptimize",
     value: function () {
       var _getAvailableDateForSessionOptimize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
-        var _this$store$currentPr3, _this$store$currentPr4, _this$store$currentPr5, _tempProducts, _this$store$currentPr6;
+        var _this$store$currentPr3, _this$store$currentPr4, _tempProducts;
         var params,
           startDate,
           endDate,
@@ -2729,7 +2747,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               endDate = tempEndDate;
 
               // 先去读缓存结果，因为正常 UI 调用的是 7 天，而下面我会直接计算 30 天（最少也是 14 天），所以先去读缓存结果，如果缓存结果存在，则直接返回
-              cache = (_this$store$currentPr3 = this.store.currentProduct) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3.getOtherParams()['timeSlotBySchedule'];
+              cache = (_this$store$currentPr3 = this.store.currentProductMeta) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3['timeSlotBySchedule'];
               if (!cache) {
                 _context29.next = 13;
                 break;
@@ -2745,8 +2763,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 13:
               // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
-              tempProducts = (_this$store$currentPr4 = this.store.currentProduct) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4.getData();
-              schedule = (_this$store$currentPr5 = this.store.currentProduct) === null || _this$store$currentPr5 === void 0 ? void 0 : _this$store$currentPr5.getOtherParams()['schedule'];
+              tempProducts = this.store.currentProduct;
+              schedule = (_this$store$currentPr4 = this.store.currentProductMeta) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4['schedule'];
               filteredSchedule = filterScheduleByDateRange(schedule, startDate || '', endDate || ''); // 1.后端返回的数据，确定资源在每一天的可用和使用情况
               tempResourceIds = getResourcesIdsByProduct(tempProducts);
               _context29.next = 19;
@@ -2906,17 +2924,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               this.store.date.setDateList(dates);
 
               // 缓存这次结果，以防后面他小幅度范围内去修改天数
-              (_this$store$currentPr6 = this.store.currentProduct) === null || _this$store$currentPr6 === void 0 || _this$store$currentPr6.setOtherParams('timeSlotBySchedule', {
+              if (!this.store.currentProductMeta) this.store.currentProductMeta = {};
+              this.store.currentProductMeta.timeSlotBySchedule = {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate,
                 startDate: startDate,
                 endDate: dayjs(currentDate).format('YYYY-MM-DD')
-              });
+              };
               return _context29.abrupt("return", {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate
               });
-            case 38:
+            case 39:
             case "end":
               return _context29.stop();
           }

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, Product, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -11,7 +11,8 @@ export interface BookingByStepState {
     accountList: AccountListModule;
     order: OrderModule;
     payment: PaymentModule;
-    currentProduct?: Product;
+    currentProduct?: ProductData;
+    currentProductMeta?: Record<string, any>;
     schedule: ScheduleModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];

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

@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -1,5 +1,5 @@
 import { Module, PisellCore } from '../../types';
-import { Product, ProductData } from '../../modules/';
+import { ProductData } from '../../modules/';
 import { BaseModule } from '../../modules/BaseModule';
 export * from './types';
 export declare class BuyTicketsImpl extends BaseModule implements Module {
@@ -16,7 +16,7 @@ export declare class BuyTicketsImpl extends BaseModule implements Module {
     loadProductsByCategory(categoryId: number): Promise<void>;
     destroy(): Promise<void>;
     getProducts(): Promise<ProductData[]>;
-    getProduct(id: number): Promise<Product>;
+    getProduct(id: number): Promise<ProductData>;
     listSubmit(data: Record<string, any>): Promise<{
         status: boolean;
         data: any;

package/dist/solution/BuyTickets/index.js

@@ -238,7 +238,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
               }
               return _context6.abrupt("return", otherProduct);
             case 10:
-              return _context6.abrupt("return", Promise.reject('Not fund product for id: ' + id));
+              throw new Error("Product not found: ".concat(id));
             case 11:
             case "end":
               return _context6.stop();

package/lib/modules/BaseModule.js

@@ -50,7 +50,9 @@ var BaseModule = class {
           currentCacheDataObj = {
             [cacheId]: {
               [this.name]: {}
-            }
+            },
+            // 防止有其他 cacheid 的数据
+            ...currentCacheDataObj
           };
         }
         if (!currentCacheDataObj[cacheId][this.name]) {

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

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

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

@@ -40,7 +40,7 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
     const cartProduct = await getProduct(
       item.id
     );
-    let productInfo = cartProduct == null ? void 0 : cartProduct.getData();
+    let productInfo = cartProduct;
     if (!productInfo) {
       productInfo = item._productOrigin;
     }

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

@@ -1,6 +1,5 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Product } from '../Product';
 import { ProductData } from '../Product/types';
 export * from './types';
 export declare class ProductList extends BaseModule implements Module {
@@ -31,7 +30,7 @@ export declare class ProductList extends BaseModule implements Module {
         channel?: string;
     }): Promise<any>;
     getProducts(): Promise<ProductData[]>;
-    getProduct(id: number): Promise<Product | undefined>;
+    getProduct(id: number): Promise<ProductData | undefined>;
     addProduct(products: ProductData[]): Promise<void>;
     selectProducts(products: ProductData[]): Promise<void>;
     /**

package/lib/modules/ProductList/index.js

@@ -24,7 +24,6 @@ __export(ProductList_exports, {
 });
 module.exports = __toCommonJS(ProductList_exports);
 var import_BaseModule = require("../BaseModule");
-var import_Product = require("../Product");
 var import_types = require("./types");
 var import_lodash_es = require("lodash-es");
 __reExport(ProductList_exports, require("./types"), module.exports);
@@ -41,30 +40,15 @@ var ProductList = class extends import_BaseModule.BaseModule {
     this.store = options.store;
     this.otherParams = options.otherParams || {};
     if (Array.isArray((_a = options.initialState) == null ? void 0 : _a.list)) {
-      this.store.list = options.initialState.list;
+      this.store.list = options.initialState.list.slice().sort((a, b) => Number(b.sort) - Number(a.sort));
       this.core.effects.emit(`${this.name}:changed`, this.store.list);
-      this.storeChange();
     } else {
       this.store.list = [];
-      this.store.productMap = /* @__PURE__ */ new Map();
       this.store.selectProducts = [];
     }
     this.request = core.getPlugin("request");
   }
   async storeChange(path, value) {
-    var _a;
-    (_a = this.store.list) == null ? void 0 : _a.forEach((product) => {
-      const productModule = this.store.productMap.get(`product-${product.id}`);
-      if (!productModule) {
-        const newProductModule = new import_Product.Product(
-          `product_${product.id.toString()}`
-        );
-        this.core.registerModule(newProductModule, { initialState: product });
-        this.store.productMap.set(product.id.toString(), newProductModule);
-      } else {
-        productModule.updateData(product);
-      }
-    });
   }
   async loadProducts({
     category_ids = [],
@@ -86,7 +70,6 @@ var ProductList = class extends import_BaseModule.BaseModule {
     } catch (error) {
       console.error(error);
     }
-    debugger;
     const productsData = await this.request.post(
       `/product/query`,
       {
@@ -119,8 +102,9 @@ var ProductList = class extends import_BaseModule.BaseModule {
       },
       { useCache: true }
     );
-    this.addProduct(productsData.data.list);
-    return productsData.data.list;
+    const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    this.addProduct(sortedList);
+    return sortedList;
   }
   async loadProductsPrice({
     ids = [],
@@ -152,10 +136,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
       import_types.ProductListHooks.onGetProduct,
       this.store.list
     );
-    const product = this.store.productMap.get(`${id}`);
-    if (product)
-      return product;
-    return void 0;
+    const product = this.store.list.find((product2) => product2.id === id);
+    return product ? (0, import_lodash_es.cloneDeep)(product) : void 0;
   }
   async addProduct(products) {
     if (!this.store.list) {
@@ -169,7 +151,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
         this.store.list[index] = n;
       }
     });
-    this.storeChange();
+    this.store.list.sort((a, b) => Number(b.sort) - Number(a.sort));
+    this.core.effects.emit(`${this.name}:changed`, this.store.list);
   }
   async selectProducts(products) {
     this.store.selectProducts = products;

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

@@ -1,7 +1,6 @@
 import { ProductData } from '../Product/types';
 export interface ProductListData {
     list: ProductData[];
-    productMap: Map<string, any>;
     selectProducts: ProductData[];
 }
 export declare enum ProductListHooks {

package/lib/solution/BookingByStep/index.js

@@ -389,7 +389,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 获取商品/服务的可用日期
   async getAvailableDate(params = {}) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     let { products, startDate, endDate, type, useCache = true } = params;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
@@ -406,14 +406,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (this.store.currentProduct) {
       tempProducts = [
         {
-          ...this.store.currentProduct.getData(),
-          _schedule: this.store.currentProduct.getOtherParams()["schedule"]
+          ...this.store.currentProduct,
+          _schedule: (_a = this.store.currentProductMeta) == null ? void 0 : _a["schedule"]
         }
       ];
     }
     let dateRange = this.store.date.getDateRange();
-    const tempStartDate = startDate || ((_a = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _a.date);
-    const tempEndDate = endDate || ((_b = dateRange == null ? void 0 : dateRange[1]) == null ? void 0 : _b.date) || ((_c = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _c.date);
+    const tempStartDate = startDate || ((_b = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _b.date);
+    const tempEndDate = endDate || ((_c = dateRange == null ? void 0 : dateRange[1]) == null ? void 0 : _c.date) || ((_d = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _d.date);
     if (!tempProducts.length) {
       return [];
     }
@@ -808,13 +808,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return errorCartItemIds;
   }
   destroy() {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     (_a = this.store.cart) == null ? void 0 : _a.destroy();
     (_b = this.store.step) == null ? void 0 : _b.destroy();
     (_c = this.store.products) == null ? void 0 : _c.destroy();
     (_d = this.store.guests) == null ? void 0 : _d.destroy();
     (_e = this.store.date) == null ? void 0 : _e.destroy();
     (_f = this.store.accountList) == null ? void 0 : _f.destroy();
+    (_g = this.store.schedule) == null ? void 0 : _g.destroy();
+    (_h = this.store.summary) == null ? void 0 : _h.destroy();
+    (_i = this.store.order) == null ? void 0 : _i.destroy();
     this.core.effects.offByModuleDestroy(this.name);
     this.core.unregisterModule(this);
   }
@@ -1595,15 +1598,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 打开某个商品详情的弹窗，OS 层这边会记录当前选中的商品，适用于 session 类商品预约
   async openProductDetail(productId) {
-    const targetProduct = await this.store.products.getProduct(productId);
-    if (targetProduct) {
-      const targetProductData = targetProduct.getData();
-      this.store.currentProduct = targetProduct;
+    const targetProductData = await this.store.products.getProduct(productId);
+    if (targetProductData) {
+      this.store.currentProduct = targetProductData;
+      this.store.currentProductMeta = {};
       if (targetProductData["schedule.ids"]) {
         const newScheduleArr = this.getScheduleDataByIds(
           targetProductData["schedule.ids"]
         );
-        targetProduct.setOtherParams("schedule", newScheduleArr);
+        if (!this.store.currentProductMeta)
+          this.store.currentProductMeta = {};
+        this.store.currentProductMeta.schedule = newScheduleArr;
       } else if (targetProductData.duration) {
         const dateRange = this.store.date.getDateRange();
         if (!(dateRange == null ? void 0 : dateRange.length))
@@ -1617,8 +1622,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
   }
   closeProductDetail() {
-    var _a;
-    (_a = this.store.currentProduct) == null ? void 0 : _a.setOtherParams("schedule", []);
+    if (this.store.currentProductMeta) {
+      this.store.currentProductMeta.schedule = [];
+    }
     this.store.currentProduct = void 0;
   }
   getTimeslotBySchedule({
@@ -1627,9 +1633,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     resources,
     product
   }) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e;
     const targetProduct = this.store.currentProduct;
-    const targetProductData = product || (targetProduct == null ? void 0 : targetProduct.getData());
+    const targetProductData = product || targetProduct;
     let targetSchedules = [];
     if (scheduleIds == null ? void 0 : scheduleIds.length) {
       targetSchedules = this.store.schedule.getScheduleListByIds(scheduleIds);
@@ -1649,7 +1655,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     );
     const productResources = (0, import_resources.getResourcesByProduct)(
       resourcesMap,
-      resources || ((_c = (_b = (_a = this.store.currentProduct) == null ? void 0 : _a.getData()) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
+      resources || ((_b = (_a = this.store.currentProduct) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) || [],
       selectedResources,
       1
     );
@@ -1670,9 +1676,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return -1;
       return 0;
     });
-    const firstEnabledResourceId = (_f = (_e = (_d = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _d.resources) == null ? void 0 : _e.find(
+    const firstEnabledResourceId = (_e = (_d = (_c = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.find(
       (n) => n.status === 1
-    )) == null ? void 0 : _f.id;
+    )) == null ? void 0 : _e.id;
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
       const resourcesUseableMap = {};
       let count = 0;
@@ -1746,9 +1752,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return this.otherData[key];
   }
   async getProductTypeById(id) {
-    const product = await this.store.products.getProduct(id);
-    if (product) {
-      return product.getProductType();
+    var _a;
+    const productData = await this.store.products.getProduct(id);
+    if (productData) {
+      if (productData.duration) {
+        return "duration";
+      }
+      if ((_a = productData["schedule.ids"]) == null ? void 0 : _a.length) {
+        return "session";
+      }
+      return "normal";
     }
     return "normal";
   }
@@ -1909,7 +1922,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return results;
   }
   async getAvailableDateForSessionOptimize(params = {}) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d;
     let { startDate, endDate } = 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");
@@ -1925,7 +1938,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       tempEndDate = endDate || "";
     }
     endDate = tempEndDate;
-    const cache = (_a = this.store.currentProduct) == null ? void 0 : _a.getOtherParams()["timeSlotBySchedule"];
+    const cache = (_a = this.store.currentProductMeta) == null ? void 0 : _a["timeSlotBySchedule"];
     if (cache) {
       if ((0, import_dayjs.default)(params.startDate).isSameOrAfter((0, import_dayjs.default)(cache.startDate), "day") && (0, import_dayjs.default)(params.endDate).isSameOrBefore((0, import_dayjs.default)(cache.endDate), "day")) {
         this.store.date.setDateList(cache.dateList);
@@ -1936,8 +1949,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
     }
     let tempProducts;
-    tempProducts = (_b = this.store.currentProduct) == null ? void 0 : _b.getData();
-    const schedule = (_c = this.store.currentProduct) == null ? void 0 : _c.getOtherParams()["schedule"];
+    tempProducts = this.store.currentProduct;
+    const schedule = (_b = this.store.currentProductMeta) == null ? void 0 : _b["schedule"];
     const filteredSchedule = (0, import_resources.filterScheduleByDateRange)(
       schedule,
       startDate || "",
@@ -1954,7 +1967,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     let dates = [];
     let currentDate = (0, import_dayjs.default)(startDate);
     let firstAvailableDate = "";
-    const openResources = ((_e = (_d = tempProducts == null ? void 0 : tempProducts.product_resource) == null ? void 0 : _d.resources) == null ? void 0 : _e.filter(
+    const openResources = ((_d = (_c = tempProducts == null ? void 0 : tempProducts.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.filter(
       (m) => m.status === 1
     )) || [];
     const allProductResources = (0, import_resources.sortCombinedResources)(res.data);
@@ -2055,12 +2068,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     dates = (0, import_utils3.handleAvailableDateByResource)(res.data, dates);
     this.store.date.setDateList(dates);
-    (_f = this.store.currentProduct) == null ? void 0 : _f.setOtherParams("timeSlotBySchedule", {
+    if (!this.store.currentProductMeta)
+      this.store.currentProductMeta = {};
+    this.store.currentProductMeta.timeSlotBySchedule = {
       dateList: dates,
       firstAvailableDate,
       startDate,
       endDate: (0, import_dayjs.default)(currentDate).format("YYYY-MM-DD")
-    });
+    };
     return {
       dateList: dates,
       firstAvailableDate

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, Product, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -11,7 +11,8 @@ export interface BookingByStepState {
     accountList: AccountListModule;
     order: OrderModule;
     payment: PaymentModule;
-    currentProduct?: Product;
+    currentProduct?: ProductData;
+    currentProductMeta?: Record<string, any>;
     schedule: ScheduleModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];

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

@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -1,5 +1,5 @@
 import { Module, PisellCore } from '../../types';
-import { Product, ProductData } from '../../modules/';
+import { ProductData } from '../../modules/';
 import { BaseModule } from '../../modules/BaseModule';
 export * from './types';
 export declare class BuyTicketsImpl extends BaseModule implements Module {
@@ -16,7 +16,7 @@ export declare class BuyTicketsImpl extends BaseModule implements Module {
     loadProductsByCategory(categoryId: number): Promise<void>;
     destroy(): Promise<void>;
     getProducts(): Promise<ProductData[]>;
-    getProduct(id: number): Promise<Product>;
+    getProduct(id: number): Promise<ProductData>;
     listSubmit(data: Record<string, any>): Promise<{
         status: boolean;
         data: any;

package/lib/solution/BuyTickets/index.js

@@ -98,7 +98,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
       return mainProduct;
     if (otherProduct)
       return otherProduct;
-    return Promise.reject("Not fund product for id: " + id);
+    throw new Error(`Product not found: ${id}`);
   }
   // 商品列表页提交
   async listSubmit(data) {

package/package.json

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