@pisell/pisellos 0.0.37 → 2.0.1

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

@@ -1,4 +1,13 @@
-import { ProductList, CartModule, Product, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule } from "../../modules";
+import { ProductList, CartModule } from "../../modules";
+import { AccountModule } from "../../modules/Account";
+import { AccountListModule } from "../../modules/AccountList";
+import { DateModule } from "../../modules/Date";
+import { GuestListModule } from "../../modules/Guests";
+import { OrderModule } from "../../modules/Order";
+import { PaymentModule } from "../../modules/Payment";
+import { ResourceListModule } from "../../modules/Resource";
+import { StepModule } from "../../modules/Step";
+import { SummaryModule } from "../../modules/Summary";
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -11,7 +20,6 @@ export interface BookingByStepState {
     accountList: AccountListModule;
     order: OrderModule;
     payment: PaymentModule;
-    currentProduct: Product;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];
 export declare enum BookingByStepHooks {

package/dist/solution/BookingByStep/types.js

@@ -1,4 +1,10 @@
-import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule } from "../../modules";
+import { ProductList, CartModule } from "../../modules";
+import { AccountListModule } from "../../modules/AccountList";
+import { DateModule } from "../../modules/Date";
+import { OrderModule } from "../../modules/Order";
+import { PaymentModule } from "../../modules/Payment";
+import { StepModule } from "../../modules/Step";
+import { SummaryModule } from "../../modules/Summary";
 export function createModule(moduleName, solutionName, name, version) {
   switch (moduleName) {
     case "cart":

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

@@ -45,7 +45,8 @@ export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, curren
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getResourcesByProduct: (resourcesMap: Record<string, ResourceItem>, resources: ResourceItem[], selectedResources: number[], capacity?: number) => ResourceItem[];
+export declare const getResourcesByProduct: (resourcesMap: Record<string, ResourceItem>, cartItem: CartItem, cartList: CartItem[]) => ResourceItem[];
+export declare const getSumCapacity: () => number;
 /**
  * @title: 获取资源列表
  * @description:
@@ -66,12 +67,11 @@ export declare const formatResources: ({ booking, resources }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate }: {
     resource: ResourceItem;
     duration: number;
     split: number;
     currentDate: DateType | string;
-    capacity?: number | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -100,52 +100,11 @@ export declare const getResourcesByIds: (resourcesMap: Record<string, ResourceIt
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
     currentDate: DateType | string;
     split: number;
-    capacity?: number | undefined;
 }) => any[];
-/**
- * @title: 获取其他人的已选资源
- * @description:
- * @param {CartItem[]} cartItems
- * @param {number | string} accountId
- * @return {*}
- * @Author: jinglin.tan
- */
-export declare const getOthersSelectedResources: (cartItems: CartItem[], accountId: number | string, resourcesMap: Record<string, ResourceItem>) => number[];
-interface CapacityItem {
-    id: number;
-    value: number;
-    name: string;
-}
-/**
- * @title: 基于选择的商品格式化容量
- * @description:
- * @param {any} param1
- * @return {*}
- * @Author: zhiwei.Wang
- */
-export declare const formatDefaultCapacitys: ({ capacity, product_bundle }: any) => CapacityItem[];
-/**
- * @title: 获取总容量
- * @description:
- * @param {object} capacity 为 formatDefaultCapacitys()的结果
- * @return {*}
- * @Author: zhiwei.Wang
- */
-export declare const getSumCapacity: ({ capacity }: {
-    capacity: CapacityItem[];
-}) => number;
-/**
- * @title: 传入资源，如果有子资源，会根据组合资源的 capacity 计算修改子资源的 capacity
- * @description:
- * @param {object} resource
- * @return {*}
- * @Author: jinglin.tan
- */
-export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
 export {};

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

@@ -191,39 +191,41 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export var getResourcesByProduct = function getResourcesByProduct(resourcesMap, resources, selectedResources) {
-  var capacity = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
-  return (resources || []).reduce(function (acc, item) {
+export var getResourcesByProduct = function getResourcesByProduct(resourcesMap, cartItem, cartList) {
+  var _product$product_reso;
+  var product = cartItem._productOrigin;
+  return ((product === null || product === void 0 || (_product$product_reso = product.product_resource) === null || _product$product_reso === void 0 ? void 0 : _product$product_reso.resources) || []).reduce(function (acc, item) {
     if ((item === null || item === void 0 ? void 0 : item.status) == 1) {
       var form_id = item.id;
       // 去重 可选资源和必选资源可能会有重复的
       item.optional_resource = (item.optional_resource || []).filter(function (d) {
         return item.default_resource.indexOf(d) == -1;
       });
-      var optional_resource = item.optional_resource.reduce(function (childAcc, d) {
-        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id) && capacity <= resourcesMap[d].capacity) {
-          // 拼装组合资源的数据
-          var combiningResources = [];
-          if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
-            resourcesMap[d].combined_resource.resource_ids.forEach(function (id) {
-              if (resourcesMap[id]) {
-                combiningResources.push(resourcesMap[id]);
-              }
+
+      // 如果购物车里有 某一项的 resources 选中过了某些资源，则把这些资源给过滤掉
+      // 这里做一个拍平，把非当前 holder_id 的资源洗到一个数组里
+      var selectedResources = cartList.reduce(function (acc, d) {
+        if (d.holder_id !== cartItem.holder_id) {
+          var _d$_origin;
+          if ((_d$_origin = d._origin) !== null && _d$_origin !== void 0 && _d$_origin.resources) {
+            d._origin.resources.forEach(function (n) {
+              acc.push(n.id);
             });
           }
+        }
+        return acc;
+      }, []);
+      var optional_resource = item.optional_resource.reduce(function (childAcc, d) {
+        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
           childAcc.push(Object.assign({}, resourcesMap[d], {
             form_id: form_id,
-            resourceType: item.type,
-            children: combiningResources,
-            metadata: _objectSpread(_objectSpread({}, resourcesMap[d].metadata), {}, {
-              combined_resource: resourcesMap[d].combined_resource
-            })
+            resourceType: item.type
           }));
         }
         return childAcc;
       }, []);
       var default_resource = item.default_resource.reduce(function (childAcc, d) {
-        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id) && capacity <= resourcesMap[d].capacity) {
+        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
           childAcc.push(Object.assign({}, resourcesMap[d], {
             form_id: form_id,
             resourceType: item.type,
@@ -247,6 +249,14 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
     return acc;
   }, []);
 };
+export var getSumCapacity = function getSumCapacity() {
+  // let sum = 0;
+  // for (let item of booking._extend.capacity || []) {
+  //   sum += item.value;
+  // }
+  // 一期默认为1人
+  return 1;
+};
 
 /**
  * @title: 获取资源列表
@@ -309,8 +319,7 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref4) {
     _ref4$split = _ref4.split,
     split = _ref4$split === void 0 ? 10 : _ref4$split,
     _ref4$currentDate = _ref4.currentDate,
-    currentDate = _ref4$currentDate === void 0 ? dayjs() : _ref4$currentDate,
-    capacity = _ref4.capacity;
+    currentDate = _ref4$currentDate === void 0 ? dayjs() : _ref4$currentDate;
   var times = resource.times;
 
   // 存储所有时间切片
@@ -347,7 +356,7 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref4) {
         timeSlice: timeSlice,
         time: time,
         resource: resource,
-        currentCount: capacity || 1
+        currentCount: getSumCapacity()
       });
       if (_status.usable) {
         // 添加时间切片  09:00 ~ 10:00   09:20 ~ 10:20   09:00 ~ 10:00   09:20 ~ 10:20  11:00 ~ 12:00   11:20 ~ 12:20
@@ -421,8 +430,7 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref5) {
     resourcesMap = _ref5.resourcesMap,
     duration = _ref5.duration,
     currentDate = _ref5.currentDate,
-    split = _ref5.split,
-    capacity = _ref5.capacity;
+    split = _ref5.split;
   // 获取资源列表
   var resources = getResourcesByIds(resourcesMap, resourceIds);
 
@@ -432,140 +440,11 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref5) {
       resource: item,
       duration: duration,
       split: split,
-      currentDate: currentDate,
-      capacity: capacity
+      currentDate: currentDate
     }));
   }, []);
 
   // 获取时间切片列表的交集
   var intersection = getTimesIntersection(timeSliceList, resources.length);
   return intersection;
-};
-
-/**
- * @title: 获取其他人的已选资源
- * @description: 
- * @param {CartItem[]} cartItems
- * @param {number | string} accountId
- * @return {*}
- * @Author: jinglin.tan
- */
-export var getOthersSelectedResources = function getOthersSelectedResources(cartItems, accountId, resourcesMap) {
-  return cartItems.reduce(function (acc, d) {
-    if (d.holder_id !== accountId) {
-      var _d$_origin;
-      if ((_d$_origin = d._origin) !== null && _d$_origin !== void 0 && _d$_origin.resources) {
-        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));
-          } 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);
-                }
-              }
-            });
-          }
-          acc.push(n.id);
-        });
-      }
-    }
-    return acc;
-  }, []);
-};
-/**
- * @title: 基于选择的商品格式化容量
- * @description: 
- * @param {any} param1
- * @return {*}
- * @Author: zhiwei.Wang
- */
-export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref6) {
-  var capacity = _ref6.capacity,
-    product_bundle = _ref6.product_bundle;
-  if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'package') {
-    return (product_bundle || []).map(function (d) {
-      var id = d.bundle_product_id;
-      var item = ((capacity === null || capacity === void 0 ? void 0 : capacity.package) || []).find(function (item) {
-        return item.product_id === id;
-      });
-      return {
-        id: id,
-        value: item ? d.num || 0 : 0,
-        name: (item === null || item === void 0 ? void 0 : item.name) || (d === null || d === void 0 ? void 0 : d.title)
-      };
-    });
-  }
-  if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'custom') {
-    return ((capacity === null || capacity === void 0 ? void 0 : capacity.custom) || []).map(function (d) {
-      return {
-        id: d.id,
-        value: d.min,
-        name: d.name
-      };
-    });
-  }
-
-  // 默认为1
-  return [{
-    id: 0,
-    value: 1,
-    name: ''
-  }];
-};
-
-/**
- * @title: 获取总容量
- * @description: 
- * @param {object} capacity 为 formatDefaultCapacitys()的结果
- * @return {*}
- * @Author: zhiwei.Wang
- */
-export var getSumCapacity = function getSumCapacity(_ref7) {
-  var capacity = _ref7.capacity;
-  var sum = 0;
-  var _iterator2 = _createForOfIteratorHelper(capacity || []),
-    _step2;
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var item = _step2.value;
-      sum += item.value;
-    }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
-  }
-  return sum;
-};
-
-/**
- * @title: 传入资源，如果有子资源，会根据组合资源的 capacity 计算修改子资源的 capacity
- * @description: 
- * @param {object} resource
- * @return {*}
- * @Author: jinglin.tan
- */
-export var checkSubResourcesCapacity = function checkSubResourcesCapacity(resource) {
-  if (resource.children && resource.children.length) {
-    var countCapacity = resource.capacity;
-    resource.children.forEach(function (child) {
-      if (child.capacity <= countCapacity) {
-        countCapacity -= child.capacity;
-      } else {
-        child.capacity = countCapacity;
-        countCapacity = 0;
-      }
-    });
-  }
 };

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

