@pisell/pisellos 0.0.43 → 0.0.45

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, Product, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from "../../modules";
+import { ProductList, CartModule, Product, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -11,7 +11,7 @@ export interface BookingByStepState {
     accountList: AccountListModule;
     order: OrderModule;
     payment: PaymentModule;
-    currentProduct: Product;
+    currentProduct?: Product;
     schedule: ScheduleModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];

package/dist/solution/BookingByStep/types.js

@@ -1,23 +1,23 @@
 import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, ScheduleModule } from "../../modules";
 export function createModule(moduleName, solutionName, name, version) {
   switch (moduleName) {
-    case "cart":
+    case 'cart':
       return new CartModule("".concat(solutionName, "_").concat(name || moduleName), version);
-    case "summary":
+    case 'summary':
       return new SummaryModule("".concat(solutionName, "_").concat(name || moduleName), version);
-    case "step":
+    case 'step':
       return new StepModule("".concat(solutionName, "_").concat(name || moduleName), version);
-    case "products":
+    case 'products':
       return new ProductList("".concat(solutionName, "_").concat(name || moduleName), version);
-    case "date":
+    case 'date':
       return new DateModule("".concat(solutionName, "_").concat(name || moduleName), version);
-    case "accountList":
+    case 'accountList':
       return new AccountListModule("".concat(solutionName, "_").concat(name || moduleName), version);
-    case "order":
+    case 'order':
       return new OrderModule("".concat(solutionName, "_").concat(name || moduleName), version);
-    case "payment":
+    case 'payment':
       return new PaymentModule("".concat(solutionName, "_").concat(name || moduleName), version);
-    case "schedule":
+    case 'schedule':
       return new ScheduleModule("".concat(solutionName, "_").concat(name || moduleName), version);
     default:
       throw new Error("Unknown module type: ".concat(moduleName));

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

@@ -1,4 +1,4 @@
-import { ProductData, ProductResourceItem } from "../../../modules";
+import { ProductData, ProductResourceItem } from '../../../modules';
 /**
  * 获取商品的可用资源
  * @param product 商品数据

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

@@ -37,6 +37,9 @@ export var getAvailableProductResources = function getAvailableProductResources(
     if (tempResourceIds) {
       rule.resourceFormIds = _toConsumableArray(new Set(tempResourceIds));
     }
+    if (product !== null && product !== void 0 && product._schedule) {
+      rule.schedule = product === null || product === void 0 ? void 0 : product._schedule;
+    }
     rules.push(rule);
   });
   return {

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

@@ -27,7 +27,7 @@ interface BookingItem {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount }: {
+export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, }: {
     timeSlice: TimeSliceItem;
     time: any;
     resource: ResourceItem;
@@ -53,7 +53,7 @@ export declare const getResourcesByProduct: (resourcesMap: Record<string, Resour
  * @Author: zhiwei.Wang
  * @Date: 2024-01-09 13:38
  */
-export declare const formatResources: ({ booking, resources }: {
+export declare const formatResources: ({ booking, resources, }: {
     booking: BookingItem;
     resources: ResourceItem[];
 }) => {
@@ -66,7 +66,7 @@ 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, capacity, }: {
     resource: ResourceItem;
     duration: number;
     split: number;
@@ -100,7 +100,7 @@ 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, capacity, }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
@@ -129,7 +129,7 @@ interface CapacityItem {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const formatDefaultCapacitys: ({ capacity, product_bundle }: any) => CapacityItem[];
+export declare const formatDefaultCapacitys: ({ capacity, product_bundle, }: any) => CapacityItem[];
 /**
  * @title: 获取总容量
  * @description:

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

@@ -17,12 +17,12 @@ import dayjs from 'dayjs';
  * 1. 获取资源列表
  * 2. 根据当前选择的商品过滤出来对应的资源列表  getResourcesByProduct
  * 3. 格式化资源相关 格式化资源列表 --> 格式化资源 --> 获取时间切片列表 --> 判断单个时间切片是否可用 formatResources
- * 
+ *
  */
 
 /**
  * @title: 获取重叠剩余量
- * @description: 
+ * @description:
  * @param {any} eventList
  * @param {number} current
  * @return {*}
@@ -36,7 +36,7 @@ var getUseableEventCount = function getUseableEventCount(eventList, current) {
 
 /**
  * @title: 判断两个时间段是否有重叠
- * @description: 
+ * @description:
  * @param {object} event
  * @param {object} current
  * @return {*}
@@ -61,7 +61,7 @@ var isConflict = function isConflict(event, current) {
 
 /**
  * @title: 判断传入日期是否在当前日期之后
- * @description: 
+ * @description:
  * @param {any} date
  * @param {any} today
  * @return {*}
@@ -99,7 +99,7 @@ var formatResource = function formatResource(resourceItem, booking) {
 
 /**
  * @title: 判断资源容量是否可用
- * @description: 
+ * @description:
  * @param {object} param1
  * @return {*}
  * @Author: zhiwei.Wang
@@ -185,7 +185,7 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
 
 /**
  * @title: 获取商品下绑定的资源列表
- * @description: 
+ * @description:
  * @param {any} resourcesMap
  * @param {any} product
  * @return {*}
@@ -312,7 +312,7 @@ export var formatResources = function formatResources(_ref3) {
 
 /**
  * @title: 获取资源的时间切片列表
- * @description: 
+ * @description:
  * @return {*}
  * @Author: zhiwei.Wang
  */
@@ -457,7 +457,7 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref5) {
 
 /**
  * @title: 获取其他人的已选资源
- * @description: 
+ * @description:
  * @param {CartItem[]} cartItems
  * @param {number | string} accountId
  * @return {*}
@@ -498,7 +498,7 @@ export var getOthersSelectedResources = function getOthersSelectedResources(cart
 };
 /**
  * @title: 基于选择的商品格式化容量
- * @description: 
+ * @description:
  * @param {any} param1
  * @return {*}
  * @Author: zhiwei.Wang
@@ -539,7 +539,7 @@ export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref6) {
 
 /**
  * @title: 获取总容量
- * @description: 
+ * @description:
  * @param {object} capacity 为 formatDefaultCapacitys()的结果
  * @return {*}
  * @Author: zhiwei.Wang
@@ -564,7 +564,7 @@ export var getSumCapacity = function getSumCapacity(_ref7) {
 
 /**
  * @title: 传入资源，如果有子资源，会根据组合资源的 capacity 计算修改子资源的 capacity
- * @description: 
+ * @description:
  * @param {object} resource
  * @return {*}
  * @Author: jinglin.tan

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

@@ -1,7 +1,7 @@
-import { Module, PisellCore } from "../../types";
-import { BaseModule } from "../../modules/BaseModule";
-import { Customer } from "./types";
-import { Discount } from "../../modules/Discount/types";
+import { Module, PisellCore } from '../../types';
+import { BaseModule } from '../../modules/BaseModule';
+import { Customer } from './types';
+import { Discount } from '../../modules/Discount/types';
 export declare class ShopDiscountImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;

package/dist/solution/ShopDiscount/index.js

@@ -39,8 +39,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     _classCallCheck(this, ShopDiscountImpl);
     _this = _super.call(this, name, version);
     // 初始化所有必要的状态属性
-    _defineProperty(_assertThisInitialized(_this), "defaultName", "shopDiscount");
-    _defineProperty(_assertThisInitialized(_this), "defaultVersion", "1.0.0");
+    _defineProperty(_assertThisInitialized(_this), "defaultName", 'shopDiscount');
+    _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "isSolution", true);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
@@ -66,7 +66,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               this.core = core;
               this.options = options;
               this.store = _objectSpread(_objectSpread({}, this.store), options.store || {});
-              console.log("[ShopDiscount] 初始化完成");
+              console.log('[ShopDiscount] 初始化完成');
 
               // 获取依赖的插件
               this.initializePlugins();
@@ -103,7 +103,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               _context2.next = 7;
               return this.core.effects.emit(ShopDiscountHooks.onDestroy, {});
             case 7:
-              console.log("[ShopDiscount] 已销毁");
+              console.log('[ShopDiscount] 已销毁');
             case 8:
             case "end":
               return _context2.stop();
@@ -127,7 +127,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               this.store.customer = null;
               (_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 || _this$store$discount2.clear();
               (_this$store$rules2 = this.store.rules) === null || _this$store$rules2 === void 0 || _this$store$rules2.clear();
-              console.log("[ShopDiscount] clear");
+              console.log('[ShopDiscount] clear');
             case 5:
             case "end":
               return _context3.stop();
@@ -142,13 +142,13 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "initializePlugins",
     value: function initializePlugins() {
-      this.request = this.core.getPlugin("request");
-      this.window = this.core.getPlugin("window");
+      this.request = this.core.getPlugin('request');
+      this.window = this.core.getPlugin('window');
       if (!this.request) {
-        throw new Error("ShopDiscount需要 request 插件支持");
+        throw new Error('ShopDiscount需要 request 插件支持');
       }
       if (!this.window) {
-        throw new Error("ShopDiscount需要 window 插件支持");
+        throw new Error('ShopDiscount需要 window 插件支持');
       }
     }
   }, {
@@ -196,7 +196,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         }
         _this2.loadPrepareConfig({
           customerId: customer.id,
-          action: "create",
+          action: 'create',
           with_good_pass: 1
         });
       });
@@ -363,7 +363,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             case 21:
               _context5.prev = 21;
               _context5.t1 = _context5["catch"](0);
-              console.error("[ShopDiscount] 扫码出错:", _context5.t1);
+              console.error('[ShopDiscount] 扫码出错:', _context5.t1);
               return _context5.abrupt("return", {
                 isAvailable: false,
                 productList: this.store.productList || [],
@@ -453,7 +453,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       });
       var newDiscountList = uniqueById([].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
         return !item.isDisabled;
-      }))), "product_id");
+      }))), 'product_id');
       (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 || _this$store$discount5.setDiscountList(newDiscountList);
       this.emitDiscountListChange(newDiscountList);
       return newDiscountList;
@@ -479,7 +479,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               _context7.prev = 0;
               _context7.next = 3;
               return this.request.get("/customer/info/wallet/".concat(id), {
-                wallet_pass_tags: ["good_pass"]
+                wallet_pass_tags: ['good_pass']
               });
             case 3:
               result = _context7.sent;
@@ -492,7 +492,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             case 7:
               _context7.prev = 7;
               _context7.t0 = _context7["catch"](0);
-              console.error("[ShopDiscount] 获取客户钱包信息出错:", _context7.t0);
+              console.error('[ShopDiscount] 获取客户钱包信息出错:', _context7.t0);
             case 10:
             case "end":
               return _context7.stop();
@@ -519,7 +519,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               _context8.next = 4;
               return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig({
                 customer_id: customerId,
-                action: "create",
+                action: 'create',
                 with_good_pass: 1
               });
             case 4:
@@ -545,7 +545,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             case 16:
               _context8.prev = 16;
               _context8.t0 = _context8["catch"](0);
-              console.error("[ShopDiscount] 加载准备配置出错:", _context8.t0);
+              console.error('[ShopDiscount] 加载准备配置出错:', _context8.t0);
             case 19:
             case "end":
               return _context8.stop();

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

@@ -1,5 +1,5 @@
-import { DiscountModule } from "../../modules/Discount";
-import { RulesModule } from "../../modules/Rules";
+import { DiscountModule } from '../../modules/Discount';
+import { RulesModule } from '../../modules/Rules';
 export declare enum ShopDiscountHooks {
     onInited = "shopDiscount:onInited",
     onDestroy = "shopDiscount:onDestroy",

package/dist/solution/ShopDiscount/utils.js

@@ -1,5 +1,5 @@
 export var uniqueById = function uniqueById(arr) {
-  var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "id";
+  var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'id';
   var seen = new Set();
   return arr.filter(function (item) {
     return !seen.has(item[key]) && seen.add(item[key]);

package/lib/core/index.js

@@ -116,7 +116,9 @@ var PisellOSCore = class {
     if (options == null ? void 0 : options.plugins) {
       for (const plugin of options.plugins) {
         if (!this.plugins.has(plugin)) {
-          throw new Error(`注册模块 ${module2.name} 失败：缺少依赖插件 ${plugin}`);
+          throw new Error(
+            `注册模块 ${module2.name} 失败：缺少依赖插件 ${plugin}`
+          );
         }
       }
     }
@@ -193,7 +195,10 @@ var PisellOSCore = class {
     for (const rule of config.validations) {
       const value = this.context[rule.name];
       if (rule.required && (value === void 0 || value === null)) {
-        this.log(`模块 ${config.name} 缺少必需的上下文参数: ${rule.name}`, "error");
+        this.log(
+          `模块 ${config.name} 缺少必需的上下文参数: ${rule.name}`,
+          "error"
+        );
         return false;
       }
       if (rule.validate && value !== void 0 && value !== null) {

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

@@ -1,8 +1,8 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Account, AccountModuleAPI } from './types';
+import { Account } from './types';
 export * from './types';
-export declare class AccountModule extends BaseModule implements Module, AccountModuleAPI {
+export declare class AccountModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
     isGuest: boolean;
@@ -14,13 +14,9 @@ export declare class AccountModule extends BaseModule implements Module, Account
         username: string;
         password: string;
     }): Promise<void>;
-    logout(): Promise<void>;
-    register(account: Omit<Account, 'id'>): Promise<void>;
     getCurrentAccount(): Account | null;
     updateProfile(updates: Partial<Account>): Promise<void>;
     isLoggedIn(): boolean;
-    resetPassword(email: string): Promise<void>;
-    updatePassword(oldPassword: string, newPassword: string): Promise<void>;
     getLoginStatus(): boolean;
     getAccount(): Account | null;
     setAccountInfo(account: Account): void;

package/lib/modules/Account/index.js

@@ -33,7 +33,7 @@ var AccountModule = class extends import_BaseModule.BaseModule {
     this.defaultVersion = "1.0.0";
     this.isGuest = false;
     this.store = {
-      currentAccount: null,
+      accountInfo: null,
       isLoggedIn: false,
       active: false
     };
@@ -45,7 +45,7 @@ var AccountModule = class extends import_BaseModule.BaseModule {
   }
   getId() {
     var _a;
-    return ((_a = this.store.currentAccount) == null ? void 0 : _a.id) || "";
+    return ((_a = this.store.accountInfo) == null ? void 0 : _a.id) || "";
   }
   async login(credentials) {
     const account = {
@@ -54,54 +54,39 @@ var AccountModule = class extends import_BaseModule.BaseModule {
       username: credentials.username,
       email: `${credentials.username}@example.com`,
       name: credentials.username,
-      isGuest: false
+      isGuest: false,
+      type: "account"
     };
-    this.store.currentAccount = account;
+    this.store.accountInfo = account;
     this.store.isLoggedIn = true;
     await this.core.effects.emit(import_types.AccountHooks.OnLogin, account);
   }
-  async logout() {
-    this.store.currentAccount = null;
-    this.store.isLoggedIn = false;
-    await this.core.effects.emit(import_types.AccountHooks.OnLogout, {});
-  }
-  async register(account) {
-    const newAccount = {
-      id: "1",
-      // 实际应该从 API 返回
-      ...account
-    };
-    this.store.currentAccount = newAccount;
-    this.store.isLoggedIn = true;
-    await this.core.effects.emit(import_types.AccountHooks.OnRegister, newAccount);
-  }
   getCurrentAccount() {
-    return this.store.currentAccount;
+    return this.store.accountInfo;
   }
   async updateProfile(updates) {
-    if (!this.store.currentAccount)
+    if (!this.store.accountInfo)
       return;
-    this.store.currentAccount = {
-      ...this.store.currentAccount,
+    this.store.accountInfo = {
+      ...this.store.accountInfo,
       ...updates
     };
-    await this.core.effects.emit(import_types.AccountHooks.OnProfileUpdate, this.store.currentAccount);
+    await this.core.effects.emit(
+      import_types.AccountHooks.OnProfileUpdate,
+      this.store.accountInfo
+    );
   }
   isLoggedIn() {
     return this.store.isLoggedIn;
   }
-  async resetPassword(email) {
-  }
-  async updatePassword(oldPassword, newPassword) {
-  }
   getLoginStatus() {
     return this.store.isLoggedIn;
   }
   getAccount() {
-    return this.store.currentAccount;
+    return this.store.accountInfo;
   }
   setAccountInfo(account) {
-    this.store.currentAccount = account;
+    this.store.accountInfo = account;
     if (account.isGuest) {
       this.isGuest = true;
     }

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

@@ -9,19 +9,30 @@ export declare enum AccountHooks {
  */
 export interface Account {
     id: string | number;
+    /** 用户名 */
     username: string;
+    /** 邮箱 */
     email?: string;
+    /** 手机号 */
     phone?: string;
+    /** 昵称 */
     name?: string;
+    /** 头像 */
     avatar?: string;
+    /** 元数据 */
     metadata?: Record<string, any>;
+    /** 是否为游客 */
     isGuest?: boolean;
+    /** 账户类型 */
+    type?: 'account' | 'holder';
+    /** 账户信息原始数据 */
+    _origin?: Record<string, any>;
 }
 /**
  * 账户模块状态
  */
 export interface AccountState {
-    currentAccount: Account | null;
+    accountInfo: Account | null;
     isLoggedIn: boolean;
     active: boolean;
 }

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

@@ -1,15 +1,23 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { AccountModule, Account } from '../Account';
 import { BaseModule } from '../BaseModule';
+import { IFetchHolderAccountsParams, IHolder } from './types';
 export declare class AccountListModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    private request;
     private cacheId;
     private openCache;
     private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    /**
+     * 创建账号并添加到列表中
+     * @param account 账号信息
+     * @param needEmit 是否需要触发事件
+     */
+    private createAccountAndAdd;
     addAccount(account: Account): Promise<void>;
     updateAccount(id: string, updates: Account): Promise<void>;
     updateAccountListById(id: string | number, updates: Account): Promise<void>;
@@ -20,4 +28,15 @@ export declare class AccountListModule extends BaseModule implements Module {
     setActiveAccount(id: string | number): void;
     getActiveAccount(): AccountModule | null;
     storeChange(): void;
+    /**
+     * 批量添加holder类型账号
+     * @param holders 账号信息列表
+     * @param customerId 账户id
+     */
+    addHolderAccounts(holders: IHolder[], customerId: number): Promise<void>;
+    /**
+     * 获取holder类型账户列表
+     * @param params
+     */
+    fetchHolderAccounts(params: IFetchHolderAccountsParams): Promise<void>;
 }