@pisell/pisellos 3.0.76 → 3.0.78

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

@@ -9,9 +9,3 @@ export declare const getAvailableProductResources: (products: ProductData[]) =>
     rules: any[];
     resourcesMap: Record<number, ProductResourceItem>;
 };
-/**
- * 判断商品是否是 session 商品
- * @param product 商品数据
- * @returns 是否是 session 商品
- */
-export declare const isSessionProduct: (product: ProductData) => boolean;

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

@@ -47,14 +47,4 @@ export var getAvailableProductResources = function getAvailableProductResources(
     rules: rules,
     resourcesMap: resourcesMap
   };
-};
-
-/**
- * 判断商品是否是 session 商品
- * @param product 商品数据
- * @returns 是否是 session 商品
- */
-export var isSessionProduct = function isSessionProduct(product) {
-  var _product$scheduleIds, _product$scheduleIds2;
-  return ((_product$scheduleIds = product === null || product === void 0 || (_product$scheduleIds2 = product['schedule.ids']) === null || _product$scheduleIds2 === void 0 ? void 0 : _product$scheduleIds2.length) !== null && _product$scheduleIds !== void 0 ? _product$scheduleIds : 0) > 0;
 };

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

@@ -444,6 +444,10 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
     // 解析开始和结束时间
     var startTime = dayjs("".concat(time.start_at));
     var endTime = dayjs("".concat(time.end_at));
+    // 结束时间要做修复，如果time.end_at 是超过了 currentDate 的那一天，则把 end_at 设置为 currentDate 那一天的 23:59:59
+    if (endTime.isAfter(dayjs(currentDate).endOf('day'))) {
+      endTime = dayjs(currentDate).endOf('day');
+    }
 
     // 当前切片的开始时间
     var currentStart = startTime;

package/dist/solution/BuyTickets/index.js

@@ -24,6 +24,7 @@ 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 { ProductList } from "../../modules/";
+import { BuyTicketsHooks } from "./types";
 import { BaseModule } from "../../modules/BaseModule";
 export * from "./types";
 export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
@@ -71,7 +72,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
               return this.loadProductsByIds(this.otherParams.prodctIds);
             case 11:
               _context.next = 13;
-              return this.core.effects.emit("".concat(this.name, ":onInited"), {});
+              return this.core.effects.emit(BuyTicketsHooks.onInited, {});
             case 13:
             case "end":
               return _context.stop();
@@ -111,7 +112,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.mainProducts = mainProducts;
               _context2.next = 8;
-              return this.core.effects.emit("".concat(this.name, ":onMainProductsLoaded"), {});
+              return this.core.effects.emit(BuyTicketsHooks.onMainProductsLoaded, {});
             case 8:
             case "end":
               return _context2.stop();
@@ -148,7 +149,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _context4.next = 2;
-              return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
+              return this.core.effects.emit(BuyTicketsHooks.onDestroy, {});
             case 2:
               console.log('[BuyTickets] 已销毁');
             case 3:
@@ -194,7 +195,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
             case 11:
               otherData = _context5.t1;
               _context5.next = 14;
-              return this.core.effects.emit("".concat(this.name, ":onGetProducts"), [].concat(_toConsumableArray(mainData), _toConsumableArray(otherData)));
+              return this.core.effects.emit(BuyTicketsHooks.OnGetProducts, [].concat(_toConsumableArray(mainData), _toConsumableArray(otherData)));
             case 14:
               return _context5.abrupt("return", [].concat(_toConsumableArray(mainData), _toConsumableArray(otherData)));
             case 15:
