@pisell/pisellos 0.0.45 → 0.0.46

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

@@ -36,6 +36,7 @@ export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, curren
     afterToDay: boolean;
     capacity: boolean;
     usable: boolean;
+    remainingCapacity: number;
 };
 /**
  * @title: 获取商品下绑定的资源列表

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

@@ -111,7 +111,10 @@ var checkCapacity = function checkCapacity(_ref) {
     _ref$currentCount = _ref.currentCount,
     currentCount = _ref$currentCount === void 0 ? 1 : _ref$currentCount;
   if (currentCount > resource.capacity) {
-    return false;
+    return {
+      status: false,
+      capacity: resource.capacity
+    };
   }
   var conflict = (event_list || []).filter(function (d) {
     return isConflict({
@@ -127,9 +130,15 @@ var checkCapacity = function checkCapacity(_ref) {
   if (resource.resourceType === 'single') {
     // 0代表着不重叠,则满足条件
     if (conflict.length === 0) {
-      return true;
+      return {
+        status: true,
+        capacity: 1
+      };
     } else {
-      return false;
+      return {
+        status: false,
+        capacity: 1
+      };
     }
   } else {
     // 减去重叠的总量
@@ -137,9 +146,15 @@ var checkCapacity = function checkCapacity(_ref) {
 
     // 当前预约量 <= 总剩余容量
     if (currentCount <= conflictCount) {
-      return true;
+      return {
+        status: true,
+        capacity: conflictCount
+      };
     } else {
-      return false;
+      return {
+        status: false,
+        capacity: conflictCount
+      };
     }
   }
 };
@@ -160,7 +175,8 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
   var status = {
     afterToDay: false,
     capacity: false,
-    usable: false
+    usable: false,
+    remainingCapacity: 0 // 剩余容量
   };
   // 最早可预约时间为 当前日期之后并且提前量之后
   var earliest = dayjs();
@@ -170,14 +186,16 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
     return status;
   }
   status.afterToDay = true;
-  if (!checkCapacity({
+  var checkCapacityResult = checkCapacity({
     event_list: time === null || time === void 0 ? void 0 : time.event_list,
     timeSlice: timeSlice,
     resource: resource,
     currentCount: currentCount
-  })) {
+  });
+  if (!checkCapacityResult.status) {
     return status;
   }
+  status.remainingCapacity = checkCapacityResult.capacity;
   status.capacity = true;
   status.usable = true;
   return status;

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

@@ -18,7 +18,7 @@ export declare class AccountListModule extends BaseModule implements Module {
      * @param needEmit 是否需要触发事件
      */
     private createAccountAndAdd;
-    addAccount(account: Account): Promise<void>;
+    addAccount(account: Account): Promise<AccountModule>;
     updateAccount(id: string, updates: Account): Promise<void>;
     updateAccountListById(id: string | number, updates: Account): Promise<void>;
     removeAccount(id: string): Promise<void>;
