@pisell/pisellos 3.0.74 → 3.0.76

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

@@ -11,12 +11,17 @@ export declare class ProductList extends BaseModule implements Module {
     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, schedule_date, cacheId }: {
+    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, }: {
         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[];
@@ -28,4 +33,10 @@ export declare class ProductList extends BaseModule implements Module {
     getProduct(id: number): Promise<ProductData | undefined>;
     addProduct(products: ProductData[]): Promise<void>;
     selectProducts(products: ProductData[]): Promise<void>;
+    /**
+     * 根据商品编码或条码搜索商品
+     * @param code 商品编码或条码
+     * @returns 匹配的商品列表，如果没有匹配则返回空数组
+     */
+    findProductsByCodeOrBarcode(code: string): ProductData[];
 }

package/dist/modules/ProductList/index.js

@@ -16,7 +16,6 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
-import { ProductListHooks } from "./types";
 import { cloneDeep } from 'lodash-es';
 export * from "./types";
 export var ProductList = /*#__PURE__*/function (_BaseModule) {
@@ -87,11 +86,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
         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, sortedList;
+        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, sortedList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId;
+              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule;
               // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
               // if (!schedule_ids?.length) {
               //   const schedule_ids_data = this.store.schedule
@@ -107,7 +106,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               userPlugin = this.core.getPlugin('user');
               customer_id = undefined;
               try {
-                customer_id = userPlugin === null || userPlugin === void 0 || (_userPlugin$get = userPlugin.get()) === null || _userPlugin$get === void 0 ? void 0 : _userPlugin$get.id;
+                customer_id = paramsCustomerId || (userPlugin === null || userPlugin === void 0 || (_userPlugin$get = userPlugin.get()) === null || _userPlugin$get === void 0 ? void 0 : _userPlugin$get.id);
               } catch (error) {
                 console.error(error);
               }
@@ -126,9 +125,13 @@ 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,
                 application_code: (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel,
+                with_schedule: with_schedule,
+                schedule_datetime: schedule_datetime,
                 is_eject: 1
               }, {
                 useCache: true
@@ -137,17 +140,16 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               productsData = _context3.sent;
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
-              });
-              if (sortedList.length) {
-                sortedList.forEach(function (n) {
-                  if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
-                    n.is_eject = 1;
-                  }
-                });
-              }
+              }); // if (sortedList.length) {
+              //   sortedList.forEach((n: any) => {
+              //     if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
+              //       n.is_eject = 1
+              //     }
+              //   })
+              // }
               this.addProduct(sortedList);
               return _context3.abrupt("return", sortedList);
-            case 11:
+            case 10:
             case "end":
               return _context3.stop();
           }
@@ -198,7 +200,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               _context5.next = 2;
-              return this.core.effects.emit(ProductListHooks.onGetProducts, this.store.list);
+              return this.core.effects.emit("".concat(this.name, ":onGetProducts"), this.store.list);
             case 2:
               return _context5.abrupt("return", cloneDeep(this.store.list));
             case 3:
@@ -221,7 +223,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               _context6.next = 2;
-              return this.core.effects.emit(ProductListHooks.onGetProduct, this.store.list);
+              return this.core.effects.emit("".concat(this.name, ":onGetProduct"), this.store.list);
             case 2:
               product = this.store.list.find(function (product) {
                 return product.id === id;
@@ -295,6 +297,26 @@ 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/Resource/index.js

@@ -89,7 +89,7 @@ export var ResourceListModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               this.store.selectedResource = resource;
               _context3.next = 6;
-              return this.core.effects.emit(ResourceHooks.OnResourceSelect, resource);
+              return this.core.effects.emit("".concat(this.name, ":onResourceSelect"), resource);
             case 6:
             case "end":
               return _context3.stop();

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

@@ -2,6 +2,7 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { Rules, RulesModuleAPI, DiscountResult } from './types';
 import { Discount } from "../Discount/types";
+import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -35,7 +36,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     }, options?: {
         isSelected?: boolean;
         discountId?: number;
-        selectedList?: any[];
+        selectedList?: SetDiscountSelectedParams[];
         scan?: boolean;
     }): DiscountResult;
     /**