@pisell/pisellos 2.2.275 → 2.2.276

package/dist/server/index.d.ts

@@ -253,6 +253,11 @@ declare class Server {
      * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
      */
     private recomputeAndNotifySubscriber;
+    /**
+     * 根据餐牌 ID 获取其绑定日程中的全部时间点。
+     * 商品查询定时器与 schedule-time-points 路由共用此逻辑。
+     */
+    private getMenuScheduleTimePoints;
     /**
      * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
      */

package/dist/server/index.js

@@ -33,6 +33,7 @@ import { FloorPlanModule } from "./modules/floor-plan";
 import { FloorPlanHooks } from "./modules/floor-plan/types";
 import { PaymentServerModule } from "./modules/payment";
 import { extractScheduleIdsFromMenus, extractTimePointsFromSchedules } from "./utils/schedule";
+import { sortTimePoints } from "./utils/time";
 import { ProductsHooks } from "./modules/products/types";
 import { perfMark } from "./utils/product";
 import { OrderModule } from "./modules/order";
@@ -329,7 +330,11 @@ var Server = /*#__PURE__*/function () {
             case 8:
               result = _context3.sent;
               if (subscriberId && typeof callback === 'function') {
-                _this.syncProductQueryScheduleTimers(subscriberId, strategy_context);
+                _this.syncProductQueryScheduleTimers({
+                  subscriberId: subscriberId,
+                  menu_list_ids: menu_list_ids,
+                  strategy_context: strategy_context
+                });
               }
               return _context3.abrupt("return", result);
             case 11:
@@ -1672,7 +1677,7 @@ var Server = /*#__PURE__*/function () {
     _defineProperty(this, "handleGetScheduleTimePoints", /*#__PURE__*/function () {
       var _ref59 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(_ref58) {
         var _menu_list_ids$length;
-        var url, method, data, config, menu_list_ids, _menu_list_ids$length2, menuList, scheduleIds, scheduleList, timePoints, errorMessage;
+        var url, method, data, config, menu_list_ids, _menu_list_ids$length2, _this$getMenuSchedule, menuList, scheduleIds, scheduleList, timePoints, errorMessage;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
@@ -1728,8 +1733,7 @@ var Server = /*#__PURE__*/function () {
               });
             case 16:
               _context24.prev = 16;
-              // 1. 获取餐牌列表
-              menuList = _this.menu.getMenuByIds(menu_list_ids);
+              _this$getMenuSchedule = _this.getMenuScheduleTimePoints(menu_list_ids), menuList = _this$getMenuSchedule.menuList, scheduleIds = _this$getMenuSchedule.scheduleIds, scheduleList = _this$getMenuSchedule.scheduleList, timePoints = _this$getMenuSchedule.timePoints;
               console.log("[Server] \u627E\u5230 ".concat(menuList.length, " \u4E2A\u9910\u724C"));
               _this.logInfo('handleGetScheduleTimePoints: 获取到餐牌列表', {
                 requestedCount: menu_list_ids.length,
@@ -1737,15 +1741,12 @@ var Server = /*#__PURE__*/function () {
                 menu_list_ids: menu_list_ids,
                 menuList: menuList
               });
-
-              // 2. 提取所有的 schedule IDs
-              scheduleIds = extractScheduleIdsFromMenus(menuList);
               console.log("[Server] \u63D0\u53D6\u5230 ".concat(scheduleIds.length, " \u4E2A\u65E5\u7A0BID:"), scheduleIds);
               _this.logInfo('handleGetScheduleTimePoints: 提取到日程 IDs', {
                 scheduleCount: scheduleIds.length
               });
               if (!(scheduleIds.length === 0)) {
-                _context24.next = 26;
+                _context24.next = 25;
                 break;
               }
               _this.logInfo('handleGetScheduleTimePoints: 没有找到相关日程', {
@@ -1757,17 +1758,12 @@ var Server = /*#__PURE__*/function () {
                 data: [],
                 status: true
               });
-            case 26:
-              // 3. 获取日程详情
-              scheduleList = _this.schedule.getScheduleByIds(scheduleIds);
+            case 25:
               console.log("[Server] \u627E\u5230 ".concat(scheduleList.length, " \u4E2A\u65E5\u7A0B"));
               _this.logInfo('handleGetScheduleTimePoints: 获取到日程详情', {
                 requestedCount: scheduleIds.length,
                 foundCount: scheduleList.length
               });
-
-              // 4. 提取时间点
-              timePoints = extractTimePointsFromSchedules(scheduleList);
               console.log("[Server] \u63D0\u53D6\u5230 ".concat(timePoints.length, " \u4E2A\u65F6\u95F4\u70B9:"), timePoints);
               _this.logInfo('handleGetScheduleTimePoints 处理完成', {
                 menuListIdsCount: menu_list_ids.length,
@@ -1781,8 +1777,8 @@ var Server = /*#__PURE__*/function () {
                 data: timePoints,
                 status: true
               });
-            case 35:
-              _context24.prev = 35;
+            case 32:
+              _context24.prev = 32;
               _context24.t0 = _context24["catch"](16);
               errorMessage = _context24.t0 instanceof Error ? _context24.t0.message : '未知错误';
               console.error('[Server] 获取日程时间点失败:', _context24.t0);
@@ -1796,11 +1792,11 @@ var Server = /*#__PURE__*/function () {
                 data: [],
                 status: false
               });
-            case 41:
+            case 38:
             case "end":
               return _context24.stop();
           }
-        }, _callee24, null, [[16, 35]]);
+        }, _callee24, null, [[16, 32]]);
       }));
       return function (_x24) {
         return _ref59.apply(this, arguments);
@@ -3622,18 +3618,48 @@ var Server = /*#__PURE__*/function () {
       return recomputeAndNotifySubscriber;
     }()
     /**
-     * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
+     * 根据餐牌 ID 获取其绑定日程中的全部时间点。
+     * 商品查询定时器与 schedule-time-points 路由共用此逻辑。
      */
     )
