@pisell/pisellos 2.0.67 → 2.1.2

package/dist/modules/Rules/index.js

@@ -28,7 +28,6 @@ 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);
@@ -297,25 +296,19 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
             // 记录可抵扣的商品详情
             var applicableProducts = discountApplicableProducts.get(discount.id) || [];
-            var discountType = discount.tag || discount.type;
-            var productData = {
+            applicableProducts.push({
               amount: product.price,
-              type: discountType,
-              tag: discountType,
+              type: discount.tag || discount.type,
+              tag: discount.tag || discount.type,
               discount: {
                 resource_id: discount.id,
                 title: discount.format_title,
                 original_amount: product.origin_total,
                 pre_value: discount.par_value,
                 product_id: originProduct.id
-              }
-            };
-
-            // 如果 discount.tag 或者 discount.type 是 good_pass，则不需要添加 num 属性
-            if (discountType !== 'good_pass') {
-              productData.num = product.num || 1;
-            }
-            applicableProducts.push(productData);
+              },
+              num: product.num || 1
+            });
             discountApplicableProducts.set(discount.id, applicableProducts);
           }
         });
@@ -337,10 +330,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;
@@ -380,8 +373,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 如果没有适用的优惠券，或者手动折扣，则不适用优惠券
-        // 自定义商品：如果未开启适用折扣卡（product.vouchersApplicable），则不适用优惠券
-        if (applicableDiscounts.length === 0 || isManualDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+        if (applicableDiscounts.length === 0 || isManualDiscount) {
           if (product.isClient) {
             processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
               origin_total: getProductOriginTotalPrice({
@@ -457,23 +449,18 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total
           var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(productOriginTotal).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(productOriginTotal)).toNumber();
-          var discountType = _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag;
           var discountDetail = {
             amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).toNumber(),
-            type: discountType,
+            type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag,
             discount: {
               resource_id: _selectedDiscount.id,
               title: _selectedDiscount.format_title,
               original_amount: productOriginTotal,
               product_id: originProduct.id,
               percent: _selectedDiscount.par_value
-            }
+            },
+            num: product.num || 1
           };
-
-          // 如果 discount.tag 或者 discount.type 是 good_pass，则不需要添加 num 属性
-          if ((_selectedDiscount.tag || _selectedDiscount.type) !== 'good_pass') {
-            discountDetail.num = product.num || 1;
-          }
           appliedProducts.push(discountDetail);
           appliedDiscountProducts.set(_selectedDiscount.id, appliedProducts);
 

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

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

package/dist/modules/index.d.ts

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

package/dist/solution/BookingByStep/index.js

@@ -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();
@@ -2286,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,
@@ -2333,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();
           }
@@ -2347,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;
     }
   }, {
@@ -2361,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) {
@@ -2376,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);
       // 当前所有待选择资源的集合，先提出来，提升性能
@@ -2496,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();
           }
@@ -2683,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,
@@ -2729,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;
@@ -2745,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;
@@ -2906,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/BookingByStep/utils/resources.js

@@ -281,7 +281,9 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
                   onlyComputed: true,
                   // 是否是只用来计算用，组合资源里，假设商品只关联了组合资源没关联子资源，需要通过这个计算来在后面从 renderList 里删除这个资源
                   metadata: _objectSpread(_objectSpread({}, resourcesMap[id].metadata), {}, {
-                    combined_resource: resourcesMap[id].combined_resource
+                    combined_resource: resourcesMap[id].combined_resource,
+                    form_name: item.title,
+                    resource_name: resourcesMap[id].main_field
                   })
                 }));
               }
@@ -292,7 +294,9 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
             resourceType: item.type,
             children: combiningResources,
             metadata: _objectSpread(_objectSpread({}, resourcesMap[d].metadata), {}, {
-              combined_resource: resourcesMap[d].combined_resource
+              combined_resource: resourcesMap[d].combined_resource,
+              form_name: item.title,
+              resource_name: resourcesMap[d].main_field
             })
           }));
         }
@@ -315,7 +319,9 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
                   onlyComputed: true,
                   // 是否是只用来计算用，组合资源里，假设商品只关联了组合资源没关联子资源，需要通过这个计算来在后面从 renderList 里删除这个资源
                   metadata: _objectSpread(_objectSpread({}, resourcesMap[id].metadata), {}, {
-                    combined_resource: resourcesMap[id].combined_resource
+                    combined_resource: resourcesMap[id].combined_resource,
+                    form_name: item.title,
+                    resource_name: resourcesMap[id].main_field
                   })
                 }));
               }
@@ -327,7 +333,9 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
             is_default: 1,
             children: combiningResources,
             metadata: _objectSpread(_objectSpread({}, resourcesMap[d].metadata), {}, {
-              combined_resource: resourcesMap[d].combined_resource
+              combined_resource: resourcesMap[d].combined_resource,
+              form_name: item.title,
+              resource_name: resourcesMap[d].main_field
             })
           }));
         }

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

@@ -1,5 +1,5 @@
 import { Module, PisellCore } from '../../types';
