@pisell/pisellos 0.0.45 → 0.0.47

package/dist/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/dist/modules/AccountList/index.js

@@ -103,32 +103,36 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _createAccountAndAdd = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(account) {
         var needEmit,
+          tempAccountModule,
           accountModule,
           _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               needEmit = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : true;
-              if (!this.store.accounts.some(function (a) {
+              tempAccountModule = this.store.accounts.find(function (a) {
                 return a.getId() === account.id;
-              })) {
-                _context2.next = 3;
+              }); // 如果账号已经存在，则直接返回
+              if (!tempAccountModule) {
+                _context2.next = 4;
                 break;
               }
-              return _context2.abrupt("return");
-            case 3:
+              return _context2.abrupt("return", tempAccountModule);
+            case 4:
               this.store.accountList.push(account);
               accountModule = new AccountModule("account_".concat(account.id));
               this.core.registerModule(accountModule);
               accountModule.setAccountInfo(account);
               this.store.accounts = [].concat(_toConsumableArray(this.store.accounts || []), [accountModule]);
               if (!needEmit) {
-                _context2.next = 11;
+                _context2.next = 12;
                 break;
               }
-              _context2.next = 11;
+              _context2.next = 12;
               return this.core.effects.emit(AccountListHooks.OnAccountListUpdate, this.store);
-            case 11:
+            case 12:
+              return _context2.abrupt("return", accountModule);
+            case 13:
             case "end":
               return _context2.stop();
           }
@@ -143,7 +147,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
     key: "addAccount",
     value: function () {
       var _addAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(account) {
-        var accountModule;
+        var currentAccountModule, accountModule;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -156,6 +160,9 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
                 _context3.next = 6;
                 break;
               }
+              currentAccountModule = this.store.accounts.find(function (n) {
+                return n.getId() === account.id;
+              });
               throw new Error("Account with id ".concat(account.id, " already exists"));
             case 6:
               this.store.accountList.push(account);
@@ -166,27 +173,28 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
               if (this.store.accounts.length === 1) {
                 this.setActiveAccount(accountModule.getId());
               }
-              _context3.next = 14;
+              currentAccountModule = accountModule;
+              _context3.next = 15;
               return this.core.effects.emit(AccountListHooks.OnAccountListUpdate, this.store);
-            case 14:
-              _context3.next = 22;
+            case 15:
+              _context3.next = 23;
               break;
-            case 16:
-              _context3.prev = 16;
+            case 17:
+              _context3.prev = 17;
               _context3.t0 = _context3["catch"](0);
               console.error(_context3.t0);
               this.store.error = _context3.t0 instanceof Error ? _context3.t0.message : 'Failed to add account';
-              _context3.next = 22;
+              _context3.next = 23;
               return this.core.effects.emit(AccountListHooks.OnAccountListError, this.store.error);
-            case 22:
-              _context3.prev = 22;
+            case 23:
+              _context3.prev = 23;
               this.store.isLoading = false;
-              return _context3.finish(22);
-            case 25:
+              return _context3.abrupt("return", currentAccountModule);
+            case 27:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[0, 16, 22, 25]]);
+        }, _callee3, this, [[0, 17, 23, 27]]);
       }));
       function addAccount(_x4) {
         return _addAccount.apply(this, arguments);
@@ -424,44 +432,50 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
     key: "addHolderAccounts",
     value: (function () {
       var _addHolderAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(holders, customerId) {
-        var _iterator, _step, holder, account;
+        var accountModules, _iterator, _step, holder, account, accountModule;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
+              accountModules = [];
               _iterator = _createForOfIteratorHelper(holders);
-              _context8.prev = 1;
+              _context8.prev = 2;
               _iterator.s();
-            case 3:
+            case 4:
               if ((_step = _iterator.n()).done) {
-                _context8.next = 10;
+                _context8.next = 13;
                 break;
               }
               holder = _step.value;
               account = createHolderAccount(holder, customerId);
-              _context8.next = 8;
+              _context8.next = 9;
               return this.createAccountAndAdd(account, false);
-            case 8:
-              _context8.next = 3;
+            case 9:
+              accountModule = _context8.sent;
+              accountModules.push(accountModule);
+            case 11:
+              _context8.next = 4;
               break;
-            case 10:
-              _context8.next = 15;
+            case 13:
+              _context8.next = 18;
               break;
-            case 12:
-              _context8.prev = 12;
-              _context8.t0 = _context8["catch"](1);
-              _iterator.e(_context8.t0);
             case 15:
               _context8.prev = 15;
-              _iterator.f();
-              return _context8.finish(15);
+              _context8.t0 = _context8["catch"](2);
+              _iterator.e(_context8.t0);
             case 18:
-              _context8.next = 20;
+              _context8.prev = 18;
+              _iterator.f();
+              return _context8.finish(18);
+            case 21:
+              _context8.next = 23;
               return this.core.effects.emit(AccountListHooks.OnAccountListUpdate, this.store);
-            case 20:
+            case 23:
+              return _context8.abrupt("return", accountModules);
+            case 24:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[1, 12, 15, 18]]);
+        }, _callee8, this, [[2, 15, 18, 21]]);
       }));
       function addHolderAccounts(_x10, _x11) {
         return _addHolderAccounts.apply(this, arguments);

package/dist/modules/Cart/index.d.ts

@@ -58,7 +58,7 @@ export declare class CartModule extends BaseModule implements Module, CartModule
     /**
      * 清除购物车商品中的信息
      */
-    deleteCartItemInfo(types: 'resource' | 'time'): void;
+    deleteCartItemInfo(types: 'resource' | 'time' | 'relationForms'): void;
     /**
      * 清除购物车
      */

package/dist/modules/Cart/index.js

@@ -22,7 +22,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 { createCartItemOrigin, deleteResourceFromCartItem, deleteTimeFromCartItem, formatAccountToCartItem, formatDateToCartItem, formatDiscountToCartItem, formatNoteToCartItem, formatProductToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
+import { createCartItemOrigin, deleteRelationFormsFromCartItem, deleteResourceFromCartItem, deleteTimeFromCartItem, formatAccountToCartItem, formatDateToCartItem, formatDiscountToCartItem, formatNoteToCartItem, formatProductToCartItem, formatRelationFormsToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
 import { cloneDeep } from 'lodash-es';
 export * from "./types";
 
@@ -122,6 +122,7 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
               };
               if (product) {
                 cartItem._productOrigin = cloneDeep(product);
+                cartItem._productInit = cloneDeep(product);
                 cartItem = formatProductToCartItem({
                   cartItem: cartItem,
                   product: product,
@@ -216,7 +217,8 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
         discounts = params.discounts,
         resources = params.resources,
         note = params.note,
-        date = params.date;
+        date = params.date,
+        relationForms = params.relationForms;
       var tempCartItem = this.store.list.find(function (i) {
         return i._id === _id;
       });
@@ -251,6 +253,12 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
           resources: resources
         });
       }
+      if (relationForms) {
+        tempCartItem = formatRelationFormsToCartItem({
+          cartItem: tempCartItem,
+          relationForms: relationForms
+        });
+      }
       if (date) {
         tempCartItem = formatDateToCartItem({
           cartItem: tempCartItem,
@@ -374,6 +382,9 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
         } else if (types === 'time') {
           // 清除购物车商品中的时间信息
           item = deleteTimeFromCartItem(item);
+        } else if (types === 'relationForms') {
+          // 清除购物车商品中的关联表单信息
+          item = deleteRelationFormsFromCartItem(item);
         }
         return item;
       });

package/dist/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;
 }
 /**
  * 购物车状态接口
@@ -162,6 +162,13 @@ export interface IUpdateItemParams {
         /** 结束时间 */
         endTime: string;
     };
