@pisell/pisellos 3.0.25 → 3.0.27

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

@@ -22,4 +22,5 @@ export declare class AccountModule extends BaseModule implements Module {
     setAccountInfo(account: Account): void;
     setActive(active: boolean): void;
     isActive(): boolean;
+    isLogin(): boolean;
 }

package/lib/modules/Account/index.js

@@ -97,6 +97,10 @@ var AccountModule = class extends import_BaseModule.BaseModule {
   isActive() {
     return this.store.active;
   }
+  isLogin() {
+    var _a;
+    return ((_a = this.store.accountInfo) == null ? void 0 : _a.isLogin) || false;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -27,6 +27,8 @@ export interface Account {
     type?: 'account' | 'holder';
     /** 账户信息原始数据 */
     _origin?: Record<string, any>;
+    /** 是否是登录账号 */
+    isLogin?: boolean;
 }
 /**
  * 账户模块状态

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

@@ -42,4 +42,5 @@ export declare class AccountListModule extends BaseModule implements Module {
      * @param params
      */
     fetchHolderAccounts(params: IFetchHolderAccountsParams): Promise<void>;
+    getLoginAccount(): AccountModule | undefined;
 }

package/lib/modules/AccountList/index.js

@@ -312,6 +312,9 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       console.error(error);
     }
   }
