@pisell/pisellos 0.0.213 → 0.0.215

package/dist/modules/ProductList/index.js

@@ -100,11 +100,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, cacheId, userPlugin, customer_id, _userPlugin$get, productsData;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$menu_list_ids, menu_list_ids, paramsCustomerId, _ref$with_count, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, userPlugin, customer_id, _userPlugin$get, productsData;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId;
+              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule;
               // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
               // if (!schedule_ids?.length) {
               //   const schedule_ids_data = this.store.schedule
@@ -120,7 +120,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               userPlugin = this.core.getPlugin('user');
               customer_id = undefined;
               try {
-                customer_id = userPlugin === null || userPlugin === void 0 || (_userPlugin$get = userPlugin.get()) === null || _userPlugin$get === void 0 ? void 0 : _userPlugin$get.id;
+                customer_id = paramsCustomerId || (userPlugin === null || userPlugin === void 0 || (_userPlugin$get = userPlugin.get()) === null || _userPlugin$get === void 0 ? void 0 : _userPlugin$get.id);
               } catch (error) {
                 console.error(error);
               }
@@ -139,8 +139,12 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 ids: product_ids,
                 collection: collection,
                 front_end_cache_id: cacheId,
+                menu_list_ids: menu_list_ids,
+                with_count: with_count,
                 // client_schedule_ids: schedule_ids,
-                schedule_date: schedule_date
+                schedule_date: schedule_date,
+                with_schedule: with_schedule,
+                schedule_datetime: schedule_datetime
               }, {
                 useCache: true
               });

package/dist/modules/Rules/index.js

@@ -28,6 +28,7 @@ import { RulesHooks } from "./types";
 import { uniqueById } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
+import { isBoolean } from 'lodash-es';
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(RulesModule, _BaseModule);
   var _super = _createSuper(RulesModule);
@@ -330,10 +331,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           var _product$discount_lis6;
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
-          // 商品券时主商品价格为0不可用
-          if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === 'good_pass') return false;
-          // 折扣卡时总价为0时不可用
-          if ((Number(product.total) === 0 || !product.total) && !((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.find(function (n) {
+          // 商品券时主商品价格小于等于0不可用
+          if ((Number(product.price) <= 0 || !product.price) && (discount.tag || discount.type) === 'good_pass') return false;
+          // 折扣卡时总价小于等于0时不可用
+          if ((Number(product.total) <= 0 || !product.total) && !((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.find(function (n) {
             var _n$discount;
             return ((_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.resource_id) === discount.id;
           })) && (discount.tag || discount.type) !== 'good_pass') return false;
@@ -373,7 +374,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 如果没有适用的优惠券，或者手动折扣，则不适用优惠券
-        if (applicableDiscounts.length === 0 || isManualDiscount) {
+        // 自定义商品：如果未开启适用折扣卡（product.vouchersApplicable），则不适用优惠券
+        if (applicableDiscounts.length === 0 || isManualDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
           if (product.isClient) {
             processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
               origin_total: getProductOriginTotalPrice({

package/dist/modules/Rules/types.d.ts

@@ -39,6 +39,7 @@ type ProductDetail = {
     original_price?: number | string;
     num?: number;
     quantity: number;
+    vouchersApplicable?: boolean;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

package/dist/modules/Schedule/utils.js

@@ -140,6 +140,12 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
     for (var i = 0; i < frequency_date.length; i++) {
       var item = frequency_date[i];
       var _start = startTmp.day(item);
+
+      // 如果计算出的日期早于startTmp，则跳到下一周的相同星期几
+      if (_start.isBefore(startTmp, 'day')) {
+        _start = _start.add(1, 'week');
+      }
+
       // 如果周结束的那一天还超过了deadline，则需要把_end置为deadline
       var _end = _start.add(scheduleDiff, 'second');
       if (_end.isAfter(deadline, 'day')) {
@@ -161,7 +167,7 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
         daysArr.push.apply(daysArr, _toConsumableArray(getDaysByStartEnd(_start, _end)));
       }
     }
-    startTmp = startTmp.day(1).add(frequency, 'week');
+    startTmp = startTmp.add(frequency, 'week');
   }
   return Array.from(new Set(daysArr));
 };

package/dist/modules/index.d.ts

@@ -3,6 +3,7 @@ export * from './ProductList';
 export * from './Cart';
 export * from './Account';
 export * from './AccountList';
+export * from './Customer';
 export * from './Date';
 export * from './Guests';
 export * from './Order';

package/dist/modules/index.js

@@ -3,6 +3,7 @@ export * from "./ProductList";
 export * from "./Cart";
 export * from "./Account";
 export * from "./AccountList";
+export * from "./Customer";
 export * from "./Date";
 export * from "./Guests";
 export * from "./Order";

package/dist/plugins/window.d.ts

@@ -13,6 +13,7 @@ export interface WindowPlugin extends Plugin {
     navigator: Partial<Navigator>;
     document: Partial<Document>;
     history: History;
+    interaction?: any;
 }
 /**
  * 简单的 Storage 接口实现

package/dist/solution/BookingByStep/index.js

@@ -1212,21 +1212,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             _this6.store.cart.removeItem(n._id);
           });
         }
-        // 如果 date.startTime 和 dateRange 里的 startTime 不一样，需要修正 dateRange
-        var dateRange = this.store.date.getDateRange();
-        if (dateRange !== null && dateRange !== void 0 && 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
-          }]);
-        }
+        // // 如果 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 },
+        //   ]);
+        // }
       }
     }
   }, {

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

@@ -0,0 +1,127 @@
+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>;
+    /**
+     * 全局扫描监听
+     * @param callback 回调
+     */
+    scanGlobalListener(callback: (data: IScanResult) => void): {
+        remove: () => void;
+    };
+    /**
+     * 客户扫描监听
+     * @param callback 回调
+     */
+    scanCustomerListener(callback: (data: IScanResult) => void): {
+        remove: () => 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 };