@@ -33,7 +33,7 @@ export declare class AccountListModule extends BaseModule implements Module {
      * @param holders 账号信息列表
      * @param customerId 账户id
      */
-    addHolderAccounts(holders: IHolder[], customerId: number): Promise<void>;
+    addHolderAccounts(holders: IHolder[], customerId: number): Promise<AccountModule[]>;
     /**
      * 获取holder类型账户列表
      * @param params

package/lib/modules/AccountList/index.js

@@ -71,8 +71,11 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
    * @param needEmit 是否需要触发事件
    */
   async createAccountAndAdd(account, needEmit = true) {
-    if (this.store.accounts.some((a) => a.getId() === account.id)) {
-      return;
+    const tempAccountModule = this.store.accounts.find(
+      (a) => a.getId() === account.id
+    );
+    if (tempAccountModule) {
+      return tempAccountModule;
     }
     this.store.accountList.push(account);
     const accountModule = new import_Account.AccountModule(`account_${account.id}`);
@@ -85,14 +88,18 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
         this.store
       );
     }
+    return accountModule;
   }
   async addAccount(account) {
+    let currentAccountModule;
     try {
       this.store.isLoading = true;
       this.store.error = null;
       if (this.store.accounts.some((a) => a.getId() === account.id)) {
+        currentAccountModule = this.store.accounts.find(
+          (n) => n.getId() === account.id
+        );
         throw new Error(`Account with id ${account.id} already exists`);
-        return;
       }
       this.store.accountList.push(account);
       const accountModule = new import_Account.AccountModule(`account_${account.id}`);
@@ -102,6 +109,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       if (this.store.accounts.length === 1) {
         this.setActiveAccount(accountModule.getId());
       }
+      currentAccountModule = accountModule;
       await this.core.effects.emit(
         import_types.AccountListHooks.OnAccountListUpdate,
         this.store
@@ -115,6 +123,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       );
     } finally {
       this.store.isLoading = false;
+      return currentAccountModule;
     }
   }
   async updateAccount(id, updates) {
@@ -245,14 +254,17 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
    * @param customerId 账户id
    */
   async addHolderAccounts(holders, customerId) {
+    const accountModules = [];
     for (const holder of holders) {
       const account = (0, import_utils.createHolderAccount)(holder, customerId);
-      await this.createAccountAndAdd(account, false);
+      const accountModule = await this.createAccountAndAdd(account, false);
+      accountModules.push(accountModule);
     }
     await this.core.effects.emit(
       import_types.AccountListHooks.OnAccountListUpdate,
       this.store
     );
+    return accountModules;
   }
   /**
    * 获取holder类型账户列表

package/lib/modules/Cart/index.js

@@ -76,6 +76,7 @@ var CartModule = class extends import_BaseModule.BaseModule {
     };
     if (product) {
       cartItem._productOrigin = (0, import_lodash_es.cloneDeep)(product);
+      cartItem._productInit = (0, import_lodash_es.cloneDeep)(product);
       cartItem = (0, import_utils.formatProductToCartItem)({
         cartItem,
         product,

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

@@ -96,16 +96,16 @@ export interface CartItem {
             title: string;
         }[];
     } | null;
-    /** 原始数据 */
+    /** 接口原始数据 */
     _origin: any;
+    /** 商品加入购物车时初始数据 */
+    _productInit?: ProductData;
     /** 商品原始数据 */
     _productOrigin?: ProductData;
     /** 资源原始数据 */
     _resourceOrigin?: Resource[];
     /** 容量 */
     capacity?: any;
-    /** 商品套餐 */
-    product_bundle?: any;
 }
 /**
  * 购物车状态接口

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

@@ -2,7 +2,7 @@ import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { Response } from '../../plugins';
 import { BookingByStepState } from './types';
-import { CartItem, IUpdateItemParams, ProductData } from '../../modules';
+import { CartItem, IUpdateItemParams, ProductData, ProductResourceItem } from '../../modules';
 import { Account } from '../../modules/Account/types';
 import { IStep } from '../../modules/Step/tyeps';
 import { TimeSliceItem } from './utils/resources';
@@ -52,10 +52,14 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         custom_page_id?: number;
     }): Promise<ITime[]>;
     storeProduct(productData: ProductData): Promise<void>;
-    addAccount(accounts: Account[] | IHolder[], extra?: {
+    addAccount(account: Account | IHolder, extra?: {
         type: 'account' | 'holder';
         customerId: number;
-    }): Promise<void>;
+    }): Promise<Account | null>;
+    addAccounts(accounts: Account[] | IHolder[], extra?: {
+        type: 'account' | 'holder';
+        customerId: number;
+    }): Promise<Account[] | undefined>;
     getAccounts(): Promise<(Account | null)[]>;
     checkHasLoginAccount(): boolean;
     setActiveAccount(id: string): void;
@@ -71,6 +75,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getDateRange(): Promise<ITime[]>;
     getCart(): CartItem[];
     getAvailableDate(params?: {
+        url?: string;
         products?: ProductData[];
         startDate?: string;
         endDate?: string;
@@ -172,9 +177,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     private getScheduleDataByIds;
     openProductDetail(productId: number): Promise<void>;
     closeProductDetail(): void;
-    getTimeslotBySchedule({ date, scheduleIds, }: {
+    getTimeslotBySchedule({ date, scheduleIds, resources, }: {
         date: string;
-        scheduleIds: number[];
+        scheduleIds?: number[];
+        resources?: ProductResourceItem[];
     }): {
         start_time: string;
         end_time: string;

package/lib/solution/BookingByStep/index.js

@@ -232,20 +232,32 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   async storeProduct(productData) {
     const activeAccount = this.getActiveAccount();
-    if (!activeAccount) {
-      throw new Error("没有找到当前账户");
-    }
     const { bundle, options, origin, product_variant_id } = productData || {};
     const product = { ...origin, product_variant_id };
-    this.store.cart.addItem({
-      account: activeAccount,
+    const addCartItem = {
       product,
       bundle,
       options
-    });
+    };
+    if (activeAccount) {
+      addCartItem.account = activeAccount;
+    }
+    this.store.cart.addItem(addCartItem);
+  }
+  // 添加单个账户或者 guest
+  async addAccount(account, extra) {
+    if ((extra == null ? void 0 : extra.type) === "holder") {
+      const accountModules = await this.store.accountList.addHolderAccounts(
+        [account],
+        extra.customerId
+      );
+      return accountModules[0].getAccount();
+    }
+    const newAccount = await this.store.accountList.addAccount(account);
+    return newAccount.getAccount();
   }
   // 添加账户或者 guest
-  async addAccount(accounts, extra) {
+  async addAccounts(accounts, extra) {
     if ((extra == null ? void 0 : extra.type) === "holder") {
       this.store.accountList.addHolderAccounts(
         accounts,
@@ -253,9 +265,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       );
       return;
     }
-    accounts.forEach((account) => {
-      this.store.accountList.addAccount(account);
-    });
+    const res = [];
+    for (const account of accounts) {
+      const accountModule = await this.store.accountList.addAccount(account);
+      const accountData = accountModule.getAccount();
+      if (accountData) {
+        res.push(accountData);
+      }
+    }
+    return res;
   }
   // 获取所有账户
   async getAccounts() {
@@ -330,6 +348,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const { resourceIds, rules, resourcesMap } = (0, import_products.getAvailableProductResources)(tempProducts) || {};
     this.otherParams.currentResourcesMap = resourcesMap;
     const res = await this.store.date.getResourceDates({
+      url: params.url,
       query: {
         start_date: tempStartDate,
         end_date: tempEndDate,
@@ -514,7 +533,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         if (n.resource)
           resources.push(...n.resource);
       });
-    } else {
+    }
+    if (!resources.length) {
       const dateList = this.store.date.getDateList();
       dateList.forEach((n) => {
         if (n.resource)
@@ -992,8 +1012,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   getTimeslotBySchedule({
     date,
-    scheduleIds
+    scheduleIds,
+    resources
   }) {
+    var _a, _b, _c;
     const targetProduct = this.store.currentProduct;
     const targetProductData = targetProduct == null ? void 0 : targetProduct.getData();
     let targetSchedules = [];
@@ -1006,32 +1028,46 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const resourcesDates = this.store.date.getDateList();
     const targetResourceDate = resourcesDates.find((n) => n.date === date);
+    const cartItems = this.store.cart.getItems();
+    const resourcesMap = (0, import_utils.getResourcesMap)((targetResourceDate == null ? void 0 : targetResourceDate.resource) || []);
+    const selectedResources = (0, import_resources.getOthersSelectedResources)(
+      cartItems,
+      "",
+      resourcesMap
+    );
+    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) || [],
+      selectedResources,
+      1
+    );
     const minTimeMaxTime = (0, import_utils2.calcMinTimeMaxTimeBySchedules)(
       targetSchedules,
       {},
       date
     );
     const scheduleTimeSlots = (0, import_utils2.getAllSortedDateRanges)(minTimeMaxTime);
-    console.log("scheduleTimeSlots:", scheduleTimeSlots, targetResourceDate);
+    console.log("scheduleTimeSlots:", scheduleTimeSlots, productResources);
+    const allProductResources = productResources.flatMap((n) => n.renderList);
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
-      var _a;
-      console.log(item);
       let count = 0;
-      (_a = targetResourceDate == null ? void 0 : targetResourceDate.resource) == null ? void 0 : _a.forEach((n) => {
-        const res = (0, import_resources.getIsUsableByTimeItem)({
-          timeSlice: {
-            start_time: item.start,
-            end_time: item.end,
-            start_at: (0, import_dayjs.default)(item.start),
-            end_at: (0, import_dayjs.default)(item.end)
-          },
-          time: item,
-          resource: n,
-          currentCount: 1
+      allProductResources == null ? void 0 : allProductResources.forEach((m) => {
+        m.times.forEach((childTiem) => {
+          const res = (0, import_resources.getIsUsableByTimeItem)({
+            timeSlice: {
+              start_time: item.start,
+              end_time: item.end,
+              start_at: (0, import_dayjs.default)(item.start),
+              end_at: (0, import_dayjs.default)(item.end)
+            },
+            time: childTiem,
+            resource: m,
+            currentCount: 1
+          });
+          if (res.usable) {
+            count += (res == null ? void 0 : res.remainingCapacity) || 0;
+          }
         });
-        if (res.usable) {
-          count += 1;
-        }
       });
       const startDayJs = (0, import_dayjs.default)(item.start);
       const endDayJs = (0, import_dayjs.default)(item.end);

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

@@ -36,6 +36,7 @@ export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, curren
     afterToDay: boolean;
     capacity: boolean;
     usable: boolean;
+    remainingCapacity: number;
 };
 /**
  * @title: 获取商品下绑定的资源列表

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

@@ -81,7 +81,10 @@ var checkCapacity = ({
   currentCount = 1
 }) => {
   if (currentCount > resource.capacity) {
-    return false;
+    return {
+      status: false,
+      capacity: resource.capacity
+    };
   }
   let conflict = (event_list || []).filter((d) => {
     return isConflict(
@@ -91,16 +94,28 @@ var checkCapacity = ({
   });
   if (resource.resourceType === "single") {
     if (conflict.length === 0) {
-      return true;
+      return {
+        status: true,
+        capacity: 1
+      };
     } else {
-      return false;
+      return {
+        status: false,
+        capacity: 1
+      };
     }
   } else {
     let conflictCount = getUseableEventCount(conflict, resource.capacity);
     if (currentCount <= conflictCount) {
-      return true;
+      return {
+        status: true,
+        capacity: conflictCount
+      };
     } else {
-      return false;
+      return {
+        status: false,
+        capacity: conflictCount
+      };
     }
   }
 };
@@ -113,21 +128,25 @@ var getIsUsableByTimeItem = ({
   let status = {
     afterToDay: false,
     capacity: false,
-    usable: false
+    usable: false,
+    remainingCapacity: 0
+    // 剩余容量
   };
   let earliest = (0, import_dayjs.default)();
   if (!checkAfterToDay(timeSlice.start_at, earliest)) {
     return status;
   }
   status.afterToDay = true;
-  if (!checkCapacity({
+  const checkCapacityResult = checkCapacity({
     event_list: time == null ? void 0 : time.event_list,
     timeSlice,
     resource,
     currentCount
-  })) {
+  });
+  if (!checkCapacityResult.status) {
     return status;
   }
+  status.remainingCapacity = checkCapacityResult.capacity;
   status.capacity = true;
   status.usable = true;
   return status;

package/package.json

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