@@ -90,10 +90,6 @@ export interface CartItem {
     _productOrigin?: ProductData;
     /** 资源原始数据 */
     _resourceOrigin?: Resource[];
-    /** 容量 */
-    capacity?: any;
-    /** 商品套餐 */
-    product_bundle?: any;
 }
 /**
  * 购物车状态接口

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

@@ -19,7 +19,6 @@ export declare const createCartItemOrigin: () => {
     sub_type: null;
     duration: null;
     like_status: string;
-    relation_type: string;
     resources: null;
     schedule_id: number;
     start_date: null;

package/lib/modules/Cart/utils.js

@@ -77,8 +77,8 @@ var createCartItemOrigin = () => {
     // 资源相关
     // 资源状态 -固定
     like_status: "common",
-    // 资源类型 - 固定
-    relation_type: "form",
+    // // 资源类型 - 固定----谭景琳备注：马天宇说现在平行资源是不传这个的
+    // relation_type: "form",
     // 所选资源
     resources: null,
     // 日程id - 固定
@@ -213,29 +213,17 @@ var formatResourceToCartItemOrigin = (params) => {
   let origin = cartItem._origin;
   if (resources && (resources == null ? void 0 : resources.length)) {
     origin.resources = [];
-    const checkResourcesFormat = (resources2, arr) => {
-      resources2.forEach((resource) => {
-        var _a;
-        const childArr = [];
-        if ((_a = resource == null ? void 0 : resource.children) == null ? void 0 : _a.length) {
-          checkResourcesFormat(resource.children, childArr);
-        }
-        arr.push({
-          relation_type: "form",
-          like_status: "common",
-          id: resource.id,
-          main_field: resource.main_field,
-          resourceType: resource.resourceType,
-          form_id: resource.form_id,
-          relation_id: resource.id,
-          capacity: (resource == null ? void 0 : resource.capacity) || 0,
-          children: childArr,
-          metadata: (resource == null ? void 0 : resource.metadata) || {}
-          // 后端可以在这里挂一个前端用于计算的数据
-        });
+    resources.forEach((resource) => {
+      origin.resources.push({
+        like_status: "common",
+        id: resource.id,
+        main_field: resource.main_field,
+        resourceType: resource.resourceType,
+        form_id: resource.form_id,
+        relation_id: resource.id,
+        capacity: (resource == null ? void 0 : resource.capacity) || 0
       });
-    };
-    checkResourcesFormat(resources, origin.resources);
+    });
     const { startTime, endTime } = resources[0];
     if (startTime && endTime) {
       origin.select_date = (0, import_dayjs.default)(startTime).format("YYYY-MM-DD");

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

@@ -2,20 +2,10 @@ import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { ProductData, ProductMedia, ProductTag, ProductCategory, ProductBundleGroup } from './types';
 export * from './types';
-/**
- * 商品详情模块
- * 除了跟商品列表模块组合外，还会提供单独的商品详情页的一些方法
- *
- * @export
- * @class Product
- * @extends {BaseModule}
- * @implements {Module}
- */
 export declare class Product extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
