@pisell/pisellos 3.0.15 → 3.0.18

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

@@ -110,7 +110,10 @@ var checkCapacity = function checkCapacity(_ref) {
     resource = _ref.resource,
     _ref$currentCount = _ref.currentCount,
     currentCount = _ref$currentCount === void 0 ? 1 : _ref$currentCount;
-  if (currentCount > resource.capacity) {
+  // 单个预约：如果当前资源容量不足以满足需求的容量，且当前资源是没有被占用的，返回资源不可用标记，但在外部运算会通过 reason=capacityOnly 来处理组合资源可用
+  // 多个预约：只需判断容量是否足够
+  var isMultipleBooking = resource.resourceType === 'multiple';
+  if (currentCount > resource.capacity && (isMultipleBooking || !isMultipleBooking && event_list.length === 0)) {
     return {
       status: false,
       capacity: resource.capacity,
@@ -242,7 +245,11 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
         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)) {
+        var _resourcesMap$d;
+        // 如果其他资源选择过，并且这个资源是单个预约，则不可以选中此资源
+        // TODO: 如果容量超了这里怎么处理？
+        var isSelectSingleResources = ((_resourcesMap$d = resourcesMap[d]) === null || _resourcesMap$d === void 0 ? void 0 : _resourcesMap$d.resourceType) === 'single' && selectedResources.includes(resourcesMap[d].id);
+        if (resourcesMap[d] && !isSelectSingleResources) {
           // 拼装组合资源的数据
           var combiningResources = [];
           if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
@@ -274,7 +281,9 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
         return childAcc;
       }, []);
       var default_resource = item.default_resource.reduce(function (childAcc, d) {
-        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
+        var _resourcesMap$d2;
+        var isSelectSingleResources = ((_resourcesMap$d2 = resourcesMap[d]) === null || _resourcesMap$d2 === void 0 ? void 0 : _resourcesMap$d2.resourceType) === 'single' && selectedResources.includes(resourcesMap[d].id);
+        if (resourcesMap[d] && !isSelectSingleResources) {
           // 拼装组合资源的数据
           var combiningResources = [];
           if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
@@ -589,9 +598,9 @@ 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;
-            });
+            // n.metadata.combined_resource.resource_ids.forEach((m: number) => {
+            //   if (resourcesMap[m]) resourcesMap[m].capacity -= d.num || 0;
+            // });
           } else {
             // 如果当前选中的不是组合资源，但是是别的组合资源里的子资源，则还需要把别的组合资源也加进来
             // 去 resourcesMap 里找一下 n.id 是不是别的组合资源里的子资源，是的话把别的组合资源也加进来
@@ -599,13 +608,13 @@ 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;
+                  // if (resourcesMap[m.id]) resourcesMap[m.id].capacity -= d.num || 0;
                 }
               }
             });
           }
           acc.push(n.id);
-          resourcesMap[n.id].capacity -= n.num;
+          // if (resourcesMap[n.id]) resourcesMap[n.id].capacity -= currentCapacity || 0;
         });
       }
     }
@@ -636,9 +645,9 @@ export var getOthersCartSelectedResources = function getOthersCartSelectedResour
               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;
-            });
+            // n.metadata.combined_resource.resource_ids.forEach((m: number) => {
+            //   resourcesMap[m].capacity -= n.num;
+            // });
           } else {
             // 如果当前选中的不是组合资源，但是是别的组合资源里的子资源，则还需要把别的组合资源也加进来
             // 去 resourcesMap 里找一下 n.id 是不是别的组合资源里的子资源，是的话把别的组合资源也加进来
@@ -646,14 +655,14 @@ export var getOthersCartSelectedResources = function getOthersCartSelectedResour
               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;
+                  // resourcesMap[m.id].capacity -= n.num;
                 }
               }
             });
           }
           acc.push(n.id);
           // push 完以后，把 resourceMap 的 capacity 减掉当前的商品数量
-          resourcesMap[n.id].capacity -= n.num;
+          // resourcesMap[n.id].capacity -= currentCapacity || 0;
         });
       }
     }

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

