@pisell/pisellos 3.0.56 → 3.0.57

package/dist/solution/BookingByStep/index.js

@@ -112,7 +112,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   this.otherData = ((_data$this$otherParam = data[this.otherParams.cacheId]) === null || _data$this$otherParam === void 0 || (_data$this$otherParam = _data$this$otherParam[this.name]) === null || _data$this$otherParam === void 0 ? void 0 : _data$this$otherParam['otherData']) || {};
                 }
               }
-              moduleArr = ['accountList', 'cart', 'schedule', 'summary', 'step', 'products', 'date', 'order', 'payment'];
+              moduleArr = ['accountList', 'cart', 'schedule', 'summary', 'step', 'products', 'date', 'order'];
               moduleArr.forEach(function (step) {
                 var targetModule = createModule(step, _this2.name);
                 if (targetModule) {
@@ -701,6 +701,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           _params$useCache,
           useCache,
           tempProducts,
+          _this$store$currentPr,
           dateRange,
           tempStartDate,
           tempEndDate,
@@ -732,8 +733,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
               // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
               if (this.store.currentProduct) {
-                tempProducts = [_objectSpread(_objectSpread({}, this.store.currentProduct.getData()), {}, {
-                  _schedule: this.store.currentProduct.getOtherParams()['schedule']
+                tempProducts = [_objectSpread(_objectSpread({}, this.store.currentProduct), {}, {
+                  _schedule: (_this$store$currentPr = this.store.currentProductMeta) === null || _this$store$currentPr === void 0 ? void 0 : _this$store$currentPr['schedule']
                 })];
               }
               dateRange = this.store.date.getDateRange();
@@ -1212,6 +1213,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             _this6.store.cart.removeItem(n._id);
           });
         }
+        // // 如果 date.startTime 和 dateRange 里的 startTime 不一样，需要修正 dateRange
+        // const dateRange = this.store.date.getDateRange()
+        // if (dateRange?.[0] && !dayjs(dateRange[0].date).isSame(dayjs(date.startTime), 'day')) {
+        //   this.setDateRange([
+        //     { date: dayjs(date.startTime).format('YYYY-MM-DD'), status: 'available', week: '', weekNum: 0 },
+        //     { date: dayjs(date.endTime).format('YYYY-MM-DD'), status: 'available', week: '', weekNum: 0 },
+        //   ]);
+        // }
       }
     }
   }, {
@@ -2278,41 +2287,42 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "openProductDetail",
     value: function () {
       var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(productId) {
-        var targetProduct, targetProductData, newScheduleArr, dateRange;
+        var targetProductData, newScheduleArr, dateRange;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
               _context25.next = 2;
               return this.store.products.getProduct(productId);
             case 2:
-              targetProduct = _context25.sent;
-              if (!targetProduct) {
-                _context25.next = 16;
+              targetProductData = _context25.sent;
+              if (!targetProductData) {
+                _context25.next = 17;
                 break;
               }
-              targetProductData = targetProduct.getData();
-              this.store.currentProduct = targetProduct;
+              this.store.currentProduct = targetProductData;
+              this.store.currentProductMeta = {};
               // 资源预加载，如果是 duration 类型的商品，且是先选日期的流程，在这里预拉取资源数据
               if (!targetProductData['schedule.ids']) {
-                _context25.next = 11;
+                _context25.next = 12;
                 break;
               }
               newScheduleArr = this.getScheduleDataByIds(targetProductData['schedule.ids']);
-              targetProduct.setOtherParams('schedule', newScheduleArr);
-              _context25.next = 16;
+              if (!this.store.currentProductMeta) this.store.currentProductMeta = {};
+              this.store.currentProductMeta.schedule = newScheduleArr;
+              _context25.next = 17;
               break;
-            case 11:
+            case 12:
               if (!targetProductData.duration) {
-                _context25.next = 16;
+                _context25.next = 17;
                 break;
               }
               dateRange = this.store.date.getDateRange(); // 如果不是先选日期的流程 duration 商品就啥也不做
               if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
-                _context25.next = 15;
+                _context25.next = 16;
                 break;
               }
               return _context25.abrupt("return");
-            case 15:
+            case 16:
               // this.store.date.getResourceDates({
               //   query: {
               //     start_date: dateRange[0].date,
@@ -2325,7 +2335,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 endDate: dateRange[dateRange.length - 1].date,
                 products: [targetProductData]
               });
-            case 16:
+            case 17:
             case "end":
               return _context25.stop();
           }
