@pisell/pisellos 2.1.45 → 2.1.46

package/dist/modules/Discount/index.d.ts

@@ -14,6 +14,8 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setDiscountList(discountList: Discount[]): Promise<void>;
     getDiscountList(): Discount[];
+    setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
+    getOriginalDiscountList(): Discount[];
     loadPrepareConfig(params: {
         action?: 'create';
         with_good_pass: 0 | 1;

package/dist/modules/Discount/index.js

@@ -46,7 +46,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
-        var _options$initialState, _options$otherParams, _options$otherParams2;
+        var _options$initialState, _options$initialState2, _options$otherParams, _options$otherParams2;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -57,6 +57,11 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               } else {
                 this.store.discountList = [];
               }
+              if (Array.isArray(options === null || options === void 0 || (_options$initialState2 = options.initialState) === null || _options$initialState2 === void 0 ? void 0 : _options$initialState2.originalDiscountList)) {
+                this.store.originalDiscountList = options === null || options === void 0 ? void 0 : options.initialState.originalDiscountList;
+              } else {
+                this.store.originalDiscountList = [];
+              }
               if (options !== null && options !== void 0 && (_options$otherParams = options.otherParams) !== null && _options$otherParams !== void 0 && _options$otherParams.cacheId) {
                 this.openCache = options.otherParams.openCache;
                 this.cacheId = options.otherParams.cacheId;
@@ -69,17 +74,17 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               this.request = core.getPlugin('request');
               this.window = core.getPlugin('window');
               if (this.request) {
-                _context.next = 9;
+                _context.next = 10;
                 break;
               }
               throw new Error('discount模块需要 request 插件支持');
-            case 9:
+            case 10:
               if (this.window) {
-                _context.next = 11;
+                _context.next = 12;
                 break;
               }
               throw new Error('discount模块需要 window 插件支持');
-            case 11:
+            case 12:
             case "end":
               return _context.stop();
           }
@@ -116,28 +121,54 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
     value: function getDiscountList() {
       return this.store.discountList;
     }
+
+    // 设置原始优惠券列表
+  }, {
+    key: "setOriginalDiscountList",
+    value: function () {
+      var _setOriginalDiscountList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(originalDiscountList) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              this.store.originalDiscountList = originalDiscountList;
+            case 1:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function setOriginalDiscountList(_x4) {
+        return _setOriginalDiscountList.apply(this, arguments);
+      }
+      return setOriginalDiscountList;
+    }() // 获取原始优惠券列表
+  }, {
+    key: "getOriginalDiscountList",
+    value: function getOriginalDiscountList() {
+      return this.store.originalDiscountList || [];
+    }
   }, {
     key: "loadPrepareConfig",
     value: function () {
-      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
         var _prepareConfig$data, _prepareConfig$data2;
         var prepareConfig, goodPassList;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context3.next = 2;
+              _context4.next = 2;
               return this.request.post("/order/prepare/config", params);
             case 2:
-              prepareConfig = _context3.sent;
+              prepareConfig = _context4.sent;
               goodPassList = this.filterEnabledDiscountList([].concat(_toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []), _toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data2 = prepareConfig.data) === null || _prepareConfig$data2 === void 0 ? void 0 : _prepareConfig$data2.discount_card_list) || []))) || []; // this.setDiscountList(goodPassList);
-              return _context3.abrupt("return", goodPassList);
+              return _context4.abrupt("return", goodPassList);
             case 5:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
