@pisell/pisellos 0.0.13 → 0.0.15

package/lib/solution/BookingByStep/index.js

@@ -107,9 +107,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return this.store.step.getStepList();
   }
   // 获取购物车里 temp.xxx的方法
-  async getStoreCart(key) {
-    return this.store.cart.getTemp(key);
-  }
+  // async getStoreCart(key?: string) {
+  //   return this.store.cart.getTemp(key);
+  // }
   // 加载商品，然后导到商品列表里去
   async loadProducts({
     category_ids = [],
@@ -272,7 +272,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 +283,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 +323,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 绑定资源和时间
@@ -393,18 +407,24 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     resources_code,
     timeSlots
   }) {
-    var _a;
+    var _a, _b, _c;
     const dateRange = this.store.date.getDateRange();
     const cartItems = this.store.cart.getItems();
-    const accountCartItems = cartItems.filter((n) => n.holder_id === holder_id);
+    const accountCartItems = cartItems.filter((n) => n.holder_id === holder_id) || [];
+    if (!accountCartItems.length) {
+      return {
+        selectedResource: null
+      };
+    }
     let duration = accountCartItems.reduce((acc, n) => {
-      return acc + n._productOrigin.duration.value;
+      var _a2, _b2;
+      return acc + (((_b2 = (_a2 = n._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) ?? 0);
     }, 0);
-    let durationType = ((_a = accountCartItems == null ? void 0 : accountCartItems[0]) == null ? void 0 : _a._productOrigin.duration.type) || "minutes";
+    let durationType = ((_c = (_b = (_a = accountCartItems[0]) == null ? void 0 : _a._productOrigin) == null ? void 0 : _b.duration) == null ? void 0 : _c.type) ?? "minutes";
     const resources = [];
     accountCartItems.forEach((item) => {
-      var _a2, _b;
-      (_b = (_a2 = item._productOrigin.product_resource) == null ? void 0 : _a2.resources) == null ? void 0 : _b.forEach((n) => {
+      var _a2, _b2, _c2;
+      (_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.forEach((n) => {
         if (n.code === resources_code) {
           resources.push(...n.renderList || []);
         }
@@ -475,25 +495,30 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             console.log(this.store.cart.getItems());
             this.store.cart.updateItem({
               _id: item._id,
-              resources: [...item._origin.resources || [], res.selectedResource]
+              // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
+              resources: [
+                ...(item._origin.resources || []).filter(
+                  (existingRes) => existingRes.form_id !== res.selectedResource.form_id
+                ),
+                res.selectedResource
+              ]
             });
             console.log(this.store.cart.getItems());
           } else {
             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,
-              resources: [...item._origin.resources || [], targetRenderList[0]]
+              resources: [
+                ...(item._origin.resources || []).filter(
+                  (existingRes) => existingRes.resourceType !== targetRenderList[0].resourceType
+                ),
+                targetRenderList[0]
+              ]
             });
           } else {
             errorList.push(item._id);
@@ -510,13 +535,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const cartItems = this.store.cart.getItems();
     const resourceIds = [];
     cartItems.forEach((item) => {
-      var _a, _b, _c;
-      (_b = (_a = item._productOrigin.product_resource) == null ? void 0 : _a.resources) == null ? void 0 : _b.forEach((n) => {
+      var _a, _b, _c, _d;
+      (_c = (_b = (_a = item._productOrigin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) == null ? void 0 : _c.forEach((n) => {
         if (n.code === resources_code) {
           resources.push(...n.renderList || []);
         }
       });
-      (_c = item._origin.resources) == null ? void 0 : _c.forEach((n) => {
+      (_d = item._origin.resources) == null ? void 0 : _d.forEach((n) => {
         resourceIds.push(n.relation_id);
       });
     });
@@ -526,7 +551,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       let accountDuration = 0;
       const cartItems2 = this.store.cart.getCartByAccount(account.getId());
       cartItems2.forEach((item) => {
-        accountDuration += item._productOrigin.duration.value;
+        var _a, _b;
+        accountDuration += ((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0;
       });
       if (accountDuration > duration) {
         duration = accountDuration;
@@ -572,8 +598,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     cartItems.forEach((item) => {
       const newResources = (0, import_lodash_es.cloneDeep)(item._origin.resources);
       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(item._productOrigin.duration.value, item._productOrigin.duration.type).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({

package/lib/solution/BookingByStep/utils/resources.js

@@ -149,7 +149,10 @@ var getResourcesByProduct = (resourcesMap, cartItem, cartList) => {
       }, []);
       item.renderList = optional_resource.concat(default_resource);
       item.renderList = item.renderList.filter((d) => {
-        return (0, import_dayjs.default)(d.times[0].end_at).isAfter((0, import_dayjs.default)());
+        const latestTime = d.times.reduce((latest, current) => {
+          return (0, import_dayjs.default)(current.end_at).isAfter((0, import_dayjs.default)(latest.end_at)) ? current : latest;
+        }, d.times[0]);
+        return (0, import_dayjs.default)(latestTime.end_at).isAfter((0, import_dayjs.default)());
       });
       item.form_id = form_id;
       acc.push(item);

package/package.json

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