@pisell/pisellos 0.0.48 → 0.0.49

package/dist/modules/Order/index.js

@@ -16,6 +16,7 @@ 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 { generateDuration } from "./utils";
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
   var _super = _createSuper(OrderModule);
@@ -66,6 +67,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var is_deposit = 0; // 是否存在定金，0 不存在，1 存在
       if (params.cartItems.length > 0) {
         params.cartItems.forEach(function (item) {
+          if (!item._origin.duration) {
+            var _generateDuration = generateDuration(item),
+              duration = _generateDuration.duration,
+              durationType = _generateDuration.durationType;
+            item._origin.duration = duration;
+            item._origin.sub_type = durationType;
+          }
           order.bookings.push(item._origin);
           if (item !== null && item !== void 0 && item.deposit) {
             is_deposit = 1;

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

@@ -0,0 +1,10 @@
+import { CartItem } from "../Cart";
+/**
+ * 通过 session 类商品的开始时间结束时间生成商品的时长
+ * @param {CartItem} cartItem
+ * @return {*}
+ */
+export declare const generateDuration: (cartItem: CartItem) => {
+    duration: number;
+    durationType: string;
+};

package/dist/modules/Order/utils.js

@@ -0,0 +1,15 @@
+import dayjs from "dayjs";
+/**
+ * 通过 session 类商品的开始时间结束时间生成商品的时长
+ * @param {CartItem} cartItem
+ * @return {*}
+ */
+export var generateDuration = function generateDuration(cartItem) {
+  var startDate = dayjs("".concat(cartItem.start_date, " ").concat(cartItem.start_time));
+  var endDate = dayjs("".concat(cartItem.end_date, " ").concat(cartItem.end_time));
+  var duration = endDate.diff(startDate, 'minutes');
+  return {
+    duration: duration,
+    durationType: 'minutes'
+  };
+};

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

@@ -135,7 +135,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         _id: string;
         product: ProductData | undefined;
         resources: import("./utils/resources").ResourceItem[];
-        holder_id: string | number;
+        holder_id: string | number | undefined;
         holder_name: string | undefined;
     } | undefined;
     getResourceTimeSlot({ product, resources, currentResourceId, }: {

package/dist/solution/BookingByStep/index.js

@@ -27,7 +27,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../../modules/BaseModule";
 import { BookingByStepHooks, createModule } from "./types";
 import { getAvailableProductResources } from "./utils/products";
-import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, formatDefaultCapacitys, getSumCapacity, checkSubResourcesCapacity } from "./utils/resources";
+import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, formatDefaultCapacitys, getSumCapacity, checkSubResourcesCapacity, getOthersCartSelectedResources } from "./utils/resources";
 import dayjs from 'dayjs';
 import { getResourcesMap } from "../../modules/Resource/utils";
 import { cloneDeep } from 'lodash-es';
@@ -1089,7 +1089,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
         });
       }
-      var resourcesMap = getResourcesMap(resources);
+      var resourcesMap = getResourcesMap(cloneDeep(resources));
       var cartItems = this.store.cart.getItems();
       var arr = [];
       var capacityMap = {};