@@ -258,7 +259,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _context7.next = 2;
-              return this.core.effects.emit("".concat(this.name, ":onListSubmit"), _objectSpread(_objectSpread({}, data), {}, {
+              return this.core.effects.emit(BuyTicketsHooks.onListSubmit, _objectSpread(_objectSpread({}, data), {}, {
                 products: this.getProducts()
               }));
             case 2:
@@ -297,7 +298,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               _context8.next = 2;
-              return this.core.effects.emit("".concat(this.name, ":onCartSubmit"), _objectSpread(_objectSpread({}, data), {}, {
+              return this.core.effects.emit(BuyTicketsHooks.onCartSubmit, _objectSpread(_objectSpread({}, data), {}, {
                 products: this.getProducts()
               }));
             case 2:
@@ -319,7 +320,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               _context9.next = 2;
-              return this.core.effects.emit("".concat(this.name, ":onCheckoutSubmit"), _objectSpread(_objectSpread({}, data), {}, {
+              return this.core.effects.emit(BuyTicketsHooks.onCheckoutSubmit, _objectSpread(_objectSpread({}, data), {}, {
                 products: this.getProducts()
               }));
             case 2:

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

@@ -1,7 +1,8 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { Customer, SetDiscountSelectedParams } from './types';
+import { Customer } from './types';
 import { Discount } from '../../modules/Discount/types';
+import { UnavailableReason } from '../../modules/Rules/types';
 export declare class ShopDiscountImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -28,11 +29,17 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         type?: 'form' | 'customer';
         [key: string]: any;
     }): void;
-    calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
+    calcDiscount(productList: Record<string, any>[], options?: {
+        discountId: number;
+        isSelected: boolean;
+    }): {
         productList: Record<string, any>[];
         discountList: Discount[];
     };
-    setDiscountSelected(params: SetDiscountSelectedParams): {
+    setDiscountSelected({ discountId, isSelected, }: {
+        discountId: number;
+        isSelected: boolean;
+    }): {
         productList: Record<string, any>[];
         discountList: Discount[];
     };
@@ -42,6 +49,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         productList: Record<string, any>[];
         discountList: Discount[];
         type: "server" | "clientCalc";
+        unavailableReason?: UnavailableReason;
     }>;
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;
     private getCustomer;
@@ -50,12 +58,6 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private setDiscountList;
     private getDiscountList;
     private getCustomerWallet;
-    private bestDiscount;
-    loadPrepareConfig(params: {
-        customerId: number;
-        action?: 'create' | 'update';
-        with_good_pass?: 0 | 1;
-        with_discount_card?: 0 | 1;
-    }): Promise<void>;
+    private loadPrepareConfig;
 }
 export default ShopDiscountImpl;

package/dist/solution/ShopDiscount/index.js

@@ -25,11 +25,12 @@ 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 "../../modules/BaseModule";
+import { ShopDiscountHooks } from "./types";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
 import { filterDiscountListByBookingTime as _filterDiscountListByBookingTime, isAllNormalProduct } from "./utils";
+import { UnavailableReason } from "../../modules/Rules/types";
 import Decimal from 'decimal.js';
-import { isBoolean } from 'lodash-es';
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ShopDiscountImpl, _BaseModule);
   var _super = _createSuper(ShopDiscountImpl);
@@ -108,7 +109,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               (_this$store$rules = this.store.rules) === null || _this$store$rules === void 0 || _this$store$rules.destroy();
               this.core.effects.offByModuleDestroy(this.name);
               _context2.next = 7;
-              return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
+              return this.core.effects.emit(ShopDiscountHooks.onDestroy, {});
             case 7:
               console.log('[ShopDiscount] 已销毁');
             case 8:
@@ -196,7 +197,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "registerEventListeners",
     value: function registerEventListeners() {
       var _this2 = this;
-      this.core.effects.only("".concat(this.name, ":onCustomerChange"), function (customer) {
+      this.core.effects.on(ShopDiscountHooks.onCustomerChange, function (customer) {
         var _this2$options$otherP;
         if ((_this2$options$otherP = _this2.options.otherParams) !== null && _this2$options$otherP !== void 0 && _this2$options$otherP.cacheId && _this2.getDiscountList().length) {
           return;
@@ -276,7 +277,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               }
               this.store.customer = customer;
               _context4.next = 4;
-              return this.core.effects.emit("".concat(this.name, ":onCustomerChange"), customer);
+              return this.core.effects.emit(ShopDiscountHooks.onCustomerChange, customer);
             case 4:
             case "end":
               return _context4.stop();
@@ -335,38 +336,19 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     // 设置优惠券使用状态
   }, {
     key: "setDiscountSelected",
-    value: function setDiscountSelected(params) {
+    value: function setDiscountSelected(_ref2) {
+      var discountId = _ref2.discountId,
+        isSelected = _ref2.isSelected;
       // 获取当前优惠券列表
       var discountList = this.getDiscountList();
 
-      // 构建选择操作列表
-      var selectionOperations = [];
-
-      // 主要操作
-      selectionOperations.push({
-        discountId: params.discountId,
-        isSelected: params.isSelected
-      });
-
-      // 如果有批量操作列表，添加到操作列表中
-      if (params.selectedList && params.selectedList.length > 0) {
-        selectionOperations.push.apply(selectionOperations, _toConsumableArray(params.selectedList));
-      }
-
-      // 创建选择状态映射（去重处理，后面的操作会覆盖前面的）
-      var selectionMap = new Map();
-      selectionOperations.forEach(function (operation) {
-        selectionMap.set(operation.discountId, operation.isSelected);
-      });
-
       // 找到需要修改状态的优惠券
       var newDiscountList = discountList.map(function (discount) {
-        if (selectionMap.has(discount.id)) {
-          var targetIsSelected = selectionMap.get(discount.id);
+        if (discount.id === discountId) {
           return _objectSpread(_objectSpread({}, discount), {}, {
-            isSelected: targetIsSelected,
+            isSelected: isSelected,
             // 手动设置不使用
-            isManualSelect: !targetIsSelected
+            isManualSelect: !isSelected
           });
         }
         return _objectSpread(_objectSpread({}, discount), {}, {
@@ -376,7 +358,12 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
 
       // 更新优惠券列表
       this.setDiscountList(newDiscountList);
-      return this.calcDiscount(this.store.productList || [], params);
+
+      // 如果取消选择优惠券，需要重新计算其他可用优惠券
+      return this.calcDiscount(this.store.productList || [], {
+        discountId: discountId,
+        isSelected: isSelected
+      });
     }
   }, {
     key: "setProductList",
@@ -389,7 +376,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount3, _this$store$bookingSu2, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
+        var _this$store$discount3, _this$store$bookingSu2, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref3, newProductList, newDiscountList, isAvailable, unavailableReason, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -414,7 +401,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
-                discountList: this.getDiscountList()
+                discountList: this.getDiscountList(),
+                unavailableReason: UnavailableReason.Unknown
               });
             case 10:
               if (resultDiscountList.length) {
@@ -451,7 +439,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               });
             case 16:
-              _ref2 = rulesModule.isDiscountListAvailable({
+              _ref3 = rulesModule.isDiscountListAvailable({
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
@@ -461,42 +449,43 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 isAvailable: false,
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
-              }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable;
+              }, newProductList = _ref3.productList, newDiscountList = _ref3.discountList, isAvailable = _ref3.isAvailable, unavailableReason = _ref3.unavailableReason;
               if (!isAvailable) {
-                _context5.next = 24;
+                _context5.next = 23;
                 break;
               }
               this.setDiscountList(newDiscountList || []);
-              this.store.originalDiscountList = newDiscountList || [];
               this.setProductList(newProductList || []);
               if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
-                _context5.next = 24;
+                _context5.next = 23;
                 break;
               }
-              _context5.next = 24;
+              _context5.next = 23;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 24:
+            case 23:
               return _context5.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
-                discountList: newDiscountList || this.getDiscountList()
+                discountList: newDiscountList || this.getDiscountList(),
+                unavailableReason: unavailableReason
               });
-            case 27:
-              _context5.prev = 27;
+            case 26:
+              _context5.prev = 26;
               _context5.t1 = _context5["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context5.t1);
               return _context5.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
-                discountList: this.getDiscountList()
+                discountList: this.getDiscountList(),
+                unavailableReason: UnavailableReason.Unknown
               });
-            case 31:
+            case 30:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 27]]);
+        }, _callee5, this, [[0, 26]]);
       }));
       function scanCode(_x4, _x5) {
         return _scanCode.apply(this, arguments);
@@ -536,7 +525,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               _context6.next = 2;
-              return this.core.effects.emit("".concat(this.name, ":onDiscountListChange"), discountList);
+              return this.core.effects.emit(ShopDiscountHooks.onDiscountListChange, discountList);
             case 2:
             case "end":
               return _context6.stop();
@@ -577,7 +566,6 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                   discount.tag = discount.type;
                 }
                 editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
-                  name: discount.name || discount.discount.title.auto,
                   isEditMode: true,
                   limited_relation_product_data: {},
                   savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0).toNumber(),
@@ -603,9 +591,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         });
         if (!targetProduct) return false;
         var product = (_this3$hooks2 = _this3.hooks) === null || _this3$hooks2 === void 0 ? void 0 : _this3$hooks2.getProduct(targetProduct);