-      function loadPrepareConfig(_x4) {
+      function loadPrepareConfig(_x5) {
         return _loadPrepareConfig.apply(this, arguments);
       }
       return loadPrepareConfig;
@@ -145,12 +176,12 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "batchSearch",
     value: function () {
-      var _batchSearch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(code, customerId) {
+      var _batchSearch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
         var result, resultDiscountList;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context4.next = 2;
+              _context5.next = 2;
               return this.request.get("/machinecode/batch-search", {
                 code: code,
                 translate_flag: 1,
@@ -162,16 +193,16 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
                 order_behavior_count_customer_id: customerId || 1
               });
             case 2:
-              result = _context4.sent;
+              result = _context5.sent;
               resultDiscountList = this.filterEnabledDiscountList((result === null || result === void 0 ? void 0 : result.data) || []) || [];
-              return _context4.abrupt("return", resultDiscountList);
+              return _context5.abrupt("return", resultDiscountList);
             case 5:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
-      function batchSearch(_x5, _x6) {
+      function batchSearch(_x6, _x7) {
         return _batchSearch.apply(this, arguments);
       }
       return batchSearch;
@@ -276,21 +307,21 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               this.store.discountList = [];
               this.core.effects.offByModuleDestroy(this.name);
-              _context5.next = 4;
+              _context6.next = 4;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 4:
               console.log('[Discount] 已销毁');
             case 5:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);
@@ -300,17 +331,18 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               this.store.discountList = [];
+              this.store.originalDiscountList = [];
               console.log('[Discount] clear');
-            case 2:
+            case 3:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);

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

@@ -72,6 +72,7 @@ export interface Discount {
     format_title: Formattitle;
     metadata?: {
         discount_card_type?: 'fixed_amount' | 'percent';
+        validity_type?: "custom_schedule_validity" | "fixed_validity";
     };
     product: Product;
     type: "product" | 'good_pass';
@@ -98,9 +99,13 @@ export interface Discount {
     week_order_behavior_count?: number;
     month_order_behavior_count?: number;
     customer_order_behavior_count?: number;
+    custom_schedule_snapshot?: {
+        data: any[];
+    };
 }
 export interface DiscountState {
     discountList: Discount[];
+    originalDiscountList?: Discount[];
 }
 export interface DiscountModuleAPI {
     setDiscountList: (discountList: Discount[]) => Promise<void>;

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/modules/Rules/index.js

@@ -24,10 +24,11 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
-import { uniqueById, getDiscountAmount } from "../../solution/ShopDiscount/utils";
+import { uniqueById, getDiscountAmount, filterDiscountListByBookingTime } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
+import dayjs from 'dayjs';
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(RulesModule, _BaseModule);
   var _super = _createSuper(RulesModule);
@@ -304,7 +305,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         addModeDiscount.forEach(function (discount) {
           var _product$discount_lis2, _product$discount_lis3;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
-
+          var timeLimit = true;
+          timeLimit = !!filterDiscountListByBookingTime([discount], ((product === null || product === void 0 ? void 0 : product.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
           // 是符合折扣的商品
           var isLimitedProduct = limitedData.type === 'product_all' || limitedData.product_ids && limitedData.product_ids.includes(product.id);
 
@@ -314,7 +316,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }));
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct) {
+          if (isAvailableProduct && isLimitedProduct && timeLimit) {
             var _discountApplicabilit, _discount$metadata;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -374,6 +376,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
           if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
           var limitedData = discount.limited_relation_product_data;
+          var timeLimit = true;
+          timeLimit = !!filterDiscountListByBookingTime([discount], (product.startDate || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
+          if (!timeLimit) {
+            return false;
+          }
 
           // 判断优惠券是否适用于该商品
           if (limitedData.type === 'product_all') {

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

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

package/dist/solution/BookingByStep/index.js

@@ -2313,6 +2313,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       });
+      this.core.effects.emit("".concat(this.store.cart.name, ":onUpdateBookingDate"), {});
     }
   }, {
     key: "getScheduleDataByIds",

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

@@ -18,6 +18,8 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private initializePlugins;
     private registerDependentModules;
     private registerEventListeners;
+    getCurrentBookingTime(): string | null;
+    private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];

package/dist/solution/ShopDiscount/index.js

@@ -27,6 +27,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../../modules/BaseModule";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
+import { filterDiscountListByBookingTime as _filterDiscountListByBookingTime, isAllNormalProduct } from "./utils";
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
@@ -50,7 +51,9 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       productList: [],
       discount: null,
       rules: null,
-      originalDiscountList: []
+      originalDiscountList: [],
+      currentBookingTime: "",
+      filteredDiscountList: []
     };
     return _this;
   }
@@ -207,6 +210,55 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
 
     // =========== 公共 API ===========
 
+    // 设置预约时间
+    // public async setBookingTime(bookingTime: string | null): Promise<void> {
+    //   if (this.store.currentBookingTime !== bookingTime) {
+    //     this.store.currentBookingTime = bookingTime;
+    //
+    //     // 更新过滤后的优惠券列表
+    //     await this.updateFilteredDiscountList();
+    //   }
+    // }
+
+    // 获取当前预约时间
+  }, {
+    key: "getCurrentBookingTime",
+    value: function getCurrentBookingTime() {
+      return this.store.currentBookingTime;
+    }
+
+    // 根据预约时间过滤优惠券列表
+  }, {
+    key: "filterDiscountListByBookingTime",
+    value: function filterDiscountListByBookingTime(discountList, bookingTime) {
+      // 如果全部是普通商品，不需要过滤，直接返回当前数据
+      if (isAllNormalProduct(this.store.productList || [])) {
+        return discountList;
+      }
+
+      // 否则使用 bookingTime 进行过滤
+      return _filterDiscountListByBookingTime(discountList, bookingTime);
+    }
+
+    // 更新过滤后的优惠券列表
+    // private async updateFilteredDiscountList(): Promise<void> {
+    //   const originalList = this.store.originalDiscountList;
+    //   const filteredList = this.filterDiscountListByBookingTime(originalList, this.store.currentBookingTime);
+    //
+    //   this.store.filteredDiscountList = filteredList;
+    //
+    //   // 更新 DiscountModule 中的优惠券列表
+    //   this.setDiscountList(filteredList);
+    //
+    //   if (this.store.productList?.length) {
+    //     const result = this.calcDiscount(this.store.productList);
+    //     await this.core.effects.emit(
+    //       ShopDiscountHooks.onLoadPrepareCalcResult,
+    //       result,
+    //     );
+    //   }
+    // }
+
     // 设置客户
   }, {
     key: "setCustomer",
@@ -652,7 +704,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
-        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, _result3;
+        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
@@ -678,31 +730,37 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               newGoodPassList = goodPassList === null || goodPassList === void 0 ? void 0 : goodPassList.filter(function (n) {
                 return !scanDiscountIds.includes(n.id);
               });
-              newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || []));
+              newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              this.setDiscountList(newDiscountList || []);
+              _context9.next = 12;
+              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.setOriginalDiscountList(newDiscountList);
+            case 12:
+              // 根据当前预约时间过滤优惠券列表
+              filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
+              this.store.filteredDiscountList = filteredDiscountList;
+              this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
-                _context9.next = 15;
+                _context9.next = 19;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context9.next = 15;
+              _context9.next = 19;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
-            case 15:
-              _context9.next = 17;
-              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), newDiscountList);
-            case 17:
-              _context9.next = 22;
-              break;
             case 19:
-              _context9.prev = 19;
+              _context9.next = 21;
+              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
+            case 21:
+              _context9.next = 26;
+              break;
+            case 23:
+              _context9.prev = 23;
               _context9.t0 = _context9["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context9.t0);
-            case 22:
+            case 26:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[0, 19]]);
+        }, _callee9, this, [[0, 23]]);
       }));
       function loadPrepareConfig(_x9) {
         return _loadPrepareConfig.apply(this, arguments);

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

@@ -1,5 +1,6 @@
-import { DiscountModule, Discount } from '../../modules/Discount';
+import { DiscountModule } from '../../modules/Discount';
 import { RulesModule } from '../../modules/Rules';
+import { Discount } from "../../modules/Discount/types";
 export declare enum ShopDiscountHooks {
     onInited = "shopDiscount:onInited",
     onDestroy = "shopDiscount:onDestroy",
@@ -23,6 +24,8 @@ export interface ShopDiscountState {
     rules: RulesModule | null;
     productList: Record<string, any>[];
     originalDiscountList: Discount[];
+    currentBookingTime: string | null;
+    filteredDiscountList: Discount[];
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

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

@@ -1,5 +1,7 @@
 import { Discount } from "../../modules/Discount/types";
 export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
+export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
+export declare const isAllNormalProduct: (items: any[]) => boolean;
 /**
  * 获取折扣金额 基于折扣卡类型计算
  * 商品券：直接返回商品价格
@@ -10,3 +12,49 @@ export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
  * @returns
  */
 export declare const getDiscountAmount: (discount: Discount, total: number, price: number) => number;
+export interface ScheduleItem {
+    id: number;
+    name: string | {
+        [key: string]: string;
+    };
+    type: 'standard' | 'time-slots' | 'designation';
+    start_time: string | null;
+    end_time: string | null;
+    repeat_type: 'none' | 'daily' | 'weekly';
+    repeat_rule: {
+        end: {
+            type: 'never' | 'date' | 'occurrence';
+            end_date: string | null;
+            occurrence: number | null;
+        };
+        frequency: number;
+        excluded_date: Array<{
+            start: string;
+            end: string;
+        }>;
+        included_date: Array<{
+            start: string;
+            end: string;
+        }>;
+        frequency_date: number[];
+    } | null;
+    designation: Array<{
+        start_date: string;
+        start_time: string;
+        end_date: string;
+        end_time: string;
+    }> | null;
+    is_all: number;
+    time_slot: Array<{
+        start_time: string;
+        end_time: string;
+    }>;
+}
+export declare const getDateIsInSchedule: (dateTime: string, scheduleList: ScheduleItem[]) => boolean;
+/**
+ * 根据预约时间过滤优惠券列表
+ * @param discountList 优惠券列表
+ * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
+ * @returns 过滤后的优惠券列表
+ */
+export declare const filterDiscountListByBookingTime: (discountList: Discount[], bookingTime: string | null) => Discount[];