@pisell/pisellos 2.1.1 → 2.1.3

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

@@ -95,6 +95,12 @@ export function findFastestAvailableResource(_ref2) {
   var currentTime = dayjs();
   var fastestTime = null;
   var fastestResources = [];
+  console.log('[TimeslotUtils] 查找最快可用资源:', {
+    currentTime: currentTime.format('YYYY-MM-DD HH:mm:ss'),
+    resourceCount: resources.length,
+    currentCapacity: currentCapacity,
+    countMap: countMap
+  });
 
   // 遍历所有资源，找到最快可用的时间点
   var _iterator2 = _createForOfIteratorHelper(resources),
@@ -102,75 +108,120 @@ export function findFastestAvailableResource(_ref2) {
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var _resource = _step2.value;
-      // 获取资源当天的时间段
+      // 获取资源当天且还在工作时间内的时间段
       var todayTimes = _resource.times.filter(function (time) {
-        return dayjs(time.start_at).isSame(currentTime, 'day');
-      });
-      if (todayTimes.length === 0) continue;
-
-      // 按开始时间排序
-      todayTimes.sort(function (a, b) {
-        return dayjs(a.start_at).diff(dayjs(b.start_at));
+        var isToday = dayjs(time.start_at).isSame(currentTime, 'day');
+        var isStillWorking = dayjs(time.end_at).isAfter(currentTime);
+        return isToday && isStillWorking;
       });
-
-      // 找到第一个可用的时间段
-      var _iterator3 = _createForOfIteratorHelper(todayTimes),
-        _step3;
+      if (todayTimes.length === 0) {
+        console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, ") \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5"));
+        continue;
+      }
+      var _iterator4 = _createForOfIteratorHelper(todayTimes),
+        _step4;
       try {
         var _loop = function _loop() {
-            var time = _step3.value;
-            var startTime = dayjs(time.start_at);
-
-            // 如果开始时间在当前时间之前，跳过
-            if (startTime.isBefore(currentTime)) return 0; // continue
-
-            // 检查这个时间段是否可用
-            if (_resource.resourceType === 'single') {
-              var _time$event_list;
-              // 单个预约类型：检查是否有预约
-              var hasBooking = (_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.some(function (event) {
-                return dayjs(event.start_at).isSame(startTime);
-              });
-              if (!hasBooking) {
-                if (!fastestTime || startTime.isSame(fastestTime)) {
-                  fastestTime = startTime;
-                  fastestResources.push(_resource);
-                } else if (startTime.isBefore(fastestTime)) {
-                  fastestTime = startTime;
-                  fastestResources = [_resource];
-                }
-                return 1; // break
-              }
-            } else {
-              var _time$event_list2;
-              // 多个预约类型：检查容量
-              var totalCapacity = _resource.capacity || 0;
-              var usedCapacity = ((_time$event_list2 = time.event_list) === null || _time$event_list2 === void 0 ? void 0 : _time$event_list2.reduce(function (sum, event) {
-                return dayjs(event.start_at).isSame(startTime) ? sum + (event.pax || 0) : sum;
-              }, 0)) || 0;
-              var remainingCapacity = totalCapacity - usedCapacity;
-              if (remainingCapacity >= (countMap[_resource.id] || 0) + currentCapacity) {
-                if (!fastestTime || startTime.isSame(fastestTime)) {
-                  fastestTime = startTime;
-                  fastestResources.push(_resource);
-                } else if (startTime.isBefore(fastestTime)) {
-                  fastestTime = startTime;
-                  fastestResources = [_resource];
+            var _time$event_list, _time$event_list2;
+            var time = _step4.value;
+            var workStartTime = dayjs(time.start_at);
+            var workEndTime = dayjs(time.end_at);
+
+            // 确定检查的起始时间（当前时间 vs 工作开始时间）
+            var nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
+            console.log("[TimeslotUtils] \u68C0\u67E5\u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, "):"), {
+              workTime: "".concat(workStartTime.format('HH:mm'), "-").concat(workEndTime.format('HH:mm')),
+              checkStartTime: nextAvailableTime.format('HH:mm:ss'),
+              eventCount: ((_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.length) || 0
+            });
+
+            // 获取所有影响的预约事件（当前时间之后的）
+            var relevantEvents = ((_time$event_list2 = time.event_list) === null || _time$event_list2 === void 0 ? void 0 : _time$event_list2.filter(function (event) {
+              var eventEnd = dayjs(event.end_at);
+              return eventEnd.isAfter(nextAvailableTime);
+            })) || [];
+
+            // 按开始时间排序
+            relevantEvents.sort(function (a, b) {
+              return dayjs(a.start_at).diff(dayjs(b.start_at));
+            });
+
+            // 检查从 nextAvailableTime 开始的可用性
+            var finalAvailableTime = nextAvailableTime;
+            var _iterator5 = _createForOfIteratorHelper(relevantEvents),
+              _step5;
+            try {
+              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                var _event = _step5.value;
+                var _eventStart = dayjs(_event.start_at);
+                var _eventEnd = dayjs(_event.end_at);
+                console.log("[TimeslotUtils] \u68C0\u67E5\u4E8B\u4EF6\u51B2\u7A81:", {
+                  resourceId: _resource.id,
+                  eventTime: "".concat(_eventStart.format('HH:mm'), "-").concat(_eventEnd.format('HH:mm')),
+                  checkTime: finalAvailableTime.format('HH:mm:ss'),
+                  pax: _event.pax || 1
+                });
+
+                // 检查资源类型和容量
+                if (_resource.resourceType === 'single' || (_resource.capacity || 1) === 1) {
+                  // 单人预约资源：检查时间冲突
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                    // 有冲突，使用事件结束时间
+                    finalAvailableTime = _eventEnd;
+                    console.log("[TimeslotUtils] \u53D1\u73B0\u65F6\u95F4\u51B2\u7A81\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
+                  }
+                } else {
+                  // 多人预约资源：检查容量
+                  var totalCapacity = _resource.capacity || 0;
+                  var currentUsedCapacity = countMap[_resource.id] || 0;
+                  var eventUsedCapacity = _event.pax || 1;
+
+                  // 如果在事件时间范围内，检查容量是否足够
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                    var totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
+                    if (totalRequiredCapacity > totalCapacity) {
+                      // 容量不足，使用事件结束时间
+                      finalAvailableTime = _eventEnd;
+                      console.log("[TimeslotUtils] \u5BB9\u91CF\u4E0D\u8DB3\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
+                    }
+                  }
                 }
-                return 1; // break
               }
+
+              // 确保可用时间在工作时间内
+            } catch (err) {
+              _iterator5.e(err);
+            } finally {
+              _iterator5.f();
+            }
+            if (finalAvailableTime.isAfter(workEndTime)) {
+              console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, " \u53EF\u7528\u65F6\u95F4\u8D85\u51FA\u5DE5\u4F5C\u65F6\u95F4\uFF0C\u8DF3\u8FC7"));
+              return 0; // continue
             }
+            console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, ") \u6700\u5FEB\u53EF\u7528\u65F6\u95F4: ").concat(finalAvailableTime.format('HH:mm:ss')));
+
+            // 更新最快可用时间和资源
+            if (!fastestTime || finalAvailableTime.isBefore(fastestTime)) {
+              fastestTime = finalAvailableTime;
+              fastestResources = [_resource];
+              console.log("[TimeslotUtils] \u66F4\u65B0\u6700\u5FEB\u65F6\u95F4: ".concat(fastestTime.format('HH:mm:ss'), ", \u8D44\u6E90: ").concat(_resource.main_field));
+            } else if (finalAvailableTime.isSame(fastestTime)) {
+              fastestResources.push(_resource);
+              console.log("[TimeslotUtils] \u6DFB\u52A0\u76F8\u540C\u65F6\u95F4\u8D44\u6E90: ".concat(_resource.main_field));
+            }
+            return 1; // break
+            // 每个资源只需要计算一次
           },
           _ret;
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
           _ret = _loop();
           if (_ret === 0) continue;
           if (_ret === 1) break;
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
     }
 