-        // 如果 product.total 是小于等于0有可能是她已经用过商品券或者折扣卡导致的，或者本身就是负数价格，所以此时还需要判断 origin_total 是否小于等于0
-        // 如果 product.vouchersApplicable是布尔值，并且是 false，也当做免费商品处理，此商品不可用优惠券或折扣卡
-        return Number(product === null || product === void 0 ? void 0 : product.total) <= 0 && (Number(product === null || product === void 0 ? void 0 : product.origin_total) <= 0 || !(product !== null && product !== void 0 && product.origin_total)) || isBoolean(product === null || product === void 0 ? void 0 : product.vouchersApplicable) && !(product !== null && product !== void 0 && product.vouchersApplicable);
+        // 如果 product.total 是 0有可能是她已经用过商品券或者折扣卡导致的 0，所以此时还需要判断 origin_total 是否为 0
+        return Number(product === null || product === void 0 ? void 0 : product.total) === 0 && (Number(product === null || product === void 0 ? void 0 : product.origin_total) === 0 || !(product !== null && product !== void 0 && product.origin_total));
       };
       var allUsedProductIds = newDiscountList.filter(function (item) {
         return !(item !== null && item !== void 0 && item.isEditMode);
@@ -653,7 +640,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getCustomerWallet",
     value: function () {
       var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id) {
-        var _result, customer;
+        var result, customer;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -663,15 +650,15 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 with_trashed: 1
               });
             case 3:
-              _result = _context7.sent;
-              if (!(_result !== null && _result !== void 0 && _result.data)) {
+              result = _context7.sent;
+              if (!(result !== null && result !== void 0 && result.data)) {
                 _context7.next = 9;
                 break;
               }
-              customer = Object.assign({}, (_objectDestructuringEmpty(_result.data), _result.data));
+              customer = Object.assign({}, (_objectDestructuringEmpty(result.data), result.data));
               this.setCustomer(customer);
               _context7.next = 9;
-              return this.core.effects.emit("".concat(this.name, ":onScanCustomerChange"), customer);
+              return this.core.effects.emit(ShopDiscountHooks.onScanCustomerChange, customer);
             case 9:
               _context7.next = 14;
               break;
@@ -689,53 +676,20 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return _getCustomerWallet.apply(this, arguments);
       }
       return getCustomerWallet;
-    }()
-  }, {
-    key: "bestDiscount",
-    value: function () {
-      var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(cb) {
-        var _this$store$productLi;
-        var newDiscountList, _result2;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
-            case 0:
-              newDiscountList = this.store.originalDiscountList;
-              this.setDiscountList(newDiscountList);
-              if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
-                _context8.next = 7;
-                break;
-              }
-              _result2 = this.calcDiscount(this.store.productList);
-              cb === null || cb === void 0 || cb(_result2);
-              _context8.next = 7;
-              return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result2);
-            case 7:
-              _context8.next = 9;
-              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), newDiscountList);
-            case 9:
-            case "end":
-              return _context8.stop();
-          }
-        }, _callee8, this);
-      }));
-      function bestDiscount(_x8) {
-        return _bestDiscount.apply(this, arguments);
-      }
-      return bestDiscount;
     }() // 加载准备配置
   }, {
     key: "loadPrepareConfig",
     value: function () {
-      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
-        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) {
+      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
+        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, result;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context9.prev = 0;
+              _context8.prev = 0;
               customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id); // if (customerId === 1 || !customerId) {
               //   return
               // }
-              _context9.next = 4;
+              _context8.next = 4;
               return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig({
                 customer_id: customerId,
                 action: 'create',
@@ -744,7 +698,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 with_wallet_pass_holder: 1
               });
             case 4:
-              goodPassList = _context9.sent;
+              goodPassList = _context8.sent;
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
               }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