+  }, {
+    key: "getMenuScheduleTimePoints",
+    value: function getMenuScheduleTimePoints(menuListIds) {
+      var _this$menu$getMenuByI, _this$menu, _this$schedule$getSch, _this$schedule;
+      var menuList = (_this$menu$getMenuByI = (_this$menu = this.menu) === null || _this$menu === void 0 ? void 0 : _this$menu.getMenuByIds(menuListIds)) !== null && _this$menu$getMenuByI !== void 0 ? _this$menu$getMenuByI : [];
+      var scheduleIds = extractScheduleIdsFromMenus(menuList);
+      var scheduleList = scheduleIds.length > 0 ? (_this$schedule$getSch = (_this$schedule = this.schedule) === null || _this$schedule === void 0 ? void 0 : _this$schedule.getScheduleByIds(scheduleIds)) !== null && _this$schedule$getSch !== void 0 ? _this$schedule$getSch : [] : [];
+      var timePoints = extractTimePointsFromSchedules(scheduleList);
+      return {
+        menuList: menuList,
+        scheduleIds: scheduleIds,
+        scheduleList: scheduleList,
+        timePoints: timePoints
+      };
+    }
+
+    /**
+     * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
+     */
   }, {
     key: "syncProductQueryScheduleTimers",
-    value: function syncProductQueryScheduleTimers(subscriberId, strategy_context) {
+    value: function syncProductQueryScheduleTimers(_ref61) {
       var _this$products$getLas3, _this$products2, _this$products2$getLa;
+      var subscriberId = _ref61.subscriberId,
+        menu_list_ids = _ref61.menu_list_ids,
+        strategy_context = _ref61.strategy_context;
       this.clearSubscriberScheduleTimers(subscriberId);
       if (!this.shouldScheduleProductQueryReload(strategy_context)) {
         return;
       }
-      var timePoints = (_this$products$getLas3 = (_this$products2 = this.products) === null || _this$products2 === void 0 || (_this$products2$getLa = _this$products2.getLastScheduleTimePoints) === null || _this$products2$getLa === void 0 ? void 0 : _this$products2$getLa.call(_this$products2)) !== null && _this$products$getLas3 !== void 0 ? _this$products$getLas3 : [];
+      var productTimePoints = (_this$products$getLas3 = (_this$products2 = this.products) === null || _this$products2 === void 0 || (_this$products2$getLa = _this$products2.getLastScheduleTimePoints) === null || _this$products2$getLa === void 0 ? void 0 : _this$products2$getLa.call(_this$products2)) !== null && _this$products$getLas3 !== void 0 ? _this$products$getLas3 : [];
+      var menuListIds = Array.isArray(menu_list_ids) ? Array.from(new Set(menu_list_ids.map(function (id) {
+        return Number(id);
+      }).filter(function (id) {
+        return Number.isFinite(id);
+      }))) : [];
+      var menuTimePoints = this.getMenuScheduleTimePoints(menuListIds).timePoints;
+      var timePoints = sortTimePoints(Array.from(new Set([].concat(_toConsumableArray(productTimePoints), _toConsumableArray(menuTimePoints)))));
       if (timePoints.length > 0) {
         this.scheduleSubscriberTimePointReloads(subscriberId, timePoints);
       }
@@ -3650,7 +3676,7 @@ var Server = /*#__PURE__*/function () {
      */
     function () {
       var _handleSalesSearchRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(kind, backendPath, data, config) {
-        var queryPayload, result, _ref61, callback, subscriberId, resetVisibleOrderIds, contextSignature, existing, shouldReset, visibleOrderIds, _iterator6, _step6, orderId;
+        var queryPayload, result, _ref62, callback, subscriberId, resetVisibleOrderIds, contextSignature, existing, shouldReset, visibleOrderIds, _iterator6, _step6, orderId;
         return _regeneratorRuntime().wrap(function _callee43$(_context43) {
           while (1) switch (_context43.prev = _context43.next) {
             case 0:
@@ -3659,7 +3685,7 @@ var Server = /*#__PURE__*/function () {
               return this.fetchSalesSearchFromAPI(backendPath, queryPayload);
             case 3:
               result = _context43.sent;
-              _ref61 = config || {}, callback = _ref61.callback, subscriberId = _ref61.subscriberId, resetVisibleOrderIds = _ref61.resetVisibleOrderIds;
+              _ref62 = config || {}, callback = _ref62.callback, subscriberId = _ref62.subscriberId, resetVisibleOrderIds = _ref62.resetVisibleOrderIds;
               if (subscriberId && typeof callback === 'function') {
                 contextSignature = this.buildSalesSearchSignature(kind, queryPayload);
                 existing = this.salesSearchSubscribers.get(subscriberId);
@@ -6123,10 +6149,10 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "shouldBuildSmallTicketData",
     value: function shouldBuildSmallTicketData(order) {
-      var _ref63, _order$small_ticket_d;
+      var _ref64, _order$small_ticket_d;
       if (!order || _typeof(order) !== 'object') return false;
       // if (hasSmallTicketData(order.payment_info?.small_ticket_data)) return false;
-      return Number((_ref63 = (_order$small_ticket_d = order.small_ticket_data_flag) !== null && _order$small_ticket_d !== void 0 ? _order$small_ticket_d : order.smallTicketDataFlag) !== null && _ref63 !== void 0 ? _ref63 : 0) === 1;
+      return Number((_ref64 = (_order$small_ticket_d = order.small_ticket_data_flag) !== null && _order$small_ticket_d !== void 0 ? _order$small_ticket_d : order.smallTicketDataFlag) !== null && _ref64 !== void 0 ? _ref64 : 0) === 1;
     }
   }, {
     key: "shouldPrintSyncedOrder",
@@ -6144,7 +6170,7 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "isSalesOrderFullyPaid",
     value: function isSalesOrderFullyPaid(order) {
-      var _order$summary$amount, _order$summary, _ref64, _ref65, _order$summary$expect, _order$summary2, _order$summary3;
+      var _order$summary$amount, _order$summary, _ref65, _ref66, _order$summary$expect, _order$summary2, _order$summary3;
       if (!order || _typeof(order) !== 'object') return false;
       var paymentStatus = String(order.payment_status || '').toLowerCase();
       if (paymentStatus === 'paid' || paymentStatus === 'finished') return true;
@@ -6156,7 +6182,7 @@ var Server = /*#__PURE__*/function () {
         return this.toAmountNumber(amountGap) <= 0;
       }
       var paidAmount = this.sumPaidOrderPayments(order.payments);
-      var targetAmount = this.toAmountNumber((_ref64 = (_ref65 = (_order$summary$expect = (_order$summary2 = order.summary) === null || _order$summary2 === void 0 ? void 0 : _order$summary2.expect_amount) !== null && _order$summary$expect !== void 0 ? _order$summary$expect : (_order$summary3 = order.summary) === null || _order$summary3 === void 0 ? void 0 : _order$summary3.total_amount) !== null && _ref65 !== void 0 ? _ref65 : order.expect_amount) !== null && _ref64 !== void 0 ? _ref64 : order.total_amount);
+      var targetAmount = this.toAmountNumber((_ref65 = (_ref66 = (_order$summary$expect = (_order$summary2 = order.summary) === null || _order$summary2 === void 0 ? void 0 : _order$summary2.expect_amount) !== null && _order$summary$expect !== void 0 ? _order$summary$expect : (_order$summary3 = order.summary) === null || _order$summary3 === void 0 ? void 0 : _order$summary3.total_amount) !== null && _ref66 !== void 0 ? _ref66 : order.expect_amount) !== null && _ref65 !== void 0 ? _ref65 : order.total_amount);
       if (targetAmount <= 0) return paidAmount > 0;
       return paidAmount >= targetAmount;
     }
@@ -6200,8 +6226,8 @@ var Server = /*#__PURE__*/function () {
                 }
                 if (Array.isArray(product === null || product === void 0 ? void 0 : product.product_bundle)) {
                   product.product_bundle.forEach(function (bundle) {
-                    var _ref66, _bundle$bundle_produc;
-                    var bundleProductId = (_ref66 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref66 !== void 0 ? _ref66 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id;
+                    var _ref67, _bundle$bundle_produc;
+                    var bundleProductId = (_ref67 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref67 !== void 0 ? _ref67 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id;
                     if (bundleProductId !== undefined && bundleProductId !== null && bundleProductId !== '') {
                       productIdSet.add(bundleProductId);
                     }
@@ -6217,7 +6243,7 @@ var Server = /*#__PURE__*/function () {
             case 6:
               _context64.next = 8;
               return Promise.all(productIds.map( /*#__PURE__*/function () {
-                var _ref67 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee63(id) {
+                var _ref68 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee63(id) {
                   var _this14$products, _this14$products$getP, product;
                   return _regeneratorRuntime().wrap(function _callee63$(_context63) {
                     while (1) switch (_context63.prev = _context63.next) {
@@ -6243,7 +6269,7 @@ var Server = /*#__PURE__*/function () {
                   }, _callee63, null, [[0, 7]]);
                 }));
                 return function (_x72) {
-                  return _ref67.apply(this, arguments);
+                  return _ref68.apply(this, arguments);
                 };
               }()));
             case 8:
@@ -6282,8 +6308,8 @@ var Server = /*#__PURE__*/function () {
         addProductId((_product$product_id2 = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id2 !== void 0 ? _product$product_id2 : product === null || product === void 0 ? void 0 : product.id);
         if (Array.isArray(product === null || product === void 0 ? void 0 : product.product_bundle)) {
           product.product_bundle.forEach(function (bundle) {
-            var _ref68, _bundle$bundle_produc2;
-            addProductId((_ref68 = (_bundle$bundle_produc2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref68 !== void 0 ? _ref68 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id);
+            var _ref69, _bundle$bundle_produc2;
+            addProductId((_ref69 = (_bundle$bundle_produc2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref69 !== void 0 ? _ref69 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id);
           });
         }
       });
@@ -6359,9 +6385,9 @@ var Server = /*#__PURE__*/function () {
       if (!Array.isArray(product === null || product === void 0 ? void 0 : product.product_bundle)) return product;
       var hasChanged = false;
       var productBundle = product.product_bundle.map(function (bundle) {
-        var _ref69, _bundle$bundle_produc3;
+        var _ref70, _bundle$bundle_produc3;
         if (!bundle || _typeof(bundle) !== 'object') return bundle;
-        var rawProductId = (_ref69 = (_bundle$bundle_produc3 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref69 !== void 0 ? _ref69 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id;
+        var rawProductId = (_ref70 = (_bundle$bundle_produc3 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref70 !== void 0 ? _ref70 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id;
         if (rawProductId === undefined || rawProductId === null || rawProductId === '') return bundle;
         var productId = Number(rawProductId);
         if (!Number.isFinite(productId)) return bundle;
@@ -6485,7 +6511,7 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "resolveProductTitleValue",
     value: function resolveProductTitleValue(value, key, currentLocale) {
-      var _ref70, _ref71, _value$key;
+      var _ref71, _ref72, _value$key;
       if (value === undefined || value === null || value === '') return null;
       if (_typeof(value) !== 'object') {
         var title = String(value);
@@ -6495,7 +6521,7 @@ var Server = /*#__PURE__*/function () {
       }
       var normalizedKey = key.replace('-', '_');
       var dashedKey = key.replace('_', '-');
-      var rawValue = (_ref70 = (_ref71 = (_value$key = value[key]) !== null && _value$key !== void 0 ? _value$key : value[normalizedKey]) !== null && _ref71 !== void 0 ? _ref71 : value[dashedKey]) !== null && _ref70 !== void 0 ? _ref70 : key === 'auto' ? value.default : undefined;
+      var rawValue = (_ref71 = (_ref72 = (_value$key = value[key]) !== null && _value$key !== void 0 ? _value$key : value[normalizedKey]) !== null && _ref72 !== void 0 ? _ref72 : value[dashedKey]) !== null && _ref71 !== void 0 ? _ref71 : key === 'auto' ? value.default : undefined;
       if (rawValue === undefined || rawValue === null || rawValue === '') return null;
       if (_typeof(rawValue) === 'object') return this.resolveFirstProductTitleValue(rawValue);
       return String(rawValue);
@@ -7844,14 +7870,14 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "buildProductFormatterContext",
     value: function buildProductFormatterContext(context) {
-      var _this$menu, _this$menu$getMenuLis, _scheduleModule$getSc, _this$core$context5;
+      var _this$menu2, _this$menu2$getMenuLi, _scheduleModule$getSc, _this$core$context5;
       var scheduleModule = this.getSchedule();
       return {
         scheduleModule: scheduleModule,
         schedule_datetime: context.schedule_datetime,
         customer_id: context.customer_id,
         strategy_context: context.strategy_context,
-        menuList: ((_this$menu = this.menu) === null || _this$menu === void 0 || (_this$menu$getMenuLis = _this$menu.getMenuList) === null || _this$menu$getMenuLis === void 0 ? void 0 : _this$menu$getMenuLis.call(_this$menu)) || [],
+        menuList: ((_this$menu2 = this.menu) === null || _this$menu2 === void 0 || (_this$menu2$getMenuLi = _this$menu2.getMenuList) === null || _this$menu2$getMenuLi === void 0 ? void 0 : _this$menu2$getMenuLi.call(_this$menu2)) || [],
         scheduleList: (scheduleModule === null || scheduleModule === void 0 || (_scheduleModule$getSc = scheduleModule.getScheduleList) === null || _scheduleModule$getSc === void 0 ? void 0 : _scheduleModule$getSc.call(scheduleModule)) || [],
         dataVariantEvaluator: (_this$core$context5 = this.core.context) === null || _this$core$context5 === void 0 ? void 0 : _this$core$context5.dataVariantEvaluator
       };

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -193,7 +193,7 @@ export function transformBaseProductToOrderProduct(params) {
   }
   // 从源头补充商品多语言标题
   var productTitle = _objectSpread(_objectSpread({}, (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title_i18n) || {}), {}, {
-    original: (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
+    original: (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.original_title) || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
   });
   return {
     product_id: productId,

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 6 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -326,7 +326,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/BookingTicket/index.js

@@ -2620,10 +2620,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 _context30.next = 11;
                 break;
               }
-              return _context30.abrupt("return", this.store.order.addProductsToOrder(orderLines, {
-                skipEditDiscountConfigRefresh: true,
-                skipDiscountRecalculation: true
-              }));
+              return _context30.abrupt("return", this.store.order.addProductsToOrder(orderLines));
             case 11:
               result = [];
               _iterator2 = _createForOfIteratorHelper(orderLines);

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,51 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  ITEM_REWARD_STRATEGY: () => import_examples.ITEM_REWARD_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  ITEM_REWARD_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/modules/Order/index.js

@@ -133,7 +133,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.draftPersistEnabled = true;
   }
   collectHydratedEditDiscounts(products) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     const discountMap = /* @__PURE__ */ new Map();
     for (const product of (0, import_bundleDiscountHydration.expandHydratedProductsForDiscountCollection)(products)) {
       for (const item of (product == null ? void 0 : product.discount_list) || []) {
@@ -148,16 +148,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         const key = Number.isFinite(id) ? id : String(resourceId);
         const title = ((_b = item == null ? void 0 : item.discount) == null ? void 0 : _b.title) ?? {};
         const amount = Number((item == null ? void 0 : item.amount) || 0);
+        const discountCardType = (_c = item == null ? void 0 : item.discount) == null ? void 0 : _c.discount_card_type;
+        const parValue = isDiscountCard ? discountCardType === "fixed_amount" ? ((_d = item == null ? void 0 : item.discount) == null ? void 0 : _d.fixed_amount) ?? (item == null ? void 0 : item.amount) : (_e = item == null ? void 0 : item.discount) == null ? void 0 : _e.percent : "0";
         const detail = {
           amount: String((item == null ? void 0 : item.amount) ?? "0"),
           type,
           resource_id: key,
           title,
-          original_amount: String(((_c = item == null ? void 0 : item.discount) == null ? void 0 : _c.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
-          num: Number(((_d = item == null ? void 0 : item.metadata) == null ? void 0 : _d.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1,
+          original_amount: String(((_f = item == null ? void 0 : item.discount) == null ? void 0 : _f.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
+          num: Number(((_g = item == null ? void 0 : item.metadata) == null ? void 0 : _g.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1,
           metadata: item == null ? void 0 : item.metadata,
           discount: item == null ? void 0 : item.discount,
-          _num: Number(((_e = item == null ? void 0 : item.metadata) == null ? void 0 : _e.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1
+          _num: Number(((_h = item == null ? void 0 : item.metadata) == null ? void 0 : _h.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1
         };
         const existed = discountMap.get(key);
         if (existed) {
@@ -166,7 +168,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           if (!isDiscountCard) {
             existed.balance = String(Number(existed.balance || 0) + amount);
           }
-          const productIds = Array.isArray((_f = existed.limited_relation_product_data) == null ? void 0 : _f.product_ids) ? existed.limited_relation_product_data.product_ids : [];
+          const productIds = Array.isArray((_i = existed.limited_relation_product_data) == null ? void 0 : _i.product_ids) ? existed.limited_relation_product_data.product_ids : [];
           if ((product == null ? void 0 : product.product_id) !== void 0 && (product == null ? void 0 : product.product_id) !== null && !productIds.includes(product.product_id)) {
             existed.limited_relation_product_data = {
               ...existed.limited_relation_product_data || {},
@@ -189,9 +191,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           encoded: "",
           code: "",
           tag: type,
-          product_id: ((_g = item == null ? void 0 : item.discount) == null ? void 0 : _g.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
+          product_id: ((_j = item == null ? void 0 : item.discount) == null ? void 0 : _j.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
           relation_type: "",
-          par_value: String(((_h = item == null ? void 0 : item.discount) == null ? void 0 : _h.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
+          par_value: String(parValue ?? "0"),
           used_par_value: String((item == null ? void 0 : item.amount) ?? "0"),
           limit_status: "enable",
           limited_relation_product_data: {
@@ -221,8 +223,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           discount: {
             ...(item == null ? void 0 : item.discount) || {},
             resource_id: key,
-            discount_product_id: ((_i = item == null ? void 0 : item.discount) == null ? void 0 : _i.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
-            discount_calculation_mode: ((_j = item == null ? void 0 : item.discount) == null ? void 0 : _j.discount_calculation_mode) ?? "item_level"
+            discount_product_id: ((_k = item == null ? void 0 : item.discount) == null ? void 0 : _k.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
+            discount_calculation_mode: ((_l = item == null ? void 0 : item.discount) == null ? void 0 : _l.discount_calculation_mode) ?? "item_level"
           },
           applicableProductDetails: [detail],
           appliedProductDetails: [detail]
@@ -274,7 +276,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         const isPersistedBundleProduct = isPersistedProduct || Boolean(
           (bundle == null ? void 0 : bundle.order_detail_id) || (bundle == null ? void 0 : bundle.orderDetailId) || (bundle == null ? void 0 : bundle.booking_id)
         );
-        const bundleQty = new import_decimal.default(Number(qty) || 1).times(Number((bundle == null ? void 0 : bundle.num) ?? (bundle == null ? void 0 : bundle.quantity) ?? 1) || 1).toNumber();
+        const bundleQty = Number(qty) || 1;
         for (const pd of (bundle == null ? void 0 : bundle.discount_list) || []) {
           addProductDiscountAmount(pd, bundleQty, isPersistedBundleProduct);
         }

package/lib/server/index.d.ts

@@ -253,6 +253,11 @@ declare class Server {
      * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
      */
     private recomputeAndNotifySubscriber;
+    /**
+     * 根据餐牌 ID 获取其绑定日程中的全部时间点。
+     * 商品查询定时器与 schedule-time-points 路由共用此逻辑。
+     */
+    private getMenuScheduleTimePoints;
     /**
      * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
      */

package/lib/server/index.js

@@ -45,6 +45,7 @@ var import_floor_plan = require("./modules/floor-plan");
 var import_types = require("./modules/floor-plan/types");
 var import_payment = require("./modules/payment");
 var import_schedule2 = require("./utils/schedule");
+var import_time = require("./utils/time");
 var import_types2 = require("./modules/products/types");
 var import_product = require("./utils/product");
 var import_order = require("./modules/order");
@@ -247,7 +248,11 @@ var Server = class {
         strategy_context
       });
       if (subscriberId && typeof callback === "function") {
-        this.syncProductQueryScheduleTimers(subscriberId, strategy_context);
+        this.syncProductQueryScheduleTimers({
+          subscriberId,
+          menu_list_ids,
+          strategy_context
+        });
       }
       return result;
     };
@@ -1074,7 +1079,12 @@ var Server = class {
         };
       }
       try {
-        const menuList = this.menu.getMenuByIds(menu_list_ids);
+        const {
+          menuList,
+          scheduleIds,
+          scheduleList,
+          timePoints
+        } = this.getMenuScheduleTimePoints(menu_list_ids);
         console.log(`[Server] 找到 ${menuList.length} 个餐牌`);
         this.logInfo("handleGetScheduleTimePoints: 获取到餐牌列表", {
           requestedCount: menu_list_ids.length,
@@ -1082,7 +1092,6 @@ var Server = class {
           menu_list_ids,
           menuList
         });
-        const scheduleIds = (0, import_schedule2.extractScheduleIdsFromMenus)(menuList);
         console.log(`[Server] 提取到 ${scheduleIds.length} 个日程ID:`, scheduleIds);
         this.logInfo("handleGetScheduleTimePoints: 提取到日程 IDs", {
           scheduleCount: scheduleIds.length
@@ -1096,13 +1105,11 @@ var Server = class {
             status: true
           };
         }
-        const scheduleList = this.schedule.getScheduleByIds(scheduleIds);
         console.log(`[Server] 找到 ${scheduleList.length} 个日程`);
         this.logInfo("handleGetScheduleTimePoints: 获取到日程详情", {
           requestedCount: scheduleIds.length,
           foundCount: scheduleList.length
         });
-        const timePoints = (0, import_schedule2.extractTimePointsFromSchedules)(scheduleList);
         console.log(`[Server] 提取到 ${timePoints.length} 个时间点:`, timePoints);
         this.logInfo("handleGetScheduleTimePoints 处理完成", {
           menuListIdsCount: menu_list_ids.length,
@@ -2264,16 +2271,44 @@ var Server = class {
       });
     }
   }
+  /**
+   * 根据餐牌 ID 获取其绑定日程中的全部时间点。
+   * 商品查询定时器与 schedule-time-points 路由共用此逻辑。
+   */
+  getMenuScheduleTimePoints(menuListIds) {
+    var _a, _b;
+    const menuList = ((_a = this.menu) == null ? void 0 : _a.getMenuByIds(menuListIds)) ?? [];
+    const scheduleIds = (0, import_schedule2.extractScheduleIdsFromMenus)(menuList);
+    const scheduleList = scheduleIds.length > 0 ? ((_b = this.schedule) == null ? void 0 : _b.getScheduleByIds(scheduleIds)) ?? [] : [];
+    const timePoints = (0, import_schedule2.extractTimePointsFromSchedules)(scheduleList);
+    return {
+      menuList,
+      scheduleIds,
+      scheduleList,
+      timePoints
+    };
+  }
   /**
    * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
    */
-  syncProductQueryScheduleTimers(subscriberId, strategy_context) {
+  syncProductQueryScheduleTimers({
+    subscriberId,
+    menu_list_ids,
+    strategy_context
+  }) {
     var _a, _b;
     this.clearSubscriberScheduleTimers(subscriberId);
     if (!this.shouldScheduleProductQueryReload(strategy_context)) {
       return;
     }
-    const timePoints = ((_b = (_a = this.products) == null ? void 0 : _a.getLastScheduleTimePoints) == null ? void 0 : _b.call(_a)) ?? [];
+    const productTimePoints = ((_b = (_a = this.products) == null ? void 0 : _a.getLastScheduleTimePoints) == null ? void 0 : _b.call(_a)) ?? [];
+    const menuListIds = Array.isArray(menu_list_ids) ? Array.from(new Set(
+      menu_list_ids.map((id) => Number(id)).filter((id) => Number.isFinite(id))
+    )) : [];
+    const menuTimePoints = this.getMenuScheduleTimePoints(menuListIds).timePoints;
+    const timePoints = (0, import_time.sortTimePoints)(
+      Array.from(/* @__PURE__ */ new Set([...productTimePoints, ...menuTimePoints]))
+    );
     if (timePoints.length > 0) {
       this.scheduleSubscriberTimePointReloads(subscriberId, timePoints);
     }

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -217,7 +217,7 @@ function transformBaseProductToOrderProduct(params) {
   }
   const productTitle = {
     ...(sourceProduct == null ? void 0 : sourceProduct.title_i18n) || {},
-    original: (sourceProduct == null ? void 0 : sourceProduct.title) || ""
+    original: (sourceProduct == null ? void 0 : sourceProduct.original_title) || (sourceProduct == null ? void 0 : sourceProduct.title) || ""
   };
   return {
     product_id: productId,

package/lib/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 6 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/BookingTicket/index.js

@@ -1568,10 +1568,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       });
     }
     if (typeof this.store.order.addProductsToOrder === "function") {
-      return this.store.order.addProductsToOrder(orderLines, {
-        skipEditDiscountConfigRefresh: true,
-        skipDiscountRecalculation: true
-      });
+      return this.store.order.addProductsToOrder(orderLines);
     }
     const result = [];
     for (const line of orderLines) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.275",
+  "version": "2.2.276",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",