@@ -180,31 +231,72 @@ export function findFastestAvailableResource(_ref2) {
   } finally {
     _iterator2.f();
   }
-  if (!fastestTime || fastestResources.length === 0) return null;
+  if (!fastestTime || fastestResources.length === 0) {
+    console.log('[TimeslotUtils] 未找到可用资源');
+    return null;
+  }
+  console.log("[TimeslotUtils] \u627E\u5230 ".concat(fastestResources.length, " \u4E2A\u6700\u5FEB\u53EF\u7528\u8D44\u6E90\uFF0C\u65F6\u95F4: ").concat(fastestTime.format('HH:mm:ss')));
 
   // 如果只有一个最快可用的资源，直接返回
-  if (fastestResources.length === 1) return fastestResources[0];
+  if (fastestResources.length === 1) {
+    console.log("[TimeslotUtils] \u8FD4\u56DE\u552F\u4E00\u6700\u5FEB\u8D44\u6E90: ".concat(fastestResources[0].main_field));
+    return fastestResources[0];
+  }
 
-  // 如果有多个最快可用的资源，比较它们的空闲时间
+  // 如果有多个最快可用的资源，选择空闲时间最长的资源
+  var selectedResource = fastestResources[0];
   var maxIdleTime = 0;
-  var selectedResource = null;
+  console.log("[TimeslotUtils] \u6BD4\u8F83 ".concat(fastestResources.length, " \u4E2A\u8D44\u6E90\u7684\u7A7A\u95F2\u65F6\u95F4:"));
   for (var _i2 = 0, _fastestResources = fastestResources; _i2 < _fastestResources.length; _i2++) {
+    var _workingTime$event_li;
     var resource = _fastestResources[_i2];
-    var idleTime = calculateResourceAvailableTime({
-      resource: resource,
-      timeSlots: {
-        start_time: fastestTime.format('HH:mm'),
-        end_time: fastestTime.format('HH:mm'),
-        start_at: fastestTime,
-        end_at: fastestTime
-      },
-      currentCapacity: (countMap[resource.id] || 0) + currentCapacity
+    // 找到该资源当天且还在工作的时间段
+    var workingTime = resource.times.find(function (time) {
+      var isToday = dayjs(time.start_at).isSame(fastestTime, 'day');
+      var isStillWorking = dayjs(time.end_at).isAfter(fastestTime);
+      return isToday && isStillWorking;
+    });
+    if (!workingTime) continue;
+    var workEndTime = dayjs(workingTime.end_at);
+
+    // 计算从最快可用时间到工作结束时间的空闲时长（分钟）
+    var totalIdleTime = workEndTime.diff(fastestTime, 'minute');
+
+    // 减去已有预约占用的时间
+    var relevantEvents = ((_workingTime$event_li = workingTime.event_list) === null || _workingTime$event_li === void 0 ? void 0 : _workingTime$event_li.filter(function (event) {
+      var eventStart = dayjs(event.start_at);
+      var eventEnd = dayjs(event.end_at);
+      // 只计算在最快可用时间之后的预约
+      return eventEnd.isAfter(fastestTime) && eventStart.isAfter(fastestTime);
+    })) || [];
+    var _iterator3 = _createForOfIteratorHelper(relevantEvents),
+      _step3;
+    try {
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        var event = _step3.value;
+        var eventStart = dayjs(event.start_at);
+        var eventEnd = dayjs(event.end_at);
+        var eventDuration = eventEnd.diff(eventStart, 'minute');
+        totalIdleTime -= eventDuration;
+      }
+    } catch (err) {
+      _iterator3.e(err);
+    } finally {
+      _iterator3.f();
+    }
+    console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, "):"), {
+      工作结束时间: workEndTime.format('HH:mm'),
+      总工作时长: workEndTime.diff(fastestTime, 'minute') + '分钟',
+      预约占用时长: workEndTime.diff(fastestTime, 'minute') - totalIdleTime + '分钟',
+      实际空闲时长: totalIdleTime + '分钟'
     });