-import { Product, ProductData } from '../../modules/';
+import { ProductData } from '../../modules/';
 import { BaseModule } from '../../modules/BaseModule';
 export * from './types';
 export declare class BuyTicketsImpl extends BaseModule implements Module {
@@ -16,7 +16,7 @@ export declare class BuyTicketsImpl extends BaseModule implements Module {
     loadProductsByCategory(categoryId: number): Promise<void>;
     destroy(): Promise<void>;
     getProducts(): Promise<ProductData[]>;
-    getProduct(id: number): Promise<Product>;
+    getProduct(id: number): Promise<ProductData>;
     listSubmit(data: Record<string, any>): Promise<{
         status: boolean;
         data: any;

package/dist/solution/BuyTickets/index.js

@@ -238,7 +238,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
               }
               return _context6.abrupt("return", otherProduct);
             case 10:
-              return _context6.abrupt("return", Promise.reject('Not fund product for id: ' + id));
+              throw new Error("Product not found: ".concat(id));
             case 11:
             case "end":
               return _context6.stop();

package/dist/solution/ShopDiscount/index.js

@@ -29,7 +29,6 @@ import { ShopDiscountHooks } from "./types";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
 import Decimal from 'decimal.js';
-import { isBoolean } from 'lodash-es';
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ShopDiscountImpl, _BaseModule);
   var _super = _createSuper(ShopDiscountImpl);
@@ -496,9 +495,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           return n.id === id;
         });
         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.map(function (n) {
         var _n$appliedProductDeta;

package/dist/solution/index.d.ts

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

package/dist/solution/index.js

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

package/dist/types/index.d.ts

@@ -38,9 +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;
-        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,17 +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;
+    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,9 +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);
-    };
   }
   off(event, callback) {
     var _a;
@@ -52,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);

package/lib/modules/AccountList/index.d.ts

@@ -1,7 +1,7 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { AccountModule, Account } from '../Account';
 import { BaseModule } from '../BaseModule';
-import { IFetchHolderAccountsParams, IHolder, IGetCustomerListParams } from './types';
+import { IFetchHolderAccountsParams, IHolder } from './types';
 export declare class AccountListModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -37,12 +37,6 @@ export declare class AccountListModule extends BaseModule implements Module {
         customerId: number;
         type?: 'unshift' | 'push';
     }): Promise<AccountModule[]>;
-    /**
-     * 获取客户列表
-     * @param params 查询参数
-     * @returns 客户列表
-     */
-    getCustomerList(params?: IGetCustomerListParams): Promise<any>;
     /**
      * 获取holder类型账户列表
      * @param params

package/lib/modules/AccountList/index.js

@@ -288,33 +288,6 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
     );
     return accountModules;
   }
-  /**
-   * 获取客户列表
-   * @param params 查询参数
-   * @returns 客户列表
-   */
-  async getCustomerList(params = {}) {
-    const url = "/customer/es/data";
-    const { page = 1, pageSize = 20, keyword, ...otherParams } = params;
-    try {
-      this.store.isLoading = true;
-      this.store.error = null;
-      const queryParams = {
-        page,
-        pageSize,
-        ...keyword && { keyword },
-        ...otherParams
-      };
-      const res = await this.request.get(url, queryParams);
-      return (res == null ? void 0 : res.data) || [];
-    } catch (error) {
-      console.error("Failed to fetch customer list:", error);
-      this.store.error = error instanceof Error ? error.message : "Failed to fetch customer list";
-      throw error;
-    } finally {
-      this.store.isLoading = false;
-    }
-  }
   /**
    * 获取holder类型账户列表
    * @param params

package/lib/modules/AccountList/types.d.ts

@@ -67,31 +67,3 @@ export interface IHolder {
     main_field: string;
     customer_cover?: string;
 }
-/**
- * 获取客户列表参数
- */
-export interface IGetCustomerListParams {
-    /** 页码 */
-    page?: number;
-    /** 每页数量 */
-    pageSize?: number;
-    /** 搜索关键词 */
-    keyword?: string;
-    /** 其他筛选参数 */
-    [key: string]: any;
-}
-/**
- * 客户数据
- */
-export interface ICustomer {
-    /** 客户ID */
-    id: string | number;
-    /** 客户姓名 */
-    name: string;
-    /** 客户电话 */
-    phone?: string;
-    /** 客户邮箱 */
-    email?: string;
-    /** 其他客户信息 */
-    [key: string]: any;
-}

package/lib/modules/Cart/utils/changePrice.d.ts

@@ -1,3 +1,3 @@
-import { Product } from "../../Product";
+import { ProductData } from "../../Product";
 import { CartItem, IUpdateItemParams } from "../types";
-export declare function updateAllCartItemPrice(cartItems: CartItem[], priceData: any, getProduct: (id: number) => Promise<Product | undefined>, updateCart: (item: IUpdateItemParams) => void, updateItemInitInfo: (item: IUpdateItemParams) => void): Promise<void>;
+export declare function updateAllCartItemPrice(cartItems: CartItem[], priceData: any, getProduct: (id: number) => Promise<ProductData | undefined>, updateCart: (item: IUpdateItemParams) => void, updateItemInitInfo: (item: IUpdateItemParams) => void): Promise<void>;

package/lib/modules/Cart/utils/changePrice.js

@@ -40,7 +40,7 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
     const cartProduct = await getProduct(
       item.id
     );
-    let productInfo = cartProduct == null ? void 0 : cartProduct.getData();
+    let productInfo = cartProduct;
     if (!productInfo) {
       productInfo = item._productOrigin;
     }