@pisell/pisellos 2.0.67 → 2.1.1

package/dist/core/index.js

@@ -67,8 +67,7 @@ var PisellOSCore = /*#__PURE__*/function () {
           console.log("".concat(prefix, " ").concat(message));
           break;
         case 'warn':
-          // 使用 console.log 避免显示堆栈跟踪，提升性能
-          console.log("%c".concat(prefix, "%c ").concat(message), 'color: #f59e0b; font-weight: bold;', 'color: #f59e0b;');
+          console.warn("".concat(prefix, " ").concat(message));
           break;
         case 'error':
           console.error("".concat(prefix, " ").concat(message));

package/dist/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/dist/effects/index.js

@@ -11,7 +11,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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); }
-// 取消监听函数类型
 var EffectsManager = /*#__PURE__*/function () {
   function EffectsManager() {
     _classCallCheck(this, EffectsManager);
@@ -20,15 +19,9 @@ var EffectsManager = /*#__PURE__*/function () {
   _createClass(EffectsManager, [{
     key: "on",
     value: function on(event, callback) {
-      var _this$listeners$get,
-        _this = this;
+      var _this$listeners$get;
       if (!this.listeners.has(event)) this.listeners.set(event, new Set());
       (_this$listeners$get = this.listeners.get(event)) === null || _this$listeners$get === void 0 || _this$listeners$get.add(callback);
-
-      // 返回取消函数
-      return function () {
-        _this.off(event, callback);
-      };
     }
   }, {
     key: "off",
@@ -41,17 +34,17 @@ var EffectsManager = /*#__PURE__*/function () {
   }, {
     key: "offByModuleDestroy",
     value: function offByModuleDestroy(module) {
-      var _this2 = this;
+      var _this = this;
       Array.from(this.listeners.keys()).forEach(function (item) {
         if (item.startsWith(module)) {
-          _this2.listeners.delete(item);
+          _this.listeners.delete(item);
         }
       });
     }
   }, {
     key: "once",
     value: function once(event, callback) {
-      var _this3 = this;
+      var _this2 = this;
       var wrapper = /*#__PURE__*/function () {
         var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(payload) {
           return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -60,7 +53,7 @@ var EffectsManager = /*#__PURE__*/function () {
                 _context.next = 2;
                 return callback(payload);
               case 2:
-                _this3.off(event, wrapper);
+                _this2.off(event, wrapper);
               case 3:
               case "end":
                 return _context.stop();
@@ -71,9 +64,7 @@ var EffectsManager = /*#__PURE__*/function () {
           return _ref.apply(this, arguments);
         };
       }();
-
-      // 调用修改后的on方法，它会返回取消函数
-      return this.on(event, wrapper);
+      this.on(event, wrapper);
     }
   }, {
     key: "emit",

package/dist/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/dist/modules/AccountList/index.js

@@ -1,9 +1,4 @@
-var _excluded = ["page", "pageSize", "keyword"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -509,68 +504,6 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
       }
       return addHolderAccounts;
     }()
-    /**
-     * 获取客户列表
-     * @param params 查询参数
-     * @returns 客户列表
-     */
-    )
-  }, {
-    key: "getCustomerList",
-    value: (function () {
-      var _getCustomerList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-        var params,
-          url,
-          _params$page,
-          page,
-          _params$pageSize,
-          pageSize,
-          keyword,
-          otherParams,
-          queryParams,
-          res,
-          _args9 = arguments;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
-            case 0:
-              params = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
-              url = '/customer/es/data';
-              _params$page = params.page, page = _params$page === void 0 ? 1 : _params$page, _params$pageSize = params.pageSize, pageSize = _params$pageSize === void 0 ? 20 : _params$pageSize, keyword = params.keyword, otherParams = _objectWithoutProperties(params, _excluded);
-              _context9.prev = 3;
-              this.store.isLoading = true;
-              this.store.error = null;
-              queryParams = _objectSpread(_objectSpread({
-                page: page,
-                pageSize: pageSize
-              }, keyword && {
-                keyword: keyword
-              }), otherParams);
-              _context9.next = 9;
-              return this.request.get(url, queryParams);
-            case 9:
-              res = _context9.sent;
-              return _context9.abrupt("return", (res === null || res === void 0 ? void 0 : res.data) || []);
-            case 13:
-              _context9.prev = 13;
-              _context9.t0 = _context9["catch"](3);
-              console.error('Failed to fetch customer list:', _context9.t0);
-              this.store.error = _context9.t0 instanceof Error ? _context9.t0.message : 'Failed to fetch customer list';
-              throw _context9.t0;
-            case 18:
-              _context9.prev = 18;
-              this.store.isLoading = false;
-              return _context9.finish(18);
-            case 21:
-            case "end":
-              return _context9.stop();
-          }
-        }, _callee9, this, [[3, 13, 18, 21]]);
-      }));
-      function getCustomerList() {
-        return _getCustomerList.apply(this, arguments);
-      }
-      return getCustomerList;
-    }()
     /**
      * 获取holder类型账户列表
      * @param params
@@ -579,15 +512,15 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "fetchHolderAccounts",
     value: (function () {
-      var _fetchHolderAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
+      var _fetchHolderAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
         var url, _ref, form_id, shop_id, num, skip, customer_id, _res$data, res;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               url = params.url || '/account/holder';
               _ref = (params === null || params === void 0 ? void 0 : params.query) || {}, form_id = _ref.form_id, shop_id = _ref.shop_id, num = _ref.num, skip = _ref.skip, customer_id = _ref.customer_id;
-              _context10.prev = 2;
-              _context10.next = 5;
+              _context9.prev = 2;
+              _context9.next = 5;
               return this.request.get(url, {
                 customer_id: customer_id,
                 form_id: form_id,
@@ -596,30 +529,30 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
                 skip: skip || 1
               });
             case 5:
-              res = _context10.sent;
+              res = _context9.sent;
               this.store.accountList = [];
               this.store.accounts = [];
               if (!(res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data = _res$data.list) !== null && _res$data !== void 0 && _res$data.length)) {
-                _context10.next = 11;
+                _context9.next = 11;
                 break;
               }
-              _context10.next = 11;
+              _context9.next = 11;
               return this.addHolderAccounts({
                 holders: res.data.list,
                 customerId: customer_id
               });
             case 11:
-              _context10.next = 16;
+              _context9.next = 16;
               break;
             case 13:
-              _context10.prev = 13;
-              _context10.t0 = _context10["catch"](2);
-              console.error(_context10.t0);
+              _context9.prev = 13;
+              _context9.t0 = _context9["catch"](2);
+              console.error(_context9.t0);
             case 16:
             case "end":
-              return _context10.stop();
+              return _context9.stop();
           }
-        }, _callee10, this, [[2, 13]]);
+        }, _callee9, this, [[2, 13]]);
       }));
       function fetchHolderAccounts(_x11) {
         return _fetchHolderAccounts.apply(this, arguments);

package/dist/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/dist/modules/AccountList/types.js

@@ -22,12 +22,4 @@ export var AccountListHooks = /*#__PURE__*/function (AccountListHooks) {
 
 /**
  * holder类型数据
- */
-
-/**
- * 获取客户列表参数
- */
-
-/**
- * 客户数据
  */

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

@@ -8,20 +8,16 @@ export declare class ProductList extends BaseModule implements Module {
     protected defaultVersion: string;
     private store;
     private request;
+    private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     storeChange(path?: string, value?: any): Promise<void>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, }: {
+    loadProducts({ category_ids, product_ids, collection, schedule_date, cacheId }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
         schedule_date?: string;
         cacheId?: string;
-        customer_id?: number;
-        menu_list_ids?: number[];
-        schedule_datetime?: string;
-        with_count?: string[];
-        with_schedule?: number;
     }): Promise<any>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];
@@ -33,10 +29,4 @@ export declare class ProductList extends BaseModule implements Module {
     getProduct(id: number): Promise<Product | undefined>;
     addProduct(products: ProductData[]): Promise<void>;
     selectProducts(products: ProductData[]): Promise<void>;
-    /**
-     * 根据商品编码或条码搜索商品
-     * @param code 商品编码或条码
-     * @returns 匹配的商品列表，如果没有匹配则返回空数组
-     */
-    findProductsByCodeOrBarcode(code: string): ProductData[];
 }

package/dist/modules/ProductList/index.js

@@ -31,6 +31,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
+    _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     return _this;
   }
   _createClass(ProductList, [{
@@ -43,6 +44,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core = core;
               this.store = options.store;
+              this.otherParams = options.otherParams || {};
               if (Array.isArray((_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.list)) {
                 this.store.list = options.initialState.list;
                 this.core.effects.emit("".concat(this.name, ":changed"), this.store.list);
@@ -53,7 +55,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 this.store.selectProducts = [];
               }
               this.request = core.getPlugin('request');
-            case 4:
+            case 5:
             case "end":
               return _context.stop();
           }
@@ -100,11 +102,12 @@ 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, _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;
+        var _this$otherParams;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, cacheId, 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, _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;
+              _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;
               // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
               // if (!schedule_ids?.length) {
               //   const schedule_ids_data = this.store.schedule
@@ -120,7 +123,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               userPlugin = this.core.getPlugin('user');
               customer_id = undefined;
               try {
-                customer_id = paramsCustomerId || (userPlugin === null || userPlugin === void 0 || (_userPlugin$get = userPlugin.get()) === null || _userPlugin$get === void 0 ? void 0 : _userPlugin$get.id);
+                customer_id = 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,12 +142,9 @@ 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,
-                with_schedule: with_schedule,
-                schedule_datetime: schedule_datetime
+                application_code: (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel
               }, {
                 useCache: true
               });
@@ -301,26 +301,6 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
       }
       return selectProducts;
     }()
-    /**
-     * 根据商品编码或条码搜索商品
-     * @param code 商品编码或条码
-     * @returns 匹配的商品列表，如果没有匹配则返回空数组
-     */
-  }, {
-    key: "findProductsByCodeOrBarcode",
-    value: function findProductsByCodeOrBarcode(code) {
-      if (!code || typeof code !== 'string') {
-        return [];
-      }
-      var trimmedCode = code.trim();
-      if (!trimmedCode) {
-        return [];
-      }
-      var matchingProducts = this.store.list.filter(function (product) {
-        return product.code && product.code.trim() === trimmedCode || product.barcode && product.barcode.trim() === trimmedCode;
-      });
-      return cloneDeep(matchingProducts);
-    }
   }]);
   return ProductList;
 }(BaseModule);

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/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/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;