@@ -1098,6 +1098,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var selectedResources = [];
         if (cartItem.holder_id) {
           selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
+        } else {
+          selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap);
         }
         var formatCapacity = formatDefaultCapacitys({
           capacity: (_cartItem$_productOri = cartItem._productOrigin) === null || _cartItem$_productOri === void 0 ? void 0 : _cartItem$_productOri.capacity,
@@ -1157,15 +1159,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       dateRange.forEach(function (n) {
         if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
       });
-      var resourcesMap = getResourcesMap(resources);
+      // 这里为什么要 cloneDeep：因为 getOthersSelectedResources 和 getOthersCartSelectedResources 会修改 resourcesMap 的 capacity
+      // 用于确保后续分配的容量不会超出
+      var resourcesMap = getResourcesMap(cloneDeep(resources));
       var targetCartItem = cartItems.find(function (n) {
         return n._id === id;
       });
       if (!targetCartItem) {
         throw new Error("\u6CA1\u6709\u627E\u5230".concat(id, "\u8D2D\u7269\u8F66\u5546\u54C1"));
       }
-      if (!targetCartItem.holder_id) return;
-      var selectedResources = getOthersSelectedResources(cartItems, targetCartItem.holder_id, resourcesMap);
+      var selectedResources = [];
+      if (targetCartItem.holder_id) {
+        selectedResources = getOthersSelectedResources(cartItems, targetCartItem.holder_id, resourcesMap);
+      } else {
+        selectedResources = getOthersCartSelectedResources(cartItems, targetCartItem._id, resourcesMap);
+      }
       var formatCapacity = formatDefaultCapacitys({
         capacity: (_targetCartItem$_prod = targetCartItem._productOrigin) === null || _targetCartItem$_prod === void 0 ? void 0 : _targetCartItem$_prod.capacity,
         product_bundle: targetCartItem._origin.product.product_bundle
@@ -1392,7 +1400,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       dateRange.forEach(function (n) {
         if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
       });
-      var resourcesMap = getResourcesMap(resources);
+      var resourcesMap = getResourcesMap(cloneDeep(resources));
       // 一个账号一个账号处理
       var errorList = [];
       var selectResourcesMap = {};
@@ -1460,8 +1468,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 这里必须每次循环重新读，避免前一次循环操作了购物车，导致数据变更
             var allCartItems = _this7.store.cart.getItems();
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
-            if (!item.holder_id) return;
-            var selectedResources = getOthersSelectedResources(allCartItems, item.holder_id, resourcesMap);
+            var selectedResources = [];
+            if (item.holder_id) {
+              selectedResources = getOthersSelectedResources(allCartItems, item.holder_id, resourcesMap);
+            } else {
+              selectedResources = getOthersCartSelectedResources(allCartItems, item._id, resourcesMap);
+            }
             var productResources = getResourcesByProduct(resourcesMap, ((_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.product_resource) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.resources) || [], selectedResources, currentCapacity);
             // 自动选择 productResources 中对应 resources_code 的资源
             var targetRenderList = (_productResources$fin = productResources.find(function (n) {

package/dist/solution/BookingByStep/utils/resources.d.ts

@@ -118,6 +118,15 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
  * @Author: jinglin.tan
  */
 export declare const getOthersSelectedResources: (cartItems: CartItem[], accountId: number | string, resourcesMap: Record<string, ResourceItem>) => number[];
+/**
+ * @title: 获取其他购物车内商品的已选资源
+ * @description:
+ * @param {CartItem[]} cartItems
+ * @param {number | string} accountId
+ * @return {*}
+ * @Author: jinglin.tan
+ */
+export declare const getOthersCartSelectedResources: (cartItems: CartItem[], cartItemId: number | string, resourcesMap: Record<string, ResourceItem>) => number[];
 interface CapacityItem {
     id: number;
     value: number;

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

@@ -496,6 +496,57 @@ export var getOthersSelectedResources = function getOthersSelectedResources(cart
               return acc;
             }
             acc.push.apply(acc, _toConsumableArray(n.metadata.combined_resource.resource_ids));
+            n.metadata.combined_resource.resource_ids.forEach(function (m) {
+              resourcesMap[m].capacity -= n.num;
+            });
+          } else {
+            // 如果当前选中的不是组合资源，但是是别的组合资源里的子资源，则还需要把别的组合资源也加进来
+            // 去 resourcesMap 里找一下 n.id 是不是别的组合资源里的子资源，是的话把别的组合资源也加进来
+            Object.values(resourcesMap).forEach(function (m) {
+              if (m.combined_resource && m.combined_resource.status === 1) {
+                if (m.combined_resource.resource_ids.includes(n.id)) {
+                  acc.push(m.id);
+                  resourcesMap[m.id].capacity -= n.num;
+                }
+              }
+            });
+          }
+          acc.push(n.id);
+          resourcesMap[n.id].capacity -= n.num;
+        });
+      }
+    }
+    return acc;
+  }, []);
+};
+
+/**
+ * @title: 获取其他购物车内商品的已选资源
+ * @description:
+ * @param {CartItem[]} cartItems
+ * @param {number | string} accountId
+ * @return {*}
+ * @Author: jinglin.tan
+ */
+export var getOthersCartSelectedResources = function getOthersCartSelectedResources(cartItems, cartItemId, resourcesMap) {
+  return cartItems.reduce(function (acc, d) {
+    if (d._id !== cartItemId) {
+      var _d$_origin2;
+      if ((_d$_origin2 = d._origin) !== null && _d$_origin2 !== void 0 && _d$_origin2.resources) {
+        debugger;
+        d._origin.resources.forEach(function (n) {
+          // 如果是组合资源，还需要检查组合资源里子资源是否被占用过
+          if (n.metadata.combined_resource && n.metadata.combined_resource.status === 1) {
+            // 如果组合资源里子资源被占用过，则这个资源不可以进待选列表了
+            if (n.metadata.combined_resource.resource_ids.some(function (m) {
+              return acc.includes(m);
+            })) {
+              return acc;
+            }
+            acc.push.apply(acc, _toConsumableArray(n.metadata.combined_resource.resource_ids));
+            n.metadata.combined_resource.resource_ids.forEach(function (m) {
+              resourcesMap[m].capacity -= n.num;
+            });
           } else {
             // 如果当前选中的不是组合资源，但是是别的组合资源里的子资源，则还需要把别的组合资源也加进来
             // 去 resourcesMap 里找一下 n.id 是不是别的组合资源里的子资源，是的话把别的组合资源也加进来
@@ -503,11 +554,14 @@ export var getOthersSelectedResources = function getOthersSelectedResources(cart
               if (m.combined_resource && m.combined_resource.status === 1) {
                 if (m.combined_resource.resource_ids.includes(n.id)) {
                   acc.push(m.id);
+                  resourcesMap[m.id].capacity -= n.num;
                 }
               }
             });
           }
           acc.push(n.id);
+          // push 完以后，把 resourceMap 的 capacity 减掉当前的商品数量
+          resourcesMap[n.id].capacity -= n.num;
         });
       }
     }

package/lib/modules/Order/index.js

@@ -23,6 +23,7 @@ __export(Order_exports, {
 });
 module.exports = __toCommonJS(Order_exports);
 var import_BaseModule = require("../BaseModule");
+var import_utils = require("./utils");
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -48,6 +49,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     let is_deposit = 0;
     if (params.cartItems.length > 0) {
       params.cartItems.forEach((item) => {
+        if (!item._origin.duration) {
+          const { duration, durationType } = (0, import_utils.generateDuration)(item);
+          item._origin.duration = duration;
+          item._origin.sub_type = durationType;
+        }
         order.bookings.push(item._origin);
         if (item == null ? void 0 : item.deposit) {
           is_deposit = 1;

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

@@ -0,0 +1,10 @@
+import { CartItem } from "../Cart";
+/**
+ * 通过 session 类商品的开始时间结束时间生成商品的时长
+ * @param {CartItem} cartItem
+ * @return {*}
+ */
+export declare const generateDuration: (cartItem: CartItem) => {
+    duration: number;
+    durationType: string;
+};

package/lib/modules/Order/utils.js

@@ -0,0 +1,45 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Order/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  generateDuration: () => generateDuration
+});
+module.exports = __toCommonJS(utils_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var generateDuration = (cartItem) => {
+  const startDate = (0, import_dayjs.default)(`${cartItem.start_date} ${cartItem.start_time}`);
+  const endDate = (0, import_dayjs.default)(`${cartItem.end_date} ${cartItem.end_time}`);
+  const duration = endDate.diff(startDate, "minutes");
+  return { duration, durationType: "minutes" };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  generateDuration
+});

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

@@ -135,7 +135,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         _id: string;
         product: ProductData | undefined;
         resources: import("./utils/resources").ResourceItem[];
-        holder_id: string | number;
+        holder_id: string | number | undefined;
         holder_name: string | undefined;
     } | undefined;
     getResourceTimeSlot({ product, resources, currentResourceId, }: {

package/lib/solution/BookingByStep/index.js

@@ -545,7 +545,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           resources.push(...n.resource);
       });
     }
-    const resourcesMap = (0, import_utils.getResourcesMap)(resources);
+    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
     const cartItems = this.store.cart.getItems();
     const arr = [];
     const capacityMap = {};
@@ -558,6 +558,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           cartItem.holder_id,
           resourcesMap
         );
+      } else {
+        selectedResources = (0, import_resources.getOthersCartSelectedResources)(
+          cartItems,
+          cartItem._id,
+          resourcesMap
+        );
       }
       const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
         capacity: (_a = cartItem._productOrigin) == null ? void 0 : _a.capacity,