-    protected otherParams: any;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     /**

package/lib/modules/Product/index.js

@@ -30,9 +30,6 @@ var Product = class extends import_BaseModule.BaseModule {
     super(name, version);
     this.defaultName = "product";
     this.defaultVersion = "1.0.0";
-    this.otherParams = {
-      scheduler: []
-    };
   }
   async initialize(core, options) {
     this.core = core;

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

@@ -152,10 +152,6 @@ export interface ProductData {
     options?: any[];
     /** 商品原信息 */
     origin?: any;
-    /** 容量 */
-    capacity?: any;
-    /** 商品套餐 */
-    product_bundle?: any;
 }
 /**
  * 商品媒体信息接口

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

@@ -26,7 +26,6 @@ export interface Resource {
     startTime?: string;
     endTime?: string;
     resourceType?: string;
-    children?: Resource[];
 }
 /**
  * 资源列表状态

package/lib/modules/index.d.ts

@@ -1,12 +1,3 @@
 export * from './Product';
 export * from './ProductList';
 export * from './Cart';
-export * from './Account';
-export * from './AccountList';
-export * from './Date';
-export * from './Guests';
-export * from './Order';
-export * from './Payment';
-export * from './Resource';
-export * from './Step';
-export * from './Summary';

package/lib/modules/index.js

@@ -19,27 +19,9 @@ module.exports = __toCommonJS(modules_exports);
 __reExport(modules_exports, require("./Product"), module.exports);
 __reExport(modules_exports, require("./ProductList"), module.exports);
 __reExport(modules_exports, require("./Cart"), module.exports);
-__reExport(modules_exports, require("./Account"), module.exports);
-__reExport(modules_exports, require("./AccountList"), module.exports);
-__reExport(modules_exports, require("./Date"), module.exports);
-__reExport(modules_exports, require("./Guests"), module.exports);
-__reExport(modules_exports, require("./Order"), module.exports);
-__reExport(modules_exports, require("./Payment"), module.exports);
-__reExport(modules_exports, require("./Resource"), module.exports);
-__reExport(modules_exports, require("./Step"), module.exports);
-__reExport(modules_exports, require("./Summary"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./Product"),
   ...require("./ProductList"),
-  ...require("./Cart"),
-  ...require("./Account"),
-  ...require("./AccountList"),
-  ...require("./Date"),
-  ...require("./Guests"),
-  ...require("./Order"),
-  ...require("./Payment"),
-  ...require("./Resource"),
-  ...require("./Step"),
-  ...require("./Summary")
+  ...require("./Cart")
 });

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

@@ -5,7 +5,7 @@ import { BookingByStepState } from "./types";
 import { CartItem, IUpdateItemParams, ProductData } from "../../modules";
 import { Account } from "../../modules/Account/types";
 import { IStep } from "../../modules/Step/tyeps";
-import { TimeSliceItem, ResourceItem } from "./utils/resources";
+import { TimeSliceItem } from "./utils/resources";
 import { ITime } from "../../modules/Date/types";
 export declare class BookingByStepImpl extends BaseModule implements Module {
     protected defaultName: string;
@@ -27,17 +27,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     back(): void;
     gotoStep(index: number): void;
     getStepList(): IStep[];
-    loadProducts({ category_ids, product_ids, collection, schedule_ids }: {
+    loadProducts({ category_ids, product_ids, collection, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
-        schedule_ids?: number[];
-    }): Promise<any>;
-    loadAllSchedule(): Promise<void>;
-    loadAvailableDate({ startDate, endDate, custom_page_id }: {
-        startDate: string;
-        endDate: string;
-        custom_page_id?: number;
     }): Promise<any>;
     storeProduct(productData: ProductData): Promise<void>;
     addAccount(accounts: Account[]): Promise<void>;
@@ -94,8 +87,8 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         id: number | undefined;
         _id: string;
         product: ProductData | undefined;
-        resources: ResourceItem[];
-        holder_id: string | number;
+        resources: import("./utils/resources").ResourceItem[];
+        holder_id: string | number | undefined;
         holder_name: string | undefined;
     } | undefined;
     getResourceTimeSlot({ product, resources, currentResourceId, }: {
@@ -114,12 +107,11 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         timeSlots: any[];
         selectedResource: any;
     } | undefined;
-    autoSelectAccountResources({ holder_id, resources_code, timeSlots, countMap, capacity }: {
+    autoSelectAccountResources({ holder_id, resources_code, timeSlots, countMap, }: {
         holder_id: string;
         resources_code: string | number;
         timeSlots?: TimeSliceItem;
         countMap: Record<number, number>;
-        capacity?: number;
     }): {
         selectedResource: any;
         timeSlots?: undefined;
@@ -134,5 +126,4 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     clearCache(): void;
     clearCacheByModule(module: string): void;
-    openProductDetail(productId: number): Promise<void>;
 }