@@ -756,37 +710,37 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context9.next = 12;
+              _context8.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 = 19;
+              if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
+                _context8.next = 19;
                 break;
               }
-              _result3 = this.calcDiscount(this.store.productList);
-              _context9.next = 19;
-              return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
+              result = this.calcDiscount(this.store.productList);
+              _context8.next = 19;
+              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
             case 19:
-              _context9.next = 21;
-              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
+              _context8.next = 21;
+              return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, filteredDiscountList);
             case 21:
-              _context9.next = 26;
+              _context8.next = 26;
               break;
             case 23:
-              _context9.prev = 23;
-              _context9.t0 = _context9["catch"](0);
-              console.error('[ShopDiscount] 加载准备配置出错:', _context9.t0);
+              _context8.prev = 23;
+              _context8.t0 = _context8["catch"](0);
+              console.error('[ShopDiscount] 加载准备配置出错:', _context8.t0);
             case 26:
             case "end":
-              return _context9.stop();
+              return _context8.stop();
           }
-        }, _callee9, this, [[0, 23]]);
+        }, _callee8, this, [[0, 23]]);
       }));
-      function loadPrepareConfig(_x9) {
+      function loadPrepareConfig(_x8) {
         return _loadPrepareConfig.apply(this, arguments);
       }
       return loadPrepareConfig;

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

@@ -36,11 +36,3 @@ export interface ShopDiscountState {
         [key: string]: any;
     };
 }