@@ -2339,8 +2349,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "closeProductDetail",
     value: function closeProductDetail() {
-      var _this$store$currentPr;
-      (_this$store$currentPr = this.store.currentProduct) === null || _this$store$currentPr === void 0 || _this$store$currentPr.setOtherParams('schedule', []);
+      if (this.store.currentProductMeta) {
+        this.store.currentProductMeta.schedule = [];
+      }
       this.store.currentProduct = undefined;
     }
   }, {
@@ -2353,7 +2364,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         product = _ref10.product;
       var targetProduct = this.store.currentProduct;
       // 如果外面传递了product 优先用外面的
-      var targetProductData = product || (targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData());
+      var targetProductData = product || targetProduct;
       var targetSchedules = [];
       // 如果外面传递了 scheduleIds,优先取入参
       if (scheduleIds !== null && scheduleIds !== void 0 && scheduleIds.length) {
@@ -2368,7 +2379,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var cartItems = cloneDeep(this.store.cart.getItems());
       var resourcesMap = getResourcesMap((targetResourceDate === null || targetResourceDate === void 0 ? void 0 : targetResourceDate.resource) || []);
       var selectedResources = getOthersSelectedResources(cartItems, '', resourcesMap);
-      var productResources = getResourcesByProduct(resourcesMap, resources || ((_this$store$currentPr2 = this.store.currentProduct) === null || _this$store$currentPr2 === void 0 || (_this$store$currentPr2 = _this$store$currentPr2.getData()) === null || _this$store$currentPr2 === void 0 || (_this$store$currentPr2 = _this$store$currentPr2.product_resource) === null || _this$store$currentPr2 === void 0 ? void 0 : _this$store$currentPr2.resources) || [], selectedResources, 1);
+      var productResources = getResourcesByProduct(resourcesMap, resources || ((_this$store$currentPr2 = this.store.currentProduct) === null || _this$store$currentPr2 === void 0 || (_this$store$currentPr2 = _this$store$currentPr2.product_resource) === null || _this$store$currentPr2 === void 0 ? void 0 : _this$store$currentPr2.resources) || [], selectedResources, 1);
       var minTimeMaxTime = calcMinTimeMaxTimeBySchedules(targetSchedules, {}, date);
       var scheduleTimeSlots = getAllSortedDateRanges(minTimeMaxTime);
       // 当前所有待选择资源的集合，先提出来，提升性能
@@ -2488,22 +2499,34 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getProductTypeById",
     value: function () {
       var _getProductTypeById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(id) {
-        var product;
+        var productData, _productData$schedule;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
               _context26.next = 2;
               return this.store.products.getProduct(id);
             case 2:
-              product = _context26.sent;
-              if (!product) {
-                _context26.next = 5;
+              productData = _context26.sent;
+              if (!productData) {
+                _context26.next = 9;
                 break;
               }
-              return _context26.abrupt("return", product.getProductType());
-            case 5:
-              return _context26.abrupt("return", 'normal');
+              if (!productData.duration) {
+                _context26.next = 6;
+                break;
+              }
+              return _context26.abrupt("return", 'duration');
             case 6:
+              if (!((_productData$schedule = productData['schedule.ids']) !== null && _productData$schedule !== void 0 && _productData$schedule.length)) {
+                _context26.next = 8;
+                break;
+              }
+              return _context26.abrupt("return", 'session');
+            case 8:
+              return _context26.abrupt("return", 'normal');
+            case 9:
+              return _context26.abrupt("return", 'normal');
+            case 10:
             case "end":
               return _context26.stop();
           }
@@ -2675,7 +2698,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getAvailableDateForSessionOptimize",
     value: function () {
       var _getAvailableDateForSessionOptimize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
-        var _this$store$currentPr3, _this$store$currentPr4, _this$store$currentPr5, _tempProducts, _this$store$currentPr6;
+        var _this$store$currentPr3, _this$store$currentPr4, _tempProducts;
         var params,
           startDate,
           endDate,
@@ -2721,7 +2744,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               endDate = tempEndDate;
 
               // 先去读缓存结果，因为正常 UI 调用的是 7 天，而下面我会直接计算 30 天（最少也是 14 天），所以先去读缓存结果，如果缓存结果存在，则直接返回
-              cache = (_this$store$currentPr3 = this.store.currentProduct) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3.getOtherParams()['timeSlotBySchedule'];
+              cache = (_this$store$currentPr3 = this.store.currentProductMeta) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3['timeSlotBySchedule'];
               if (!cache) {
                 _context29.next = 13;
                 break;
@@ -2737,8 +2760,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 13:
               // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
-              tempProducts = (_this$store$currentPr4 = this.store.currentProduct) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4.getData();
-              schedule = (_this$store$currentPr5 = this.store.currentProduct) === null || _this$store$currentPr5 === void 0 ? void 0 : _this$store$currentPr5.getOtherParams()['schedule'];
+              tempProducts = this.store.currentProduct;
+              schedule = (_this$store$currentPr4 = this.store.currentProductMeta) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4['schedule'];
               filteredSchedule = filterScheduleByDateRange(schedule, startDate || '', endDate || ''); // 1.后端返回的数据，确定资源在每一天的可用和使用情况
               tempResourceIds = getResourcesIdsByProduct(tempProducts);
               _context29.next = 19;
@@ -2898,17 +2921,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               this.store.date.setDateList(dates);
 
               // 缓存这次结果，以防后面他小幅度范围内去修改天数
-              (_this$store$currentPr6 = this.store.currentProduct) === null || _this$store$currentPr6 === void 0 || _this$store$currentPr6.setOtherParams('timeSlotBySchedule', {
+              if (!this.store.currentProductMeta) this.store.currentProductMeta = {};
+              this.store.currentProductMeta.timeSlotBySchedule = {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate,
                 startDate: startDate,
                 endDate: dayjs(currentDate).format('YYYY-MM-DD')
-              });
+              };
               return _context29.abrupt("return", {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate
               });
-            case 38:
+            case 39:
             case "end":
               return _context29.stop();
           }

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, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -11,7 +11,8 @@ export interface BookingByStepState {
     accountList: AccountListModule;
     order: OrderModule;
     payment: PaymentModule;
-    currentProduct?: Product;
+    currentProduct?: ProductData;
+    currentProductMeta?: Record<string, any>;
     schedule: ScheduleModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];

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

@@ -0,0 +1,172 @@
+import { Module, PisellCore } from '../../types';
+import { BaseModule } from '../../modules/BaseModule';
+import { RequestPlugin, WindowPlugin } from '../../plugins';
+import { IGetCustomerListParams, ICustomer, ILoadProductsParams, IScanResult } from './types';
+import { ProductData } from '../../modules';
+export declare class BookingTicketImpl extends BaseModule implements Module {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    isSolution: boolean;
+    request: RequestPlugin;
+    window: WindowPlugin;
+    private shopStore;
+    private store;
+    private otherParams;
+    private cacheId;
+    private platform;
+    private scan;
+    initialize(core: PisellCore, options: any): Promise<void>;
+    /**
+     * 获取商品列表
+     * @param params 包含 schedule_date 的参数
+     * @returns 商品列表
+     */
+    loadProducts(params?: ILoadProductsParams): Promise<any>;
+    /**
+     * 获取商品列表（不加载到模块中）
+     * @returns 商品列表
+     */
+    getProducts(): Promise<ProductData[]>;
+    /**
+     * 获取客户列表
+     * @param params 查询参数
+     * @returns 客户列表响应
+     */
+    getCustomerList(params?: IGetCustomerListParams): Promise<import("../../modules").ICustomerListResponse>;
+    /**
+     * 设置活跃客户
+     * @param customer 客户信息
+     */
+    setActiveCustomer(customer: ICustomer): void;
+    /**
+     * 获取当前活跃客户
+     * @returns 当前活跃客户
+     */
+    getActiveCustomer(): ICustomer | null;
+    /**
+     * 根据ID设置选中的客户
+     * @param customerId 客户ID
+     */
+    setSelectedCustomerById(customerId: string | number): void;
+    /**
+     * 获取所有客户
+     * @returns 客户列表
+     */
+    getCustomers(): ICustomer[];
+    /**
+     * 根据ID获取客户
+     * @param customerId 客户ID
+     * @returns 客户信息
+     */
+    getCustomerById(customerId: string | number): ICustomer | null;
+    /**
+     * 清空客户列表
+     */
+    clearCustomers(): void;
+    /**
+     * 添加客户到列表第一位
+     * @param customer 要添加的客户信息
+     */
+    addCustomerToFirst(customer: ICustomer): void;
+    /**
+     * 获取客户分页信息
+     * @returns 分页信息
+     */
+    getCustomerPaginationInfo(): import("../../modules").IPaginationInfo;
+    /**
+     * 获取客户列表总数
+     * @returns 总数
+     */
+    getCustomerTotal(): number;
+    /**
+     * 设置客户分页信息
+     * @param page 页码
+     * @param pageSize 每页数量
+     */
+    setCustomerPaginationInfo(page: number, pageSize: number): void;
+    /**
+     * 便捷方法：切换客户分页并自动获取数据
+     * @param page 页码
+     * @param pageSize 每页数量（可选）
+     * @returns 客户列表响应
+     */
+    changeCustomerPage(page: number, pageSize?: number): Promise<import("../../modules").ICustomerListResponse>;
+    /**
+     * 滚动加载更多客户数据 - 数据会追加到现有列表中
+     * @returns 客户列表响应
+     */
+    loadMoreCustomers(): Promise<import("../../modules").ICustomerListResponse>;
+    /**
+     * 重置并重新开始滚动加载客户数据
+     * @param params 查询参数
+     * @returns 客户列表响应
+     */
+    resetAndLoadCustomers(params?: IGetCustomerListParams): Promise<import("../../modules").ICustomerListResponse>;
+    /**
+     * 检查是否还有更多客户数据可以加载
+     * @returns 是否还有更多数据
+     */
+    hasMoreCustomers(): boolean;
+    /**
+     * 获取当前的客户搜索条件
+     * @returns 当前搜索条件
+     */
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    /**
+     * 获取客户列表状态（包含滚动加载相关状态）
+     * @returns 客户状态
+     */
+    getCustomerState(): import("../../modules").CustomerState;
+    /**
+     * 全局扫描监听
+     * @param callback 回调
+     */
+    scanGlobalListener(callback: (data: IScanResult) => void): {
+        remove: () => void;
+    };
+    /**
+     * 客户扫描监听
+     * @param callback 回调
+     */
+    scanCustomerListener(callback: (data: IScanResult) => void): {
+        remove: () => void;
+    };
+    /**
+     * 调用摄像头
+     * @param data 用户自定义数据
+     */
+    activateCamera(data?: {
+        [key: string]: any;
+    }): void;
+    /**
+     * 禁用所有扫描监听
+     */
+    disableAllScanListeners(): void;
+    /**
+     * 启用所有扫描监听
+     */
+    enableAllScanListeners(): void;
+    /**
+     * 清空所有扫描监听对应的任务执行队列
+     */
+    clearAllScanListenersTaskQueue(): void;
+    /**
+     * 设置其他参数
+     * @param params 参数
+     * @param options 选项
+     */
+    setOtherParams(params: Record<string, any>, { cover }?: {
+        cover?: boolean;
+    }): Promise<void>;
+    /**
+     * 获取其他参数
+     * @returns 其他参数
+     */
+    getOtherParams(): Promise<Record<string, any>>;
+    /**
+     * 销毁模块
+     */
+    destroy(): void;
+}
+export * from './types';
+export { BookingTicketImpl as BookingTicket };