@pisell/pisellos 2.2.171 → 2.2.173

package/dist/server/modules/order/utils/filterOrders.js

@@ -1,4 +1,17 @@
 import dayjs from 'dayjs';
+/** 从订单 payments 提取支付方式 code，与 UI 筛选选项及 filterBookings 一致 */
+function getOrderPaymentCodes(order) {
+  var payments = order.payments;
+  if (!Array.isArray(payments) || payments.length === 0) {
+    return [];
+  }
+  return payments.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item.code;
+  }).filter(function (code) {
+    return typeof code === 'string' && code.length > 0;
+  });
+}
+
 /**
  * 订单过滤函数
  * @param orders 原始订单列表
@@ -126,22 +139,23 @@ export function filterOrders(orders, filters) {
       }
     }
 
-    // payment_methods - 支付方式
+    // payment_methods - 支付方式（按 payments[].code 匹配，不再使用 order.payment_methods）
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
-      if (!order.payment_methods || !Array.isArray(order.payment_methods) || order.payment_methods.length === 0) {
+      var orderPaymentCodes = getOrderPaymentCodes(order);
+      if (orderPaymentCodes.length === 0) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: 'payment_methods',
-            actual: order.payment_methods,
+            actual: order.payments,
             expected: safeFilters.payment_methods
           }
         });
         return false;
       }
-      var hasMatch = order.payment_methods.some(function (pm) {
-        return safeFilters.payment_methods.includes(pm);
+      var hasMatch = orderPaymentCodes.some(function (code) {
+        return safeFilters.payment_methods.includes(code);
       });
       if (!hasMatch) {
         rejected.push({
@@ -149,7 +163,7 @@ export function filterOrders(orders, filters) {
           order_number: order.order_number,
           reason: {
             field: 'payment_methods',
-            actual: order.payment_methods,
+            actual: orderPaymentCodes,
             expected: safeFilters.payment_methods
           }
         });

package/dist/server/modules/products/index.js

@@ -277,7 +277,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _setupQuotationPriceBridge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
         var _this$otherParams;
-        var channel, quotation, _params$scheduleModul, _params$scheduleModul2, scheduleList, scheduleMap;
+        var channel, quotation, scheduleCache, hasLoadedScheduleList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -301,14 +301,32 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               this.quotationPriceBridge = quotation;
             case 10:
               if (params.scheduleModule) {
-                scheduleList = ((_params$scheduleModul = (_params$scheduleModul2 = params.scheduleModule).getScheduleList) === null || _params$scheduleModul === void 0 ? void 0 : _params$scheduleModul.call(_params$scheduleModul2)) || [];
-                scheduleMap = new Map(scheduleList.map(function (schedule) {
-                  return [schedule.id, schedule];
-                }));
+                scheduleCache = new Map();
+                hasLoadedScheduleList = false;
                 this.quotationPriceBridge.setScheduleResolver(function (id) {
-                  var _params$scheduleModul3, _params$scheduleModul4;
-                  if (scheduleMap.has(id)) return scheduleMap.get(id);
-                  var schedules = ((_params$scheduleModul3 = (_params$scheduleModul4 = params.scheduleModule).getScheduleByIds) === null || _params$scheduleModul3 === void 0 ? void 0 : _params$scheduleModul3.call(_params$scheduleModul4, [id])) || [];
+                  var _params$scheduleModul3, _params$scheduleModul4, _params$scheduleModul5, _params$scheduleModul6;
+                  var scheduleId = String(id);
+                  if (scheduleCache.has(scheduleId)) return scheduleCache.get(scheduleId);
+                  if (!hasLoadedScheduleList) {
+                    var _params$scheduleModul, _params$scheduleModul2;
+                    var scheduleList = ((_params$scheduleModul = (_params$scheduleModul2 = params.scheduleModule).getScheduleList) === null || _params$scheduleModul === void 0 ? void 0 : _params$scheduleModul.call(_params$scheduleModul2)) || [];
+                    var _iterator = _createForOfIteratorHelper(scheduleList),
+                      _step;
+                    try {
+                      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                        var schedule = _step.value;
+                        scheduleCache.set(String(schedule.id), schedule);
+                      }
+                    } catch (err) {
+                      _iterator.e(err);
+                    } finally {
+                      _iterator.f();
+                    }
+                    hasLoadedScheduleList = true;
+                  }
+                  if (scheduleCache.has(scheduleId)) return scheduleCache.get(scheduleId);
+                  var schedules = ((_params$scheduleModul3 = (_params$scheduleModul4 = params.scheduleModule).getScheduleListByIds) === null || _params$scheduleModul3 === void 0 ? void 0 : _params$scheduleModul3.call(_params$scheduleModul4, [id])) || ((_params$scheduleModul5 = (_params$scheduleModul6 = params.scheduleModule).getScheduleByIds) === null || _params$scheduleModul5 === void 0 ? void 0 : _params$scheduleModul5.call(_params$scheduleModul6, [id])) || [];
+                  if (schedules[0]) scheduleCache.set(scheduleId, schedules[0]);
                   return schedules[0];
                 });
               }
@@ -441,17 +459,18 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildPriceDataFromQuotation",
     value: function buildPriceDataFromQuotation(product, datetime, customerId) {
-      var _this$quotationPriceB, _ref2, _product$base_price;
+      var _this$quotationPriceB, _ref2, _ref3;
       var quotedPrice = (_this$quotationPriceB = this.quotationPriceBridge) === null || _this$quotationPriceB === void 0 ? void 0 : _this$quotationPriceB.getPriceForProduct({
         productId: product.id,
         datetime: datetime,
         customer_id: customerId
       });
       var productPrice = quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : product.price;
+      var productBasePrice = (_ref2 = (_ref3 = quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : product.base_price) !== null && _ref3 !== void 0 ? _ref3 : product.price) !== null && _ref2 !== void 0 ? _ref2 : 0;
       return {
         id: product.id,
         price: String(productPrice !== null && productPrice !== void 0 ? productPrice : 0),
-        base_price: String((_ref2 = (_product$base_price = product.base_price) !== null && _product$base_price !== void 0 ? _product$base_price : product.price) !== null && _ref2 !== void 0 ? _ref2 : 0),
+        base_price: String(productBasePrice),
         variant: this.buildVariantPriceData(product, datetime, customerId),
         bundle_group: this.buildBundleGroupPriceData(product, datetime, customerId)
       };
@@ -462,15 +481,15 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
       var _this4 = this;
       if (!Array.isArray(product.variant)) return [];
       return product.variant.map(function (variant) {
-        var _this4$quotationPrice, _ref3, _ref4, _ref5, _ref6, _ref7, _variant$base_price, _variant$product_id;
+        var _this4$quotationPrice, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9, _variant$product_id;
         var quotedPrice = (_this4$quotationPrice = _this4.quotationPriceBridge) === null || _this4$quotationPrice === void 0 ? void 0 : _this4$quotationPrice.getPriceForProduct({
           productId: product.id,
           variantId: Number(variant.id),
           datetime: datetime,
           customer_id: customerId
         });
-        var price = (_ref3 = (_ref4 = quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : variant.price) !== null && _ref4 !== void 0 ? _ref4 : product.price) !== null && _ref3 !== void 0 ? _ref3 : 0;
-        var basePrice = (_ref5 = (_ref6 = (_ref7 = (_variant$base_price = variant.base_price) !== null && _variant$base_price !== void 0 ? _variant$base_price : variant.price) !== null && _ref7 !== void 0 ? _ref7 : product.base_price) !== null && _ref6 !== void 0 ? _ref6 : product.price) !== null && _ref5 !== void 0 ? _ref5 : 0;
+        var price = (_ref4 = (_ref5 = quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : variant.price) !== null && _ref5 !== void 0 ? _ref5 : product.price) !== null && _ref4 !== void 0 ? _ref4 : 0;
+        var basePrice = (_ref6 = (_ref7 = (_ref8 = (_ref9 = quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : variant.base_price) !== null && _ref9 !== void 0 ? _ref9 : variant.price) !== null && _ref8 !== void 0 ? _ref8 : product.base_price) !== null && _ref7 !== void 0 ? _ref7 : product.price) !== null && _ref6 !== void 0 ? _ref6 : 0;
         return {
           id: Number(variant.id),
           product_id: Number((_variant$product_id = variant.product_id) !== null && _variant$product_id !== void 0 ? _variant$product_id : product.id),
@@ -488,7 +507,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
         return {
           id: Number(group.id),
           bundle_item: (group.bundle_item || []).map(function (item) {
-            var _this5$quotationPrice, _ref8, _ref9, _item$base_price, _item$product_id, _item$group_id;
+            var _this5$quotationPrice, _ref10, _ref11, _ref12, _item$product_id, _item$group_id;
             var bundleProductId = Number(item.bundle_product_id);
             var bundleVariantId = Number(item.bundle_variant_id || 0);
             var quotedPrice = (_this5$quotationPrice = _this5.quotationPriceBridge) === null || _this5$quotationPrice === void 0 ? void 0 : _this5$quotationPrice.getPriceForProduct({
@@ -497,8 +516,8 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               datetime: datetime,
               customer_id: customerId
             });
-            var price = (_ref8 = quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : item.price) !== null && _ref8 !== void 0 ? _ref8 : 0;
-            var basePrice = (_ref9 = (_item$base_price = item.base_price) !== null && _item$base_price !== void 0 ? _item$base_price : item.price) !== null && _ref9 !== void 0 ? _ref9 : 0;
+            var price = (_ref10 = quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : item.price) !== null && _ref10 !== void 0 ? _ref10 : 0;
+            var basePrice = (_ref11 = (_ref12 = quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : item.base_price) !== null && _ref12 !== void 0 ? _ref12 : item.price) !== null && _ref11 !== void 0 ? _ref11 : 0;
             return {
               id: Number(item.id),
               product_id: Number((_item$product_id = item.product_id) !== null && _item$product_id !== void 0 ? _item$product_id : product.id),
@@ -531,7 +550,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _getProductsWithPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(schedule_date, extraContext, options) {
         var _options$changedIds;
-        var t0, scopedProductIds, cacheKey, scopedProductIdSet, changedIds, cachedProducts, updatedProducts, updatedMap, mergedCache, _iterator, _step, p, _iterator2, _step2, _p, errorMessage, result;
+        var t0, scopedProductIds, cacheKey, scopedProductIdSet, changedIds, cachedProducts, updatedProducts, updatedMap, mergedCache, _iterator2, _step2, p, _iterator3, _step3, _p, errorMessage, result;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -572,10 +591,10 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 return [p.id, p];
               }));
               mergedCache = [];
-              _iterator = _createForOfIteratorHelper(cachedProducts);
+              _iterator2 = _createForOfIteratorHelper(cachedProducts);
               try {
-                for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                  p = _step.value;
+                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                  p = _step2.value;
                   if (updatedMap.has(p.id)) {
                     mergedCache.push(updatedMap.get(p.id));
                     updatedMap.delete(p.id);
@@ -585,20 +604,20 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 }
                 // 剩余的是新增商品（create 场景）
               } catch (err) {
-                _iterator.e(err);
+                _iterator2.e(err);
               } finally {
-                _iterator.f();
+                _iterator2.f();
               }
-              _iterator2 = _createForOfIteratorHelper(updatedMap.values());
+              _iterator3 = _createForOfIteratorHelper(updatedMap.values());
               try {
-                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                  _p = _step2.value;
+                for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                  _p = _step3.value;
                   mergedCache.push(_p);
                 }
               } catch (err) {
-                _iterator2.e(err);
+                _iterator3.e(err);
               } finally {
-                _iterator2.f();
+                _iterator3.f();
               }
               this.productsPriceCache.set(cacheKey, mergedCache);
               this.logInfo('增量更新完成', {
@@ -833,25 +852,25 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
       }
       if (productIds.length === 0 && collectionIds.length === 0) return [];
       var result = new Set();
-      var _iterator3 = _createForOfIteratorHelper(productIds),
-        _step3;
+      var _iterator4 = _createForOfIteratorHelper(productIds),
+        _step4;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var id = _step3.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var id = _step4.value;
           if (this.store.map.has(id)) result.add(id);
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
       if (collectionIds.length === 0) return Array.from(result);
       var collectionIdSet = new Set(collectionIds);
-      var _iterator4 = _createForOfIteratorHelper(this.getProductsRef()),
-        _step4;
+      var _iterator5 = _createForOfIteratorHelper(this.getProductsRef()),
+        _step5;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var product = _step4.value;
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var product = _step5.value;
           if (result.has(product.id)) continue;
           if (!Array.isArray(product.collection)) continue;
           var isInCollection = product.collection.some(function (collection) {
@@ -860,9 +879,9 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
           if (isInCollection) result.add(product.id);
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator4.f();
+        _iterator5.f();
       }
       return Array.from(result);
     }
@@ -1141,11 +1160,11 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "fetchProductsByHttp",
     value: (function () {
       var _fetchProductsByHttp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        var _ref10, _ref10$category_ids, category_ids, _ref10$product_ids, product_ids, _ref10$collection, collection, customer_id, cacheId, startTime, _this$otherParams3, _productsData$data, productsData, productList, duration, _duration2, errorMessage;
+        var _ref13, _ref13$category_ids, category_ids, _ref13$product_ids, product_ids, _ref13$collection, collection, customer_id, cacheId, startTime, _this$otherParams3, _productsData$data, productsData, productList, duration, _duration2, errorMessage;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              _ref10 = params || {}, _ref10$category_ids = _ref10.category_ids, category_ids = _ref10$category_ids === void 0 ? [] : _ref10$category_ids, _ref10$product_ids = _ref10.product_ids, product_ids = _ref10$product_ids === void 0 ? [] : _ref10$product_ids, _ref10$collection = _ref10.collection, collection = _ref10$collection === void 0 ? [] : _ref10$collection, customer_id = _ref10.customer_id, cacheId = _ref10.cacheId;
+              _ref13 = params || {}, _ref13$category_ids = _ref13.category_ids, category_ids = _ref13$category_ids === void 0 ? [] : _ref13$category_ids, _ref13$product_ids = _ref13.product_ids, product_ids = _ref13$product_ids === void 0 ? [] : _ref13$product_ids, _ref13$collection = _ref13.collection, collection = _ref13$collection === void 0 ? [] : _ref13$collection, customer_id = _ref13.customer_id, cacheId = _ref13.cacheId;
               this.logInfo('fetchProductsByHttp: 开始请求', {
                 categoryIdsCount: category_ids.length,
                 productIdsCount: product_ids.length,
@@ -1293,18 +1312,18 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "getProductsRefByIds",
     value: function getProductsRefByIds(ids) {
       var products = [];
-      var _iterator5 = _createForOfIteratorHelper(ids),
-        _step5;
+      var _iterator6 = _createForOfIteratorHelper(ids),
+        _step6;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var id = _step5.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var id = _step6.value;
           var product = this.store.map.get(id);
           if (product) products.push(product);
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator5.f();
+        _iterator6.f();
       }
       return products;
     }
@@ -1343,7 +1362,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductsByIds",
     value: (function () {
       var _removeProductsByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(ids) {
-        var idSet, _iterator6, _step6, _id, _iterator7, _step7, id, errorMessage, _iterator8, _step8, _step8$value, dateKey, cachedProducts;
+        var idSet, _iterator7, _step7, _id, _iterator8, _step8, id, errorMessage, _iterator9, _step9, _step9$value, dateKey, cachedProducts;
         return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
@@ -1355,31 +1374,31 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               this.store.list = this.store.list.filter(function (p) {
                 return !idSet.has(p.id);
               });
-              _iterator6 = _createForOfIteratorHelper(ids);
+              _iterator7 = _createForOfIteratorHelper(ids);
               try {
-                for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-                  _id = _step6.value;
+                for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+                  _id = _step7.value;
                   this.store.map.delete(_id);
                 }
               } catch (err) {
-                _iterator6.e(err);
+                _iterator7.e(err);
               } finally {
-                _iterator6.f();
+                _iterator7.f();
               }
               if (!this.dbManager) {
                 _context14.next = 30;
                 break;
               }
               _context14.prev = 6;
-              _iterator7 = _createForOfIteratorHelper(ids);
+              _iterator8 = _createForOfIteratorHelper(ids);
               _context14.prev = 8;
-              _iterator7.s();
+              _iterator8.s();
             case 10:
-              if ((_step7 = _iterator7.n()).done) {
+              if ((_step8 = _iterator8.n()).done) {
                 _context14.next = 16;
                 break;
               }
-              id = _step7.value;
+              id = _step8.value;
               _context14.next = 14;
               return this.dbManager.delete(INDEXDB_STORE_NAME, id);
             case 14:
@@ -1391,10 +1410,10 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
             case 18:
               _context14.prev = 18;
               _context14.t0 = _context14["catch"](8);
-              _iterator7.e(_context14.t0);
+              _iterator8.e(_context14.t0);
             case 21:
               _context14.prev = 21;
-              _iterator7.f();
+              _iterator8.f();
               return _context14.finish(21);
             case 24:
               _context14.next = 30;
@@ -1408,18 +1427,18 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 error: errorMessage
               });
             case 30:
-              _iterator8 = _createForOfIteratorHelper(this.productsPriceCache.entries());
+              _iterator9 = _createForOfIteratorHelper(this.productsPriceCache.entries());
               try {
-                for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-                  _step8$value = _slicedToArray(_step8.value, 2), dateKey = _step8$value[0], cachedProducts = _step8$value[1];
+                for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+                  _step9$value = _slicedToArray(_step9.value, 2), dateKey = _step9$value[0], cachedProducts = _step9$value[1];
                   this.productsPriceCache.set(dateKey, cachedProducts.filter(function (p) {
                     return !idSet.has(p.id);
                   }));
                 }
               } catch (err) {
-                _iterator8.e(err);
+                _iterator9.e(err);
               } finally {
-                _iterator8.f();
+                _iterator9.f();
               }
               this.core.effects.emit(ProductsHooks.onProductsChanged, this.store.list);
               this.logInfo('removeProductsByIds 完成', {
@@ -1659,17 +1678,17 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     value: function syncProductsMap() {
       var t0 = performance.now();
       this.store.map.clear();
-      var _iterator9 = _createForOfIteratorHelper(this.store.list),
-        _step9;
+      var _iterator10 = _createForOfIteratorHelper(this.store.list),
+        _step10;
       try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var product = _step9.value;
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var product = _step10.value;
           this.store.map.set(product.id, product);
         }
       } catch (err) {
-        _iterator9.e(err);
+        _iterator10.e(err);
       } finally {
-        _iterator9.f();
+        _iterator10.f();
       }
       perfMark('syncProductsMap', performance.now() - t0, {
         count: this.store.map.size
@@ -1881,7 +1900,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "processProductSyncMessages",
     value: (function () {
       var _processProductSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        var messages, deleteIds, bodyUpdates, sseRefreshIds, priceRefreshIds, shouldClearPriceCache, _iterator10, _step10, msg, channelKey, _msg$relation_product, _msg$change_types, _msg$ids2, _msg$ids, ids, bodyId, _bodyId, _msg$relation_product2, _msg$relation_product3, uniqueDeleteIds, uniqueSSEIds, uniquePriceIds, freshProducts, allChangedIds, hasChanges, errorMessage;
+        var messages, deleteIds, bodyUpdates, sseRefreshIds, priceRefreshIds, shouldClearPriceCache, _iterator11, _step11, msg, channelKey, _msg$relation_product, _msg$change_types, _msg$ids2, _msg$ids, ids, bodyId, _bodyId, _msg$relation_product2, _msg$relation_product3, uniqueDeleteIds, uniqueSSEIds, uniquePriceIds, freshProducts, allChangedIds, hasChanges, errorMessage;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
@@ -1901,15 +1920,15 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               sseRefreshIds = [];
               priceRefreshIds = [];
               shouldClearPriceCache = false;
-              _iterator10 = _createForOfIteratorHelper(messages);
+              _iterator11 = _createForOfIteratorHelper(messages);
               _context20.prev = 11;
-              _iterator10.s();
+              _iterator11.s();
             case 13:
-              if ((_step10 = _iterator10.n()).done) {
+              if ((_step11 = _iterator11.n()).done) {
                 _context20.next = 36;
                 break;
               }
-              msg = _step10.value;
+              msg = _step11.value;
               channelKey = msg._channelKey || msg.module || 'product';
               if (!(channelKey === 'product')) {
                 _context20.next = 33;
@@ -1975,10 +1994,10 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
             case 38:
               _context20.prev = 38;
               _context20.t0 = _context20["catch"](11);
-              _iterator10.e(_context20.t0);
+              _iterator11.e(_context20.t0);
             case 41:
               _context20.prev = 41;
-              _iterator10.f();
+              _iterator11.f();
               return _context20.finish(41);
             case 44:
               uniqueDeleteIds = _toConsumableArray(new Set(deleteIds));
@@ -2149,7 +2168,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "applyBodyUpdatesToStore",
     value: (function () {
       var _applyBodyUpdatesToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(bodyUpdates) {
-        var updatedCount, newCount, appliedIds, _iterator11, _step11, _step11$value, id, body;
+        var updatedCount, newCount, appliedIds, _iterator12, _step12, _step12$value, id, body;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
@@ -2167,19 +2186,19 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 }
                 return p;
               });
-              _iterator11 = _createForOfIteratorHelper(bodyUpdates);
+              _iterator12 = _createForOfIteratorHelper(bodyUpdates);
               try {
-                for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-                  _step11$value = _slicedToArray(_step11.value, 2), id = _step11$value[0], body = _step11$value[1];
+                for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+                  _step12$value = _slicedToArray(_step12.value, 2), id = _step12$value[0], body = _step12$value[1];
                   if (!appliedIds.has(id)) {
                     this.store.list.push(body);
                     newCount++;
                   }
                 }
               } catch (err) {
-                _iterator11.e(err);
+                _iterator12.e(err);
               } finally {
-                _iterator11.f();
+                _iterator12.f();
               }
               this.syncProductsMap();
               _context22.next = 10;
@@ -2212,21 +2231,21 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "mergeProductsToStore",
     value: (function () {
       var _mergeProductsToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(freshProducts) {
-        var freshMap, _iterator12, _step12, p, updatedList, newCount, _iterator13, _step13, _p2, updatedCount;
+        var freshMap, _iterator13, _step13, p, updatedList, newCount, _iterator14, _step14, _p2, updatedCount;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
             case 0:
               freshMap = new Map();
-              _iterator12 = _createForOfIteratorHelper(freshProducts);
+              _iterator13 = _createForOfIteratorHelper(freshProducts);
               try {
-                for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-                  p = _step12.value;
+                for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+                  p = _step13.value;
                   freshMap.set(p.id, p);
                 }
               } catch (err) {
-                _iterator12.e(err);
+                _iterator13.e(err);
               } finally {
-                _iterator12.f();
+                _iterator13.f();
               }
               updatedList = this.store.list.map(function (p) {
                 if (freshMap.has(p.id)) {
@@ -2237,16 +2256,16 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 return p;
               }); // freshMap 中剩余的是新商品（create 场景）
               newCount = freshMap.size;
-              _iterator13 = _createForOfIteratorHelper(freshMap.values());
+              _iterator14 = _createForOfIteratorHelper(freshMap.values());
               try {
-                for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-                  _p2 = _step13.value;
+                for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+                  _p2 = _step14.value;
                   updatedList.push(_p2);
                 }
               } catch (err) {
-                _iterator13.e(err);
+                _iterator14.e(err);
               } finally {
-                _iterator13.f();
+                _iterator14.f();
               }
               updatedCount = freshProducts.length - newCount;
               this.store.list = updatedList;

package/dist/server/modules/schedule/index.js

@@ -257,6 +257,7 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getScheduleByIds",
     value: function getScheduleByIds(ids) {
+      var _this2 = this;
       if (!ids || ids.length === 0) {
         this.logInfo('getScheduleByIds: 未提供有效的 ids', {
           idsCount: 0
@@ -264,15 +265,21 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
         return [];
       }
       var result = [];
+      var scheduleList = this.store.scheduleList || [];
       var _iterator = _createForOfIteratorHelper(ids),
         _step;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _loop = function _loop() {
           var id = _step.value;
-          var schedule = this.store.map.get(id);
+          var schedule = _this2.store.map.get(id) || scheduleList.find(function (item) {
+            return String(item.id) === String(id);
+          });
           if (schedule) {
             result.push(schedule);
           }
+        };
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          _loop();
         }
       } catch (err) {
         _iterator.e(err);
@@ -371,11 +378,11 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getDateIsInSchedule",
     value: function getDateIsInSchedule(date, scheduleList) {
-      var _this2 = this;
+      var _this3 = this;
       var scheduleListData = [];
       scheduleList.forEach(function (item) {
         if (typeof item === 'number') {
-          scheduleListData.push.apply(scheduleListData, _toConsumableArray(_this2.getScheduleByIds([item])));
+          scheduleListData.push.apply(scheduleListData, _toConsumableArray(_this3.getScheduleByIds([item])));
         } else {
           scheduleListData.push(item);
         }
@@ -446,7 +453,7 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
     key: "saveScheduleToIndexDB",
     value: (function () {
       var _saveScheduleToIndexDB = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(scheduleList) {
-        var _this3 = this;
+        var _this4 = this;
         var savePromises, errorMessage;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
@@ -467,7 +474,7 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
             case 7:
               // 逐个保存日程（每个日程是独立的记录）
               savePromises = scheduleList.map(function (schedule) {
-                return _this3.dbManager.add(INDEXDB_STORE_NAME, schedule);
+                return _this4.dbManager.add(INDEXDB_STORE_NAME, schedule);
               });
               _context5.next = 10;
               return Promise.all(savePromises);