@pisell/pisellos 2.0.20 → 2.0.22

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

@@ -79,13 +79,23 @@ export declare const formatResources: ({ booking, resources, }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time }: {
     resource: ResourceItem;
     duration: number;
     split: number;
     currentDate: DateType | string;
     capacity?: number | undefined;
     resourcesUseableMap?: Record<string, boolean> | undefined;
+    cut_off_time?: {
+        future_day: number;
+        unit: number;
+        unit_type: string;
+        type: string;
+        ongoing?: {
+            type: string;
+            unit: number;
+        } | undefined;
+    } | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -123,7 +133,7 @@ export declare const mergeSubResourcesTimeSlices: (resources: ResourceItem[], re
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
@@ -131,6 +141,16 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
     split: number;
     capacity?: number | undefined;
     resourcesUseableMap: Record<string, boolean>;
+    cut_off_time?: {
+        future_day: number;
+        unit: number;
+        unit_type: string;
+        type: string;
+        ongoing?: {
+            type: string;
+            unit: number;
+        } | undefined;
+    } | undefined;
 }) => any[];
 /**
  * @title: 获取其他人的已选资源

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

@@ -414,7 +414,8 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
     currentDate = _ref5$currentDate === void 0 ? dayjs() : _ref5$currentDate,
     capacity = _ref5.capacity,
     _ref5$resourcesUseabl = _ref5.resourcesUseableMap,
-    resourcesUseableMap = _ref5$resourcesUseabl === void 0 ? {} : _ref5$resourcesUseabl;
+    resourcesUseableMap = _ref5$resourcesUseabl === void 0 ? {} : _ref5$resourcesUseabl,
+    cut_off_time = _ref5.cut_off_time;
   var times = resource.times;
 
   // 存储所有时间切片
@@ -452,7 +453,8 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
         time: time,
         resource: resource,
         currentCount: capacity || 1,
-        resourcesUseableMap: resourcesUseableMap
+        resourcesUseableMap: resourcesUseableMap,
+        cut_off_time: cut_off_time
       });
       if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[resource.id]) !== false) {
         resourcesUseableMap[resource.id] = _status.usable;
@@ -562,7 +564,8 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref6) {
     currentDate = _ref6.currentDate,
     split = _ref6.split,
     capacity = _ref6.capacity,
-    resourcesUseableMap = _ref6.resourcesUseableMap;
+    resourcesUseableMap = _ref6.resourcesUseableMap,
+    cut_off_time = _ref6.cut_off_time;
   // 获取资源列表
   var resources = getResourcesByIds(resourcesMap, resourceIds);
   mergeSubResourcesTimeSlices(resources, resourcesMap);
@@ -584,7 +587,8 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref6) {
       split: split,
       currentDate: currentDate,
       capacity: capacity,
-      resourcesUseableMap: resourcesUseableMap
+      resourcesUseableMap: resourcesUseableMap,
+      cut_off_time: cut_off_time
     }));
   }, []);
 

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.d.ts

@@ -7,9 +7,16 @@ export declare class ProductList extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    private request;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     storeChange(path?: string, value?: any): Promise<void>;
+    loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
+        ids?: number[];
+        customer_id?: number;
+        schedule_date?: string;
+        channel?: string;
+    }): Promise<any>;
     getProducts(): Promise<ProductData[]>;
     getProduct(id: number): Promise<Product | undefined>;
     addProduct(products: ProductData[]): Promise<void>;

package/lib/modules/ProductList/index.js

@@ -47,19 +47,41 @@ var ProductList = class extends import_BaseModule.BaseModule {
       this.store.productMap = /* @__PURE__ */ new Map();
       this.store.selectProducts = [];
     }
+    this.request = core.getPlugin("request");
   }
   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);
       }
     });
   }