+    /** 关联表单 */
+    relationForms?: {
+        /** 关联表单ID */
+        form_id: number[];
+        /** 关联表单记录ID */
+        form_record_ids: number[];
+    }[];
 }
 /**
  * 折扣

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

@@ -90,6 +90,25 @@ export declare const formatResourceToCartItemOrigin: (params: {
     cartItem: CartItem;
     resources: Resource[];
 }) => any;
+/**
+ * 格式化关联表单到购物车
+ * @param params 参数
+ * @returns 格式化后的购物车
+ */
+export declare const formatRelationFormsToCartItem: (params: {
+    cartItem: CartItem;
+    relationForms: {
+        form_id: number[];
+        form_record_ids: number[];
+    }[];
+}) => CartItem;
+export declare const formatRelationFormsToCartItemOrigin: (params: {
+    cartItem: CartItem;
+    relationForms: {
+        form_id: number[];
+        form_record_ids: number[];
+    }[];
+}) => any;
 /**
  * 格式化日期到购物车
  * @param date 开始时间和结束时间
@@ -114,18 +133,6 @@ export declare const formatDateToCartItemOrigin: (params: {
         endTime: string;
     };
 }) => any;
-/**
- * 从购物车中删除资源相关信息
- * @param cartItem 购物车
- * @returns 删除后的购物车
- */
-export declare const deleteResourceFromCartItem: (cartItem: CartItem) => CartItem;
-/**
- * 从购物车中删除时间
- * @param cartItem 购物车
- * @returns 删除后的购物车
- */
-export declare const deleteTimeFromCartItem: (cartItem: CartItem) => CartItem;
 /**
  * 格式化备注到购物车
  * @param params 参数
@@ -226,3 +233,21 @@ export declare const handleProductDeposit: (params: {
     depositTotal: Decimal;
     result: boolean;
 };
+/**
+ * 从购物车中删除资源相关信息
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export declare const deleteResourceFromCartItem: (cartItem: CartItem) => CartItem;
+/**
+ * 从购物车中删除时间
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export declare const deleteTimeFromCartItem: (cartItem: CartItem) => CartItem;
+/**
+ * 从购物车中删除关联表单信息
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export declare const deleteRelationFormsFromCartItem: (cartItem: CartItem) => CartItem;

package/dist/modules/Cart/utils.js

@@ -307,6 +307,25 @@ export var formatResourceToCartItemOrigin = function formatResourceToCartItemOri
   return origin;
 };
 
+/**
+ * 格式化关联表单到购物车
+ * @param params 参数
+ * @returns 格式化后的购物车
+ */
+export var formatRelationFormsToCartItem = function formatRelationFormsToCartItem(params) {
+  var cartItem = params.cartItem;
+  var oringin = formatRelationFormsToCartItemOrigin(params);
+  cartItem._origin = oringin;
+  return cartItem;
+};
+export var formatRelationFormsToCartItemOrigin = function formatRelationFormsToCartItemOrigin(params) {
+  var cartItem = params.cartItem,
+    relationForms = params.relationForms;
+  var origin = cartItem._origin;
+  origin.relation_forms = relationForms;
+  return origin;
+};
+
 /**
  * 格式化日期到购物车
  * @param date 开始时间和结束时间
@@ -341,54 +360,6 @@ export var formatDateToCartItemOrigin = function formatDateToCartItemOrigin(para
   return origin;
 };
 
-/**
- * 从购物车中删除资源相关信息
- * @param cartItem 购物车
- * @returns 删除后的购物车
- */
-export var deleteResourceFromCartItem = function deleteResourceFromCartItem(cartItem) {
-  // 删除UI层的数据
-  cartItem.resource_id = undefined;
-  cartItem.relation_form_name = undefined;
-  cartItem.start_date = undefined;
-  cartItem.start_time = undefined;
-  cartItem.end_date = undefined;
-  cartItem.end_time = undefined;
-
-  // 删除资源原始数据
-  delete cartItem._resourceOrigin;
-
-  // 删除原始数据
-  cartItem._origin.resources = null;
-  cartItem._origin.select_date = null;
-  cartItem._origin.start_date = null;
-  cartItem._origin.start_time = null;
-  cartItem._origin.end_date = null;
-  cartItem._origin.end_time = null;
-  return cartItem;
-};
-
-/**
- * 从购物车中删除时间
- * @param cartItem 购物车
- * @returns 删除后的购物车
- */
-export var deleteTimeFromCartItem = function deleteTimeFromCartItem(cartItem) {
-  // 删除UI层的数据
-  cartItem.start_date = undefined;
-  cartItem.start_time = undefined;
-  cartItem.end_date = undefined;
-  cartItem.end_time = undefined;
-
-  // 删除原始数据
-  cartItem._origin.select_date = null;
-  cartItem._origin.start_date = null;
-  cartItem._origin.start_time = null;
-  cartItem._origin.end_date = null;
-  cartItem._origin.end_time = null;
-  return cartItem;
-};
-
 /**
  * 格式化备注到购物车
  * @param params 参数
@@ -642,4 +613,63 @@ export var handleProductDeposit = function handleProductDeposit(params) {
     result: false,
     depositTotal: new Decimal(0)
   };
+};
+
+/**
+ * 从购物车中删除资源相关信息
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export var deleteResourceFromCartItem = function deleteResourceFromCartItem(cartItem) {
+  // 删除UI层的数据
+  cartItem.resource_id = undefined;
+  cartItem.relation_form_name = undefined;
+  cartItem.start_date = undefined;
+  cartItem.start_time = undefined;
+  cartItem.end_date = undefined;
+  cartItem.end_time = undefined;
+
+  // 删除资源原始数据
+  delete cartItem._resourceOrigin;
+
+  // 删除原始数据
+  cartItem._origin.resources = null;
+  cartItem._origin.select_date = null;
+  cartItem._origin.start_date = null;
+  cartItem._origin.start_time = null;
+  cartItem._origin.end_date = null;
+  cartItem._origin.end_time = null;
+  return cartItem;
+};
+
+/**
+ * 从购物车中删除时间
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export var deleteTimeFromCartItem = function deleteTimeFromCartItem(cartItem) {
+  // 删除UI层的数据
+  cartItem.start_date = undefined;
+  cartItem.start_time = undefined;
+  cartItem.end_date = undefined;
+  cartItem.end_time = undefined;
+
+  // 删除原始数据
+  cartItem._origin.select_date = null;
+  cartItem._origin.start_date = null;
+  cartItem._origin.start_time = null;
+  cartItem._origin.end_date = null;
+  cartItem._origin.end_time = null;
+  return cartItem;
+};
+
+/**
+ * 从购物车中删除关联表单信息
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export var deleteRelationFormsFromCartItem = function deleteRelationFormsFromCartItem(cartItem) {
+  // 删除原始数据
+  cartItem._origin.relation_forms = null;
+  return cartItem;
 };

package/dist/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;
@@ -122,7 +127,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     /**
      * 从购物车中按类别删除信息
      */
-    deleteCartItemInfo(types: 'resource' | 'time'): void;
+    deleteCartItemInfo(types: 'resource' | 'time' | 'relationForms'): void;
     destroy(): void;
     getResourcesList(): any[];
     getResourcesListByCartItem(id: string | number): {
@@ -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;