-export interface SetDiscountSelectedParams {
-    discountId: number;
-    isSelected: boolean;
-    selectedList?: {
-        discountId: number;
-        isSelected: boolean;
-    }[];
-}

package/dist/solution/ShopDiscount/utils.js

@@ -470,6 +470,7 @@ export var filterDiscountListByBookingTime = function filterDiscountListByBookin
     }
   });
 };
+
 /**
  * 判断是否是订单级别的固定金额折扣卡
  * @param discount 折扣

package/dist/solution/index.d.ts

@@ -1,6 +1,4 @@
 export * from './BuyTickets';
 export * from './BookingByStep';
-export * from './BookingTicket';
 export * from './ShopDiscount';
 export * from './RegisterAndLogin';
-export * from './Checkout';

package/dist/solution/index.js

@@ -1,6 +1,4 @@
 export * from "./BuyTickets";
 export * from "./BookingByStep";
-export * from "./BookingTicket";
 export * from "./ShopDiscount";
-export * from "./RegisterAndLogin";
-export * from "./Checkout";
+export * from "./RegisterAndLogin";

package/dist/types/index.d.ts

@@ -38,10 +38,7 @@ export interface PisellCore {
     getModuleExports: <T = any>(name: string) => T | null;
     hasModule: (name: string) => boolean;
     effects: {
-        on: (event: string, callback: (payload: any) => void) => () => void;
-        once: (event: string, callback: (payload: any) => void) => () => void;
-        only: (event: string, callback: (payload: any) => void) => () => void;
-        off: (event: string, callback: (payload: any) => void) => void;
+        on: (event: string, callback: (payload: any) => void) => void;
         emit: (event: string, payload: any, value?: any) => Promise<{
             status: boolean;
             data: any;

package/lib/core/index.js

@@ -61,7 +61,7 @@ var PisellOSCore = class {
         console.log(`${prefix} ${message}`);
         break;
       case "warn":
-        console.log(`%c${prefix}%c ${message}`, "color: #f59e0b; font-weight: bold;", "color: #f59e0b;");
+        console.warn(`${prefix} ${message}`);
         break;
       case "error":
         console.error(`${prefix} ${message}`);

package/lib/effects/index.d.ts

@@ -2,18 +2,16 @@ type EffectCallback = (payload: any) => void | Promise<void | {
     status: boolean;
     message?: string;
 }>;
-type UnsubscribeFunction = () => void;
 declare class EffectsManager {
     private listeners;
-    on(event: string, callback: EffectCallback): UnsubscribeFunction;
-    only(event: string, callback: EffectCallback): UnsubscribeFunction;
+    on(event: string, callback: EffectCallback): void;
     off(event: string, callback: EffectCallback): void;
     offByModuleDestroy(module: string): void;
-    once(event: string, callback: EffectCallback): UnsubscribeFunction;
+    once(event: string, callback: EffectCallback): void;
     emit(event: string, payload: any): Promise<{
         status: boolean;
         data: any;
     }>;
     clear(): void;
 }
-export { EffectsManager, UnsubscribeFunction };
+export { EffectsManager };

package/lib/effects/index.js

@@ -31,22 +31,6 @@ var EffectsManager = class {
     if (!this.listeners.has(event))
       this.listeners.set(event, /* @__PURE__ */ new Set());
     (_a = this.listeners.get(event)) == null ? void 0 : _a.add(callback);
-    return () => {
-      this.off(event, callback);
-    };
-  }
-  // 设置单例监听器，只能存在一个，新的会替换旧的
-  only(event, callback) {
-    var _a, _b;
-    if (this.listeners.has(event)) {
-      (_a = this.listeners.get(event)) == null ? void 0 : _a.clear();
-    } else {
-      this.listeners.set(event, /* @__PURE__ */ new Set());
-    }
-    (_b = this.listeners.get(event)) == null ? void 0 : _b.add(callback);
-    return () => {
-      this.off(event, callback);
-    };
   }
   off(event, callback) {
     var _a;
@@ -65,7 +49,7 @@ var EffectsManager = class {
       await callback(payload);
       this.off(event, wrapper);
     };
-    return this.on(event, wrapper);
+    this.on(event, wrapper);
   }
   async emit(event, payload) {
     const callbacks = this.listeners.get(event);