@pisell/pisellos 0.0.14 → 0.0.16

package/lib/solution/BookingByStep/index.js

@@ -48,6 +48,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     this.otherParams = {};
   }
   async initialize(core, options) {
+    var _a;
     this.core = core;
     this.store = options.store || {};
     this.otherParams = options.otherParams || {};
@@ -58,22 +59,35 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (!this.request) {
       throw new Error("bookingByStep解决方案需要 request 插件支持");
     }
+    let targetCacheData = {};
+    if ((_a = this.otherParams) == null ? void 0 : _a.cacheId) {
+      const sessionData = this.window.sessionStorage.getItem(this.name);
+      if (sessionData) {
+        const data = JSON.parse(sessionData);
+        targetCacheData = data[this.otherParams.cacheId];
+      }
+    }
     const moduleArr = [
       "cart",
       "summary",
       "step",
       "products",
-      "guests",
       "date",
       "accountList",
       "order",
       "payment"
     ];
     moduleArr.forEach((step) => {
+      var _a2, _b;
       const targetModule = (0, import_types.createModule)(step, this.name);
       if (targetModule) {
         this.store[step] = targetModule;
-        this.core.registerModule(targetModule);
+        this.core.registerModule(targetModule, { initialState: targetCacheData[targetModule.name], otherParams: {
+          ...this.otherParams,
+          fatherModule: this.name,
+          openCache: ((_a2 = this.otherParams) == null ? void 0 : _a2.cacheId) ? true : false,
+          cacheId: (_b = this.otherParams) == null ? void 0 : _b.cacheId
+        } });
       } else {
         throw new Error(`模块 ${step} 不存在`);
       }
@@ -126,7 +140,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       category_ids,
       ids: product_ids,
       collection
-    });
+    }, { useCache: true });
     this.store.products.addProduct(productsData.data.list);
     return productsData.data.list;
   }
@@ -174,9 +188,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   async setDateRange(dateRange) {
     this.store.date.setDateRange(dateRange);
   }
+  clearDateRange() {
+    this.store.date.clearDateRange();
+  }
   // 获取日期模块里选中的日期