-    if (idleTime > maxIdleTime) {
-      maxIdleTime = idleTime;
+    if (totalIdleTime > maxIdleTime) {
+      maxIdleTime = totalIdleTime;
       selectedResource = resource;
+      console.log("[TimeslotUtils] \u66F4\u65B0\u6700\u4F73\u9009\u62E9: ".concat(resource.main_field, " (\u7A7A\u95F2").concat(totalIdleTime, "\u5206\u949F)"));
     }
   }
+  console.log("[TimeslotUtils] \u6700\u7EC8\u9009\u62E9\u8D44\u6E90: ".concat(selectedResource.main_field, " (\u6700\u957F\u7A7A\u95F2").concat(maxIdleTime, "\u5206\u949F)"));
   return selectedResource;
 }
 

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.d.ts

@@ -34,7 +34,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         discountList: Discount[];
     };
     setProductList(productList: Record<string, any>[]): void;
-    scanCode(code: string): Promise<{
+    scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];

package/dist/solution/ShopDiscount/index.js

@@ -304,14 +304,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scanCode",
     value: function () {
-      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code) {
+      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
         var _this$store$discount3, resultDiscountList, rulesModule, withScanList, _ref3, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               _context5.prev = 0;
               _context5.next = 3;
-              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.batchSearch(code);
+              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.batchSearch(code, customerId);
             case 3:
               _context5.t0 = _context5.sent;
               if (_context5.t0) {
@@ -393,7 +393,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee5, this, [[0, 23]]);
       }));