+  getLoginAccount() {
+    return this.store.accounts.find((n) => n.isLogin());
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -18,6 +18,7 @@ export declare class Product extends BaseModule implements Module {
     protected otherParams: any;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
+    updateData(data: ProductData): void;
     /**
      * 获取商品数据
      */

package/lib/modules/Product/index.js

@@ -38,6 +38,9 @@ var Product = class extends import_BaseModule.BaseModule {
     this.core = core;
     this.store = options.store || {};
   }
+  updateData(data) {
+    Object.assign(this.store, data);
+  }
   /**
    * 获取商品数据
    */

package/lib/modules/ProductList/index.js

@@ -51,12 +51,15 @@ var ProductList = class extends import_BaseModule.BaseModule {
   async storeChange(path, value) {
     var _a;
     (_a = this.store.list) == null ? void 0 : _a.forEach((product) => {
-      if (!this.store.productMap.has(`product-${product.id}`)) {
+      const productModule = this.store.productMap.get(`product-${product.id}`);
+      if (!productModule) {
         const newProductModule = new import_Product.Product(
           `product_${product.id.toString()}`
         );
         this.core.registerModule(newProductModule, { initialState: product });
         this.store.productMap.set(product.id.toString(), newProductModule);
+      } else {
+        productModule.updateData(product);
       }
     });
   }
@@ -78,7 +81,18 @@ var ProductList = class extends import_BaseModule.BaseModule {
     return void 0;
   }
   async addProduct(products) {
-    this.store.list = [...this.store.list, ...products];
+    if (!this.store.list) {
+      this.store.list = [];
+    }
+    products.forEach((n) => {
+      const index = this.store.list.findIndex((m) => m.id === n.id);
+      if (index === -1) {
+        this.store.list.push(n);
+      } else {
+        this.store.list[index] = n;
+      }
+    });
+    this.storeChange();
   }
   async selectProducts(products) {
     this.store.selectProducts = products;

package/lib/plugins/user.d.ts

@@ -0,0 +1,7 @@
+import { Plugin } from '../types';
+/**
+ * UserPlugin 接口定义
+ */
+export interface UserPlugin extends Plugin {
+    get(): Record<string, any>;
+}

package/lib/plugins/user.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/plugins/user.ts
+var user_exports = {};
+module.exports = __toCommonJS(user_exports);

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

@@ -54,6 +54,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         product_ids?: number[];
         category_ids?: number[];
     }): Promise<any>;
+    updateQuotationPriceAndCart(date: string): Promise<void>;
     loadAllSchedule(): Promise<void>;
     loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel, }: {
         startDate: string;

package/lib/solution/BookingByStep/index.js

@@ -161,12 +161,22 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     schedule_ids = [],
     schedule_date
   }) {
+    var _a;
     if (!(schedule_ids == null ? void 0 : schedule_ids.length)) {
       const schedule_ids_data = this.store.schedule.getScheduleListByIds(schedule_ids).map((n) => n.id);
       if (schedule_ids_data.length) {
         schedule_ids = schedule_ids_data;
+      } else if (schedule_date) {
+        schedule_ids = [0];
       }
     }
+    let userPlugin = this.core.getPlugin("user");
+    let customer_id = void 0;
+    try {
+      customer_id = (_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id;
+    } catch (error) {
+      console.error(error);
+    }
     const productsData = await this.request.post(
       `/product/query`,
       {
@@ -182,6 +192,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         status: "published",
         num: 500,
         skip: 1,
+        customer_id,
         category_ids,
         ids: product_ids,
         collection,
@@ -212,6 +223,51 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       schedule_date: date
     });
   }
+  async updateQuotationPriceAndCart(date) {
+    var _a;
+    const dateRange = this.store.date.getDateRange();
+    const scheduleList = this.store.schedule.getAvailabilityScheduleDateList() || [];
+    let scheduleIds = [];
+    if (dateRange && dateRange.length) {
+      scheduleIds = scheduleList.filter((n) => n.date === dateRange[0].date).flatMap((n) => n.schedule_id);
+    } else {
+      scheduleIds = scheduleList.filter((n) => n.date === date).flatMap((n) => n.schedule_id);
+    }
+    await this.loadProducts({
+      ...(_a = this.otherParams) == null ? void 0 : _a.productModuleParams,
+      scheduleIds,
+      schedule_date: date
+    });
+    const cartItems = this.store.cart.getItems();
+    if (cartItems.length) {
+      for (const item of cartItems) {
+        const targetProduct = await this.store.products.getProduct(item.id);
+        const productInfo = (0, import_lodash_es.cloneDeep)(targetProduct == null ? void 0 : targetProduct.getData());
+        let bundle = item._bundleOrigin;
+        bundle = bundle == null ? void 0 : bundle.map((n) => {
+          var _a2;
+          const targetBundle = (_a2 = productInfo == null ? void 0 : productInfo.bundle) == null ? void 0 : _a2.find((m) => m.group_id === n.id);
+          if (targetBundle) {
+            const targetBundleItem = targetBundle.items.find((m) => m.id === n.id);
+            if (targetBundleItem) {
+              return {
+                ...n,
+                price: targetBundleItem.price,
+                base_price: targetBundleItem.base_price
+              };
+            }
+          }
+          return n;
+        });
+        this.store.cart.updateItem({
+          _id: item._id,
+          product: productInfo,
+          bundle
+        });
+      }
+      ;
+    }
+  }
   // 加载当前店铺下所有 schedule
   async loadAllSchedule() {
     var _a;
@@ -332,11 +388,23 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
    * @param params
    */
   async fetchHolderAccountsAsync(params) {
+    var _a, _b, _c;
+    const cartItems = this.store.cart.getItems();
+    if (cartItems.length) {
+      let date = (_b = (_a = this.store.date.getDateRange()) == null ? void 0 : _a[0]) == null ? void 0 : _b.date;
+      if (!date) {
+        date = ((_c = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _c.start_date) || "";
+      }
+      this.updateQuotationPriceAndCart(date);
+    }
     return this.store.accountList.fetchHolderAccounts(params);
   }
   // 设置日期范围,注入到日期模块中
   async setDateRange(dateRange) {
     this.store.date.setDateRange(dateRange);
+    if (dateRange.length && this.store.cart.getItems().length) {
+      this.updateQuotationPriceAndCart(dateRange[0].date);
+    }
   }
   clearDateRange() {
     this.store.date.clearDateRange();
@@ -412,9 +480,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 如果用户登录
   async setLoginAccount(accountId, accountInfo) {
+    var _a, _b, _c;
     const account = this.store.accountList.getAccount(accountId);
     if (account) {
       let stateAccountId = account.getId();
+      accountInfo.isLogin = true;
       account.setAccountInfo(accountInfo);
       const cartItems = this.store.cart.getItems();
       cartItems.forEach((item) => {
@@ -426,6 +496,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
       this.store.accountList.updateAccountListById(stateAccountId, accountInfo);
+      if (cartItems.length) {
+        let date = (_b = (_a = this.store.date.getDateRange()) == null ? void 0 : _a[0]) == null ? void 0 : _b.date;
+        if (!date) {
+          date = ((_c = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _c.start_date) || "";
+        }
+        this.updateQuotationPriceAndCart(date);
+      }
     } else {
       throw new Error(`没有找到${accountId}账户`);
     }

package/package.json

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