@@ -621,18 +627,25 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       if (n.resource)
         resources.push(...n.resource);
     });
-    const resourcesMap = (0, import_utils.getResourcesMap)(resources);
+    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
     const targetCartItem = cartItems.find((n) => n._id === id);
     if (!targetCartItem) {
       throw new Error(`没有找到${id}购物车商品`);
     }
-    if (!targetCartItem.holder_id)
-      return;
-    const selectedResources = (0, import_resources.getOthersSelectedResources)(
-      cartItems,
-      targetCartItem.holder_id,
-      resourcesMap
-    );
+    let selectedResources = [];
+    if (targetCartItem.holder_id) {
+      selectedResources = (0, import_resources.getOthersSelectedResources)(
+        cartItems,
+        targetCartItem.holder_id,
+        resourcesMap
+      );
+    } else {
+      selectedResources = (0, import_resources.getOthersCartSelectedResources)(
+        cartItems,
+        targetCartItem._id,
+        resourcesMap
+      );
+    }
     const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
       capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
       product_bundle: targetCartItem._origin.product.product_bundle
@@ -797,7 +810,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       if (n.resource)
         resources.push(...n.resource);
     });
-    const resourcesMap = (0, import_utils.getResourcesMap)(resources);
+    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
     const errorList = [];
     const selectResourcesMap = {};
     this.store.accountList.getAccounts().forEach((account) => {
@@ -857,13 +870,20 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
         } else {
           const allCartItems = this.store.cart.getItems();
-          if (!item.holder_id)
-            return;
-          const selectedResources = (0, import_resources.getOthersSelectedResources)(
-            allCartItems,
-            item.holder_id,
-            resourcesMap
-          );
+          let selectedResources = [];
+          if (item.holder_id) {
+            selectedResources = (0, import_resources.getOthersSelectedResources)(
+              allCartItems,
+              item.holder_id,
+              resourcesMap
+            );
+          } else {
+            selectedResources = (0, import_resources.getOthersCartSelectedResources)(
+              allCartItems,
+              item._id,
+              resourcesMap
+            );
+          }
           const productResources = (0, import_resources.getResourcesByProduct)(
             resourcesMap,
             ((_k = (_j = item._productOrigin) == null ? void 0 : _j.product_resource) == null ? void 0 : _k.resources) || [],

package/lib/solution/BookingByStep/utils/resources.d.ts

@@ -118,6 +118,15 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
  * @Author: jinglin.tan
  */
 export declare const getOthersSelectedResources: (cartItems: CartItem[], accountId: number | string, resourcesMap: Record<string, ResourceItem>) => number[];
+/**
+ * @title: 获取其他购物车内商品的已选资源
+ * @description:
+ * @param {CartItem[]} cartItems
+ * @param {number | string} accountId
+ * @return {*}
+ * @Author: jinglin.tan
+ */
+export declare const getOthersCartSelectedResources: (cartItems: CartItem[], cartItemId: number | string, resourcesMap: Record<string, ResourceItem>) => number[];
 interface CapacityItem {
     id: number;
     value: number;

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

@@ -33,6 +33,7 @@ __export(resources_exports, {
   formatDefaultCapacitys: () => formatDefaultCapacitys,
   formatResources: () => formatResources,
   getIsUsableByTimeItem: () => getIsUsableByTimeItem,
+  getOthersCartSelectedResources: () => getOthersCartSelectedResources,
   getOthersSelectedResources: () => getOthersSelectedResources,
   getResourcesByIds: () => getResourcesByIds,
   getResourcesByProduct: () => getResourcesByProduct,
@@ -358,16 +359,56 @@ var getOthersSelectedResources = (cartItems, accountId, resourcesMap) => {
               return acc;
             }
             acc.push(...n.metadata.combined_resource.resource_ids);
+            n.metadata.combined_resource.resource_ids.forEach((m) => {
+              resourcesMap[m].capacity -= n.num;
+            });
+          } else {
+            Object.values(resourcesMap).forEach((m) => {
+              if (m.combined_resource && m.combined_resource.status === 1) {
+                if (m.combined_resource.resource_ids.includes(n.id)) {
+                  acc.push(m.id);
+                  resourcesMap[m.id].capacity -= n.num;
+                }
+              }
+            });
+          }
+          acc.push(n.id);
+          resourcesMap[n.id].capacity -= n.num;
+        });
+      }
+    }
+    return acc;
+  }, []);
+};
+var getOthersCartSelectedResources = (cartItems, cartItemId, resourcesMap) => {
+  return cartItems.reduce((acc, d) => {
+    var _a;
+    if (d._id !== cartItemId) {
+      if ((_a = d._origin) == null ? void 0 : _a.resources) {
+        debugger;
+        d._origin.resources.forEach((n) => {
+          if (n.metadata.combined_resource && n.metadata.combined_resource.status === 1) {
+            if (n.metadata.combined_resource.resource_ids.some(
+              (m) => acc.includes(m)
+            )) {
+              return acc;
+            }
+            acc.push(...n.metadata.combined_resource.resource_ids);
+            n.metadata.combined_resource.resource_ids.forEach((m) => {
+              resourcesMap[m].capacity -= n.num;
+            });
           } else {
             Object.values(resourcesMap).forEach((m) => {
               if (m.combined_resource && m.combined_resource.status === 1) {
                 if (m.combined_resource.resource_ids.includes(n.id)) {
                   acc.push(m.id);
+                  resourcesMap[m.id].capacity -= n.num;
                 }
               }
             });
           }
           acc.push(n.id);
+          resourcesMap[n.id].capacity -= n.num;
         });
       }
     }
@@ -428,6 +469,7 @@ var checkSubResourcesCapacity = (resource) => {
   formatDefaultCapacitys,
   formatResources,
   getIsUsableByTimeItem,
+  getOthersCartSelectedResources,
   getOthersSelectedResources,
   getResourcesByIds,
   getResourcesByProduct,

package/package.json

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