-      function scanCode(_x4) {
+      function scanCode(_x4, _x5) {
         return _scanCode.apply(this, arguments);
       }
       return scanCode;
@@ -438,7 +438,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee6, this);
       }));
-      function emitDiscountListChange(_x5) {
+      function emitDiscountListChange(_x6) {
         return _emitDiscountListChange.apply(this, arguments);
       }
       return emitDiscountListChange;
@@ -574,7 +574,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee7, this, [[0, 11]]);
       }));
-      function getCustomerWallet(_x6) {
+      function getCustomerWallet(_x7) {
         return _getCustomerWallet.apply(this, arguments);
       }
       return getCustomerWallet;
@@ -634,7 +634,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee8, this, [[0, 18]]);
       }));
-      function loadPrepareConfig(_x7) {
+      function loadPrepareConfig(_x8) {
         return _loadPrepareConfig.apply(this, arguments);
       }
       return loadPrepareConfig;

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

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

@@ -20,8 +20,9 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_discount_card: 0 | 1;
         customer_id: number;
     }): Promise<Discount[]>;
-    batchSearch(code: string): Promise<Discount[]>;
+    batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
+    private checkUsageCreditsLimit;
     uniqueByProductId(discountList: Discount[]): Discount[];
     filterDiscountListByProductIds(discountList: Discount[], productIds: number[]): Discount[];
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;

package/lib/modules/Discount/index.js

@@ -89,22 +89,64 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     ) || [];
     return goodPassList;
   }