+  async loadProductsPrice({
+    ids = [],
+    customer_id,
+    schedule_date,
+    channel
+  }) {
+    const productsData = await this.request.post(
+      `/product/query/price`,
+      {
+        ids,
+        customer_id,
+        schedule_date,
+        channel
+      },
+      { useCache: true }
+    );
+    return productsData.data;
+  }
   async getProducts() {
     await this.core.effects.emit(
       import_types.ProductListHooks.onGetProducts,
@@ -78,7 +100,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;
@@ -185,10 +186,11 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     private getScheduleDataByIds;
     openProductDetail(productId: number): Promise<void>;
     closeProductDetail(): void;
-    getTimeslotBySchedule({ date, scheduleIds, resources, }: {
+    getTimeslotBySchedule({ date, scheduleIds, resources, product }: {
         date: string;
         scheduleIds?: number[];
         resources?: ProductResourceItem[];
+        product?: ProductData;
     }): {
         start_time: string;
         end_time: string;

package/lib/solution/BookingByStep/index.js

@@ -161,6 +161,7 @@ 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) {
@@ -169,11 +170,18 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         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`,
       {
         open_quotation: 1,
-        open_bundle: 1,
+        open_bundle: 0,
         extension_type: [
           "product_appointment",
           "appointment_ticket",
@@ -184,6 +192,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         status: "published",
         num: 500,
         skip: 1,
+        customer_id,
         category_ids,
         ids: product_ids,
         collection,
@@ -214,6 +223,53 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       schedule_date: date
     });
   }
+  async updateQuotationPriceAndCart(date) {
+    var _a;
+    const cartItems = this.store.cart.getItems();
+    if (cartItems.length) {
+      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 res = await this.store.products.loadProductsPrice({
+        ids: cartItems.map((n) => n.id),
+        schedule_date: date,
+        customer_id
+      });
+      for (const item of cartItems) {
+        const targetProduct = res.find((n) => n.id === item.id);
+        const cartProduct = await this.store.products.getProduct(item.id);
+        const productInfo = cartProduct == null ? void 0 : cartProduct.getData();
+        let bundle = item._bundleOrigin;
+        productInfo.price = targetProduct == null ? void 0 : targetProduct.price;
+        productInfo.base_price = targetProduct == null ? void 0 : targetProduct.base_price;
+        bundle = bundle == null ? void 0 : bundle.map((n) => {
+          var _a2;
+          const targetBundle = (_a2 = targetProduct == null ? void 0 : targetProduct.bundle_group) == null ? void 0 : _a2.find((m) => m.id === n.group_id);
+          if (targetBundle) {
+            const targetBundleItem = targetBundle.bundle_item.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;
@@ -334,11 +390,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();
@@ -414,9 +482,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) => {
@@ -428,6 +498,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}账户`);
     }
@@ -1293,8 +1370,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const resourceIds = [];
     let resourcesTypeId = void 0;
     let isSingleResource = false;
+    let maxCutOffTime = void 0;
+    let maxCutOffTimeValue = (0, import_dayjs.default)();
     cartItems.forEach((item) => {
-      var _a2, _b2, _c2, _d2, _e2, _f2, _g;
+      var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h, _i;
       (_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.forEach((n) => {
         if (n.code === resources_code) {
           resources.push(...n.renderList || []);
@@ -1307,6 +1386,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       resourcesTypeId = (_g = (_f2 = (_e2 = (_d2 = item == null ? void 0 : item._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f2.find(
         (n) => n.code === resources_code
       )) == null ? void 0 : _g.id;
+      if (((_h = item._productOrigin) == null ? void 0 : _h.cut_off_time) && ((_i = item._productOrigin) == null ? void 0 : _i.cut_off_time.type) === "advance") {
+        const currentCutOffTime = (0, import_dayjs.default)().add(item._productOrigin.cut_off_time.unit, item._productOrigin.cut_off_time.unit_type);
+        if (currentCutOffTime.isAfter(maxCutOffTimeValue, "minute")) {
+          maxCutOffTimeValue = currentCutOffTime;
+          maxCutOffTime = item._productOrigin.cut_off_time;
+        }
+      }
     });
     if ((_b = (_a = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _a.resource) == null ? void 0 : _b.length) {
       dateRange[0].resource.forEach((n) => {
@@ -1368,7 +1454,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       duration,
       currentDate: dateRange[0].date,
       split: 10,
-      resourcesUseableMap
+      resourcesUseableMap,
+      cut_off_time: maxCutOffTime
     });
     return timeSlots;
   }
@@ -1457,11 +1544,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   getTimeslotBySchedule({
     date,
     scheduleIds,
-    resources
+    resources,
+    product
   }) {
     var _a, _b, _c;
     const targetProduct = this.store.currentProduct;
-    const targetProductData = targetProduct == null ? void 0 : targetProduct.getData();
+    const targetProductData = product || (targetProduct == null ? void 0 : targetProduct.getData());
     let targetSchedules = [];
     if (scheduleIds == null ? void 0 : scheduleIds.length) {
       targetSchedules = this.store.schedule.getScheduleListByIds(scheduleIds);
@@ -1510,7 +1598,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         let currentResourcesCount = 0;
         const currentResourcesTimeSlotCanUsedArr = [];
         const mTimes = m.times.filter((n) => {
-          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start)) && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end));
+          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute");
         });
         if (mTimes.length === 0) {
           return;

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

@@ -79,13 +79,23 @@ export declare const formatResources: ({ booking, resources, }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time }: {
     resource: ResourceItem;
     duration: number;
     split: number;
     currentDate: DateType | string;
     capacity?: number | undefined;
     resourcesUseableMap?: Record<string, boolean> | undefined;
+    cut_off_time?: {
+        future_day: number;
+        unit: number;
+        unit_type: string;
+        type: string;
+        ongoing?: {
+            type: string;
+            unit: number;
+        } | undefined;
+    } | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -123,7 +133,7 @@ export declare const mergeSubResourcesTimeSlices: (resources: ResourceItem[], re
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
@@ -131,6 +141,16 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
     split: number;
     capacity?: number | undefined;
     resourcesUseableMap: Record<string, boolean>;
+    cut_off_time?: {
+        future_day: number;
+        unit: number;
+        unit_type: string;
+        type: string;
+        ongoing?: {
+            type: string;
+            unit: number;
+        } | undefined;
+    } | undefined;
 }) => any[];
 /**
  * @title: 获取其他人的已选资源

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

@@ -328,7 +328,8 @@ var getTimeSlicesByResource = ({
   split = 10,
   currentDate = (0, import_dayjs.default)(),
   capacity,
-  resourcesUseableMap = {}
+  resourcesUseableMap = {},
+  cut_off_time
 }) => {
   const { times } = resource;
   const timeSlices = [];
@@ -353,7 +354,8 @@ var getTimeSlicesByResource = ({
         time,
         resource,
         currentCount: capacity || 1,
-        resourcesUseableMap
+        resourcesUseableMap,
+        cut_off_time
       });
       if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[resource.id]) !== false) {
         resourcesUseableMap[resource.id] = _status.usable;
@@ -415,7 +417,8 @@ var getTimeSlicesByResources = ({
   currentDate,
   split,
   capacity,
-  resourcesUseableMap
+  resourcesUseableMap,
+  cut_off_time
 }) => {
   let resources = getResourcesByIds(resourcesMap, resourceIds);
   mergeSubResourcesTimeSlices(resources, resourcesMap);
@@ -438,7 +441,8 @@ var getTimeSlicesByResources = ({
           split,
           currentDate,
           capacity,
-          resourcesUseableMap
+          resourcesUseableMap,
+          cut_off_time
         })
       );
     },

package/package.json

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