-  async getRangeDate() {
-    return "2024-01-01";
+  async getDateRange() {
+    return this.store.date.getDateRange();
   }
   async getCart() {
     return this.store.cart.getItems();
@@ -272,7 +289,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     this.store.cart.updateItem(params);
   }
   // 删除购物车里某个商品
-  deleteCart(product_id) {
+  deleteCart(cartItemId) {
+    this.store.cart.removeItem(cartItemId);
   }
   // 清空购物车
   clearCart() {
@@ -282,6 +300,23 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   clearCartByAccount(account_id) {
     this.store.cart.clearCartByAccount(account_id);
   }
+  /**
+   * 批量更新购物车
+   */
+  batchUpdateCart(paramsList) {
+    const cartItems = [];
+    paramsList.forEach((params) => {
+      const cartItem = this.store.cart.formatCartItem(params);
+      cartItems.push(cartItem);
+    });
+    this.store.cart.batchSetItems(cartItems);
+  }
+  /**
+   * 从购物车中按类别删除信息
+   */
+  deleteCartItemInfo(types) {
+    this.store.cart.deleteCartItemInfo(types);
+  }
   destory() {
     var _a, _b, _c, _d, _e, _f;
     (_a = this.store.cart) == null ? void 0 : _a.destory();
@@ -305,11 +340,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const cartItems = this.store.cart.getItems();
     const arr = [];
     cartItems.forEach((cartItem) => {
-      const productResources = (0, import_resources.getResourcesByProduct)(
-        resourcesMap,
-        cartItem,
-        cartItems
-      );
+      const productResources = (0, import_resources.getResourcesByProduct)(resourcesMap, cartItem, cartItems);
       arr.push({
         id: cartItem.id,
         // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
@@ -323,6 +354,35 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     });
     return arr;
   }
+  // 给单个购物车里的商品获取资源列表
+  getResourcesListByCartItem(id) {
+    const cartItems = this.store.cart.getItems();
+    const dateRange = this.store.date.getDateRange();
+    const resources = [];
+    dateRange.forEach((n) => {
+      if (n.resource)
+        resources.push(...n.resource);
+    });
+    const resourcesMap = (0, import_utils.getResourcesMap)(resources);
+    const arr = [];
+    const targetCartItem = cartItems.find((n) => n._id === id);
+    if (!targetCartItem) {
+      throw new Error(`没有找到${id}购物车商品`);
+    }
+    const productResources = (0, import_resources.getResourcesByProduct)(resourcesMap, targetCartItem, cartItems);
+    if (productResources) {
+      return {
+        id: targetCartItem.id,
+        // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
+        _id: targetCartItem._id,
+        // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
+        product: targetCartItem._productOrigin,
+        resources: productResources,
+        holder_id: targetCartItem.holder_id,
+        holder_name: targetCartItem.holder_title
+      };
+    }
+  }
   // 通过资源列表和指定的资源 id，获取指定资源的时间切片
   getResourceTimeSlot({
     product,
@@ -484,7 +544,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
               resources: [
                 ...(item._origin.resources || []).filter(
-                  (existingRes) => existingRes.resourceType !== res.selectedResource.resourceType
+                  (existingRes) => existingRes.form_id !== res.selectedResource.form_id
                 ),
                 res.selectedResource
               ]
@@ -494,14 +554,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             errorList.push(item._id);
           }
         } else {
-          const productResources = (0, import_resources.getResourcesByProduct)(
-            resourcesMap,
-            item,
-            allCartItems
-          );
-          const targetRenderList = (_a = productResources.find(
-            (n) => n.code === resources_code
-          )) == null ? void 0 : _a.renderList;
+          const productResources = (0, import_resources.getResourcesByProduct)(resourcesMap, item, allCartItems);
+          const targetRenderList = (_a = productResources.find((n) => n.code === resources_code)) == null ? void 0 : _a.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
             this.store.cart.updateItem({
               _id: item._id,
@@ -592,7 +646,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       newResources.forEach((n) => {
         var _a, _b, _c, _d;
         n.startTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
-        n.endTime = (0, import_dayjs.default)(n.startTime).add(((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0, ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes").format("YYYY-MM-DD HH:mm");
+        n.endTime = (0, import_dayjs.default)(n.startTime).add(
+          ((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0,
+          ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes"
+        ).format("YYYY-MM-DD HH:mm");
         delete n.times;
       });
       this.store.cart.updateItem({
@@ -601,6 +658,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
     });
   }
+  clearCache() {
+  }
+  clearCacheByModule(module2) {
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/solution/BookingByStep/types.js

@@ -26,7 +26,6 @@ module.exports = __toCommonJS(types_exports);
 var import_modules = require("../../modules");
 var import_AccountList = require("../../modules/AccountList");
 var import_Date = require("../../modules/Date");
-var import_Guests = require("../../modules/Guests");
 var import_Order = require("../../modules/Order");
 var import_Payment = require("../../modules/Payment");
 var import_Step = require("../../modules/Step");
@@ -41,8 +40,6 @@ function createModule(moduleName, solutionName, name, version) {
       return new import_Step.StepModule(`${solutionName}_${name || moduleName}`, version);
     case "products":
       return new import_modules.ProductList(`${solutionName}_${name || moduleName}`, version);
-    case "guests":
-      return new import_Guests.GuestListModule(`${solutionName}_${name || moduleName}`, version);
     case "date":
       return new import_Date.DateModule(`${solutionName}_${name || moduleName}`, version);
     case "accountList":

package/lib/solution/ShopDiscount/index.js

@@ -82,15 +82,29 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     }
   }
   registerDependentModules() {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g;
+    let targetCacheData = {};
+    if ((_a = this.options.otherParams) == null ? void 0 : _a.cacheId) {
+      const sessionData = this.window.sessionStorage.getItem(this.name);
+      if (sessionData) {
+        const data = JSON.parse(sessionData);
+        targetCacheData = data[this.options.otherParams.cacheId];
+      }
+    }
     const discount = new import_Discount.DiscountModule(`${this.name}_discount`);
     this.core.registerModule(discount, {
-      hooks: (_b = (_a = this.options.otherParams) == null ? void 0 : _a.discount) == null ? void 0 : _b.hooks
+      initialState: targetCacheData[discount.name],
+      hooks: (_c = (_b = this.options.otherParams) == null ? void 0 : _b.discount) == null ? void 0 : _c.hooks,
+      otherParams: {
+        fatherModule: this.name,
+        openCache: ((_d = this.options.otherParams) == null ? void 0 : _d.cacheId) ? true : false,
+        cacheId: (_e = this.options.otherParams) == null ? void 0 : _e.cacheId
+      }
     });
     this.store.discount = discount;
     const rules = new import_Rules.RulesModule(`${this.name}_rules`);
     this.core.registerModule(rules, {
-      hooks: (_d = (_c = this.options.otherParams) == null ? void 0 : _c.rules) == null ? void 0 : _d.hooks
+      hooks: (_g = (_f = this.options.otherParams) == null ? void 0 : _f.rules) == null ? void 0 : _g.hooks
     });
     this.store.rules = rules;
   }
@@ -98,6 +112,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     this.core.effects.on(
       import_types.ShopDiscountHooks.onCustomerChange,
       (customer) => {
+        var _a;
+        if (((_a = this.options.otherParams) == null ? void 0 : _a.cacheId) && this.getDiscountList().length) {
+          return;
+        }
         this.loadPrepareConfig({
           customerId: customer.id,
           action: "create",

package/package.json

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