@@ -16,6 +16,7 @@ export declare class AccountListModule extends BaseModule implements Module {
      * 创建账号并添加到列表中
      * @param account 账号信息
      * @param needEmit 是否需要触发事件
+     * @param type 添加类型
      */
     private createAccountAndAdd;
     addAccount(account: Account): Promise<AccountModule>;
@@ -30,10 +31,12 @@ export declare class AccountListModule extends BaseModule implements Module {
     storeChange(): void;
     /**
      * 批量添加holder类型账号
-     * @param holders 账号信息列表
-     * @param customerId 账户id
      */
-    addHolderAccounts(holders: IHolder[], customerId: number): Promise<AccountModule[]>;
+    addHolderAccounts(params: {
+        holders: IHolder[];
+        customerId: number;
+        type?: 'unshift' | 'push';
+    }): Promise<AccountModule[]>;
     /**
      * 获取holder类型账户列表
      * @param params

package/lib/modules/AccountList/index.js

@@ -69,19 +69,30 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
    * 创建账号并添加到列表中
    * @param account 账号信息
    * @param needEmit 是否需要触发事件
+   * @param type 添加类型
    */
-  async createAccountAndAdd(account, needEmit = true) {
+  async createAccountAndAdd(account, needEmit = true, type) {
     const tempAccountModule = this.store.accounts.find(
       (a) => a.getId() === account.id
     );
     if (tempAccountModule) {
       return tempAccountModule;
     }
-    this.store.accountList.push(account);
+    const newAccountList = [...this.store.accountList || []];
+    if (type === "unshift") {
+      newAccountList.unshift(account);
+    } else {
+      newAccountList.push(account);
+    }
+    this.store.accountList = newAccountList;
     const accountModule = new import_Account.AccountModule(`account_${account.id}`);
     this.core.registerModule(accountModule);
     accountModule.setAccountInfo(account);
-    this.store.accounts = [...this.store.accounts || [], accountModule];
+    if (type === "unshift") {
+      this.store.accounts = [accountModule, ...this.store.accounts || []];
+    } else {
+      this.store.accounts = [...this.store.accounts || [], accountModule];
+    }
     if (needEmit) {
       await this.core.effects.emit(
         import_types.AccountListHooks.OnAccountListUpdate,
@@ -250,15 +261,22 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
   }
   /**
    * 批量添加holder类型账号
-   * @param holders 账号信息列表
-   * @param customerId 账户id
    */
-  async addHolderAccounts(holders, customerId) {
+  async addHolderAccounts(params) {
+    const { holders, customerId, type = "push" } = params;
     const accountModules = [];
     for (const holder of holders) {
       const account = (0, import_utils.createHolderAccount)(holder, customerId);
-      const accountModule = await this.createAccountAndAdd(account, false);
-      accountModules.push(accountModule);
+      const accountModule = await this.createAccountAndAdd(
+        account,
+        false,
+        type
+      );
+      if (type === "unshift") {
+        accountModules.unshift(accountModule);
+      } else {
+        accountModules.push(accountModule);
+      }
     }
     await this.core.effects.emit(
       import_types.AccountListHooks.OnAccountListUpdate,
@@ -282,8 +300,13 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
         num: num || 100,
         skip: skip || 1
       });
+      this.store.accountList = [];
+      this.store.accounts = [];
       if ((_b = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) == null ? void 0 : _b.length) {
-        await this.addHolderAccounts(res.data.list, customer_id);
+        await this.addHolderAccounts({
+          holders: res.data.list,
+          customerId: customer_id
+        });
       }
     } catch (error) {
       console.error(error);

package/lib/modules/Cart/utils.js

@@ -445,6 +445,7 @@ var getProductDeposit = (params) => {
     let total = new import_decimal.default(0);
     const { deposit_fixed, deposit_percentage, deposit_policy_data } = (product == null ? void 0 : product.custom_deposit_data) || {};
     protocols.push(...deposit_policy_data || []);
+    let productHasDeposit = false;
     if (typeof deposit_fixed === "string" && typeof deposit_percentage === "string") {
       const { depositTotal, result } = handleProductDeposit({
         depositData: product == null ? void 0 : product.custom_deposit_data,
@@ -453,6 +454,7 @@ var getProductDeposit = (params) => {
       });
       if (result) {
         total = depositTotal;
+        productHasDeposit = true;
       }
     } else {
       if (bundle == null ? void 0 : bundle.length) {
@@ -463,13 +465,17 @@ var getProductDeposit = (params) => {
             num: currentBundleProduct.num
           });
           if (result) {
+            productHasDeposit = true;
             return accumulator.plus(depositTotal);
           }
           return accumulator;
         }, new import_decimal.default(0));
       }
     }
-    return { total: total.toNumber(), protocols };
+    if (productHasDeposit) {
+      return { total: total.toNumber(), protocols };
+    }
+    return null;
   }
   return null;
 };

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

@@ -457,4 +457,6 @@ export interface ProductResourceItem {
     updated_at: string;
     /** 可用资源列表 */
     renderList?: any[];
+    /** 资源类型 */
+    type: 'single' | 'multiple' | 'capacity';
 }

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

@@ -147,6 +147,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     checkCartItems(type: ECartItemCheckType): string[];
     destroy(): void;
     getResourcesList(): any[];
+    checkResourceListForDate(): boolean;
     getResourcesListByCartItem(id: string | number): {
         id: number | undefined;
         _id: string;