-  async batchSearch(code) {
+  async batchSearch(code, customerId) {
     const result = await this.request.get(`/machinecode/batch-search`, {
       code,
       translate_flag: 1,
       tags: ["good_pass", "product_discount_card"],
       available: 1,
-      relation_product: 1
+      relation_product: 1,
+      with: ["extensionData"],
+      order_behavior_count: 1,
+      order_behavior_count_customer_id: customerId || 1
     });
     const resultDiscountList = this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || [];
     return resultDiscountList;
   }
   filterEnabledDiscountList(discountList) {
     return discountList.filter(
-      (discount) => discount.limit_status === "enable" && new import_decimal.default((discount == null ? void 0 : discount.par_value) || 0).minus(new import_decimal.default((discount == null ? void 0 : discount.used_par_value) || 0)).greaterThan(0)
+      (discount) => discount.limit_status === "enable" && new import_decimal.default((discount == null ? void 0 : discount.par_value) || 0).minus(new import_decimal.default((discount == null ? void 0 : discount.used_par_value) || 0)).greaterThan(0) && this.checkUsageCreditsLimit(discount)
     );
   }
+  // 检查使用次数限制
+  checkUsageCreditsLimit(discount) {
+    if (!discount.extension_data || discount.extension_data.length === 0) {
+      return true;
+    }
+    const usageCreditsData = discount.extension_data.find(
+      (data) => data.field_key === "usage_credits"
+    );
+    if (!usageCreditsData) {
+      return true;
+    }
+    const value = usageCreditsData.value;
+    if (value.total_credits && value.total_credits > 0) {
+      if ((discount.total_order_behavior_count || 0) >= value.total_credits) {
+        return false;
+      }
+    }
+    if (value.per_user_limit && value.per_user_limit > 0) {
+      if ((discount.customer_order_behavior_count || 0) >= value.per_user_limit) {
+        return false;
+      }
+    }
+    if (value.max_per_day && value.max_per_day > 0) {
+      if ((discount.today_order_behavior_count || 0) >= value.max_per_day) {
+        return false;
+      }
+    }
+    if (value.max_per_week && value.max_per_week > 0) {
+      if ((discount.week_order_behavior_count || 0) >= value.max_per_week) {
+        return false;
+      }
+    }
+    if (value.max_per_month && value.max_per_month > 0) {
+      if ((discount.month_order_behavior_count || 0) >= value.max_per_month) {
+        return false;
+      }
+    }
+    return true;
+  }
   // 根据productIds去重
   uniqueByProductId(discountList) {
     return (0, import_utils.uniqueById)(discountList, "product_id");

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

@@ -36,6 +36,25 @@ interface ApplicableProductDetails {
         title?: string;
     };
 }
+interface UsageCreditsValue {
+    total_credits: number;
+    per_user_limit: number;
+    max_per_day: number;
+    max_per_week: number;
+    max_per_month: number;
+}
+interface ExtensionData {
+    id: number;
+    shop_id: number;
+    product_id: number;
+    field_id: number;
+    field_key: string;
+    type: string;
+    value: UsageCreditsValue | Record<string, any> | string | number | boolean | any[];
+    created_at: string | null;
+    updated_at: string | null;
+    deleted_at: string | null;
+}
 export interface Discount {
     id: number;
     product_name: string;
@@ -70,6 +89,12 @@ export interface Discount {
     appliedProductDetails: ApplicableProductDetails[];
     isDisabledForProductUsed?: boolean;
     amount?: number;
+    extension_data?: ExtensionData[];
+    total_order_behavior_count?: number;
+    today_order_behavior_count?: number;
+    week_order_behavior_count?: number;
+    month_order_behavior_count?: number;
+    customer_order_behavior_count?: number;
 }
 export interface DiscountState {
     discountList: Discount[];

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

@@ -1,6 +1,5 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Product } from '../Product';
 import { ProductData } from '../Product/types';
 export * from './types';
 export declare class ProductList extends BaseModule implements Module {
@@ -26,7 +25,7 @@ export declare class ProductList extends BaseModule implements Module {
         channel?: string;
     }): Promise<any>;
     getProducts(): Promise<ProductData[]>;
-    getProduct(id: number): Promise<Product | undefined>;
+    getProduct(id: number): Promise<ProductData | undefined>;
     addProduct(products: ProductData[]): Promise<void>;
     selectProducts(products: ProductData[]): Promise<void>;
 }

package/lib/modules/ProductList/index.js

@@ -24,7 +24,6 @@ __export(ProductList_exports, {
 });
 module.exports = __toCommonJS(ProductList_exports);
 var import_BaseModule = require("../BaseModule");
-var import_Product = require("../Product");
 var import_types = require("./types");
 var import_lodash_es = require("lodash-es");
 __reExport(ProductList_exports, require("./types"), module.exports);
@@ -41,30 +40,15 @@ var ProductList = class extends import_BaseModule.BaseModule {
     this.store = options.store;
     this.otherParams = options.otherParams || {};
     if (Array.isArray((_a = options.initialState) == null ? void 0 : _a.list)) {
-      this.store.list = options.initialState.list;
+      this.store.list = options.initialState.list.slice().sort((a, b) => Number(b.sort) - Number(a.sort));
       this.core.effects.emit(`${this.name}:changed`, this.store.list);
-      this.storeChange();
     } else {
       this.store.list = [];
-      this.store.productMap = /* @__PURE__ */ new Map();
       this.store.selectProducts = [];
     }
     this.request = core.getPlugin("request");
   }
   async storeChange(path, value) {
-    var _a;
-    (_a = this.store.list) == null ? void 0 : _a.forEach((product) => {
-      const productModule = this.store.productMap.get(`product-${product.id}`);
-      if (!productModule) {
-        const newProductModule = new import_Product.Product(
-          `product_${product.id.toString()}`
-        );
-        this.core.registerModule(newProductModule, { initialState: product });
-        this.store.productMap.set(product.id.toString(), newProductModule);
-      } else {
-        productModule.updateData(product);
-      }
-    });
   }
   async loadProducts({
     category_ids = [],
@@ -109,8 +93,9 @@ var ProductList = class extends import_BaseModule.BaseModule {
       },
       { useCache: true }
     );
-    this.addProduct(productsData.data.list);
-    return productsData.data.list;
+    const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    this.addProduct(sortedList);
+    return sortedList;
   }
   async loadProductsPrice({
     ids = [],
@@ -142,10 +127,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
       import_types.ProductListHooks.onGetProduct,
       this.store.list
     );
-    const product = this.store.productMap.get(`${id}`);
-    if (product)
-      return product;
-    return void 0;
+    const product = this.store.list.find((product2) => product2.id === id);
+    return product ? (0, import_lodash_es.cloneDeep)(product) : void 0;
   }
   async addProduct(products) {
     if (!this.store.list) {
@@ -159,7 +142,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
         this.store.list[index] = n;
       }
     });
-    this.storeChange();
+    this.store.list.sort((a, b) => Number(b.sort) - Number(a.sort));
+    this.core.effects.emit(`${this.name}:changed`, this.store.list);
   }
   async selectProducts(products) {
     this.store.selectProducts = products;

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

@@ -1,7 +1,6 @@
 import { ProductData } from '../Product/types';
 export interface ProductListData {
     list: ProductData[];
-    productMap: Map<string, any>;
     selectProducts: ProductData[];
 }
 export declare enum ProductListHooks {