@pisell/pisellos 2.2.250 → 2.2.252

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

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

package/dist/modules/Order/index.js

@@ -1369,15 +1369,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (normalizedStatus !== 'refunded' && normalizedStatus !== 'partially_refunded') {
         return false;
       }
-      if (params.refundAmount.lte(0)) return false;
+      if (normalizedStatus === 'refunded' && params.paymentTotal.gt(0) && params.refundAmount.gte(params.paymentTotal)) {
+        return true;
+      }
       if (params.previousSummary) {
         var previousTargetAmount = this.calculatePaymentTargetAmount(params.tempOrder, params.previousSummary, params.netPaymentTotal);
         if (!previousTargetAmount.eq(params.targetAmount)) return false;
       }
-      if (normalizedStatus === 'refunded') {
-        return params.refundAmount.gte(params.paymentTotal);
-      }
-      return params.netPaymentTotal.gte(params.targetAmount);
+      return true;
     }
   }, {
     key: "resolveWalletPassUseValue",
@@ -3418,45 +3417,46 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              debugger;
               if (!booking) {
-                _context19.next = 18;
+                _context19.next = 19;
                 break;
               }
               productRecord = product;
               splitCount = getSafeProductNum((_ref60 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref60 !== void 0 ? _ref60 : 1);
               if (!(splitCount > 1)) {
-                _context19.next = 18;
+                _context19.next = 19;
                 break;
               }
               i = 0;
-            case 6:
+            case 7:
               if (!(i < splitCount)) {
-                _context19.next = 15;
+                _context19.next = 16;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _context19.next = 12;
+              _context19.next = 13;
               return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
-            case 12:
+            case 13:
               i += 1;
-              _context19.next = 6;
+              _context19.next = 7;
               break;
-            case 15:
-              _context19.next = 17;
+            case 16:
+              _context19.next = 18;
               return this.finalizeProductOrderMutation(tempOrder);
-            case 17:
-              return _context19.abrupt("return", tempOrder.products);
             case 18:
-              _context19.next = 20;
+              return _context19.abrupt("return", tempOrder.products);
+            case 19:
+              _context19.next = 21;
               return this.appendProductLineToTempOrder(tempOrder, product, booking);
-            case 20:
-              _context19.next = 22;
+            case 21:
+              _context19.next = 23;
               return this.finalizeProductOrderMutation(tempOrder);
-            case 22:
-              return _context19.abrupt("return", tempOrder.products);
             case 23:
+              return _context19.abrupt("return", tempOrder.products);
+            case 24:
             case "end":
               return _context19.stop();
           }
@@ -5068,6 +5068,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function normalizeTempOrderForRuntime(raw, options) {
       var _this24 = this;
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), raw || {});
+      // ES 列表详情使用 id 表示订单主键；OS 详情态统一依赖 order_id 驱动操作按钮。
+      if ((nextTempOrder.order_id === undefined || nextTempOrder.order_id === null) && (raw === null || raw === void 0 ? void 0 : raw.id) !== undefined && (raw === null || raw === void 0 ? void 0 : raw.id) !== null) {
+        nextTempOrder.order_id = raw.id;
+      }
       delete nextTempOrder.summary;
       delete nextTempOrder.lastOrderInfo;
       delete nextTempOrder.discount_list;

package/dist/modules/Order/types.d.ts

@@ -518,6 +518,11 @@ export interface LoadSalesDetailParams {
     orderNumber?: string;
     externalSaleNumber?: string;
     external_sale_number?: string;
+    /**
+     * 已由调用方查询到的销售详情记录。
+     * 存在时 loadSalesDetail 会跳过远端 lookup，直接复用 hydrate 后半段逻辑。
+     */
+    preloadedSalesDetail?: Record<string, any>;
     forceRemote?: boolean;
     merge?: boolean;
 }

package/dist/server/index.d.ts

@@ -9,6 +9,20 @@ import { PisellCore, ServerModuleConfig, InitializeServerOptions } from '../type
 import type { RouteHandler, HttpMethod, RouteDefinition, Router, ModuleRegistryConfig, RequestSetting } from './types';
 import { OrderModule } from './modules/order';
 export type { RouteHandler, HttpMethod, RouteDefinition, Router, ModuleRegistryConfig, };
+/** Server 运行时诊断快照，用于排查订阅者是否持续增长。 */
+export interface ServerDiagnosticsSnapshot {
+    subscribers: {
+        productQuerySubscribers: number;
+        orderQuerySubscribers: number;
+        bookingQuerySubscribers: number;
+        bookingRemoteQuerySubscribers: number;
+        salesSearchSubscribers: number;
+        floorPlanQuerySubscribers: number;
+    };
+    caches: {
+        bookingRemoteCache: number;
+    };
+}
 /**
  * Server 类
  * 用于注册和管理服务端模块
@@ -44,6 +58,13 @@ declare class Server {
     private floorPlanQuerySubscribers;
     private moduleRegistry;
     constructor(core: PisellCore);
+    /**
+     * 获取 Server 内部订阅者和缓存数量快照。
+     *
+     * @example
+     * const snapshot = pisellos.server?.getDiagnosticsSnapshot?.();
+     */
+    getDiagnosticsSnapshot(): ServerDiagnosticsSnapshot;
     /**
      * 注册路由
      * @param routes 路由定义数组

package/dist/server/index.js

@@ -49,6 +49,8 @@ import { buildSmallTicketData, hasSmallTicketData } from "./utils/small-ticket";
 
 /** 非当天（远端）预约查询订阅者 */
 
+/** Server 运行时诊断快照，用于排查订阅者是否持续增长。 */
+
 /** 平面图 GET 查询订阅者（列表 / id 详情 / code 详情） */
 
 var PRODUCT_TITLE_SNAPSHOT_KEYS = ['en', 'ja', 'pt', 'auto', 'zh-CN', 'zh-HK', 'kitchen', 'original'];
@@ -1236,7 +1238,7 @@ var Server = /*#__PURE__*/function () {
               url = _ref44.url, data = _ref44.data, config = _ref44.config, routePath = _ref44.path;
               base = '/shop/schedule/floor-plan';
               path = _this.parseRequestPath(url, routePath);
-              if (!(path === "".concat(base, "/unsubscribe"))) {
+              if (!(path === "".concat(base, "/unsubscribe") || path === "".concat(base, "/code/unsubscribe"))) {
                 _context18.next = 7;
                 break;
               }
@@ -1477,10 +1479,34 @@ var Server = /*#__PURE__*/function () {
   }
 
   /**
-   * 注册路由
-   * @param routes 路由定义数组
+   * 获取 Server 内部订阅者和缓存数量快照。
+   *
+   * @example
+   * const snapshot = pisellos.server?.getDiagnosticsSnapshot?.();
    */
   _createClass(Server, [{
+    key: "getDiagnosticsSnapshot",
+    value: function getDiagnosticsSnapshot() {
+      return {
+        subscribers: {
+          productQuerySubscribers: this.productQuerySubscribers.size,
+          orderQuerySubscribers: this.orderQuerySubscribers.size,
+          bookingQuerySubscribers: this.bookingQuerySubscribers.size,
+          bookingRemoteQuerySubscribers: this.bookingRemoteQuerySubscribers.size,
+          salesSearchSubscribers: this.salesSearchSubscribers.size,
+          floorPlanQuerySubscribers: this.floorPlanQuerySubscribers.size
+        },
+        caches: {
+          bookingRemoteCache: this.bookingRemoteCache.size
+        }
+      };
+    }
+
+    /**
+     * 注册路由
+     * @param routes 路由定义数组
+     */
+  }, {
     key: "registerRoutes",
     value: function registerRoutes(routes) {
       var _this2 = this;

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

@@ -2037,7 +2037,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var secondary = preferred === existing ? incoming : existing;
       var merged = _objectSpread(_objectSpread({}, secondary), preferred);
       var fieldsToPreserve = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
-      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'shop_discount', 'summary', 'products', 'bookings'];
+      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'shop_discount', 'summary', 'products', 'bookings', 'note', 'customer_id', 'customer_name', 'customer', 'holder', 'contacts_info', 'phone', 'email', 'relation_forms'];
       var mergedRecord = merged;
       var preferredRecord = preferred;
       var secondaryRecord = secondary;

package/dist/server/modules/order/types.d.ts

@@ -458,7 +458,10 @@ export interface OrderFilters {
  * 预约展开列表筛选条件（订单级条件匹配 booking.order.*，预约级匹配 booking 自身）
  */
 export interface BookingFilters {
+    /** RecordBoard 通用搜索字段（单数），用于本地预约过滤 */
     keyword?: string;
+    /** `/shop/schedule/booking` 后端协议搜索字段（复数），OS Server 需兼容 */
+    keywords?: string;
     order_by?: string;
     order_payment_status?: string[];
     order_status?: string[];

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

@@ -97,9 +97,16 @@ function parseNumberRange(range) {
 // 供 matchOrder、matchBooking 复用，避免重复计算
 // ─────────────────────────────────────────────────────────────────
 
+/** 预约列表搜索兼容前端通用 `keyword` 与后端协议 `keywords` 两种字段 */
+function resolveBookingKeyword(f) {
+  var _f$keyword;
+  var keyword = (_f$keyword = f.keyword) !== null && _f$keyword !== void 0 ? _f$keyword : f.keywords;
+  return typeof keyword === 'string' ? keyword.trim() : '';
+}
 function prepareFilters(f) {
   var _f$order_payment_stat, _f$order_status, _f$order_sales_channe, _f$payment_method, _f$appointment_status, _f$form_record_ids;
   var hasCustomerId = f.customer_id !== undefined && f.customer_id !== null;
+  var keyword = resolveBookingKeyword(f);
   return {
     orderPaymentStatusSet: (_f$order_payment_stat = f.order_payment_status) !== null && _f$order_payment_stat !== void 0 && _f$order_payment_stat.length ? new Set(f.order_payment_status) : null,
     orderStatusSet: (_f$order_status = f.order_status) !== null && _f$order_status !== void 0 && _f$order_status.length ? new Set(f.order_status) : null,
@@ -116,7 +123,7 @@ function prepareFilters(f) {
     updatedAtRange: parseDateRange(f.updated_at_between),
     numberRange: parseNumberRange(f.number_between),
     totalAmountRange: Array.isArray(f.total_amount_between) && f.total_amount_between.length === 2 ? f.total_amount_between : null,
-    keywordLower: f.keyword ? f.keyword.toLowerCase() : '',
+    keywordLower: keyword ? keyword.toLowerCase() : '',
     afterExecutionTimeMs: function () {
       var raw = f.after_execution_time;
       if (raw === undefined || raw === null || raw === '') return null;

package/dist/server/utils/small-ticket.d.ts

@@ -35,7 +35,6 @@ export interface SmallTicketProduct {
     original_price: string;
     total_original_price: string;
     extension_list: any[];
-    discount_list?: any[];
     options?: Array<{
         name: string;
         num?: number;

package/dist/server/utils/small-ticket.js

@@ -213,22 +213,14 @@ function buildProducts(order, locale, productMap) {
       quantity: quantity,
       originalPrice: originalPrice
     });
-    var discountList = normalizeProductDiscounts({
-      product: product,
-      locale: locale,
-      currencySymbol: currencySymbol,
-      quantity: quantity
-    });
-    return _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    return _objectSpread(_objectSpread(_objectSpread({
       product_title: productTitle,
       product_quantity: quantity,
       selling_price: formatMoney(sellingPrice, currencySymbol),
       original_price: formatMoney(originalPrice, currencySymbol),
       total_original_price: formatMoney(new Decimal(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
       extension_list: extensionList
-    }, discountList.length ? {
-      discount_list: discountList
-    } : {}), options.length ? {
+    }, options.length ? {
       options: options
     } : {}), resolvedVariant ? {
       variant: resolvedVariant
@@ -249,12 +241,10 @@ function normalizeProductDiscounts(params) {
     var title = resolveDiscountTitleWithPercent(discount, locale);
     var amount = (_ref8 = (_discount$amount = discount.amount) !== null && _discount$amount !== void 0 ? _discount$amount : discount.value) !== null && _ref8 !== void 0 ? _ref8 : discount.discount_amount;
     var formattedAmount = formatNegativeMoney(new Decimal(toMoneyNumber(amount)).mul(quantity), currencySymbol);
-    return _objectSpread(_objectSpread({}, discount), {}, {
+    return {
       item: title,
-      name: title,
-      title: title,
       value: formattedAmount
-    });
+    };
   });
 }
 function buildProductExtensionList(params) {
@@ -263,6 +253,12 @@ function buildProductExtensionList(params) {
     currencySymbol = params.currencySymbol,
     quantity = params.quantity,
     originalPrice = params.originalPrice;
+  var discountList = normalizeProductDiscounts({
+    product: product,
+    locale: locale,
+    currencySymbol: currencySymbol,
+    quantity: quantity
+  });
   var extensionList = [].concat(_toConsumableArray(buildProductOpenWeightRows({
     product: product,
     locale: locale,
@@ -275,7 +271,8 @@ function buildProductExtensionList(params) {
     }),
     value: ''
   }] : []));
-  return extensionList.length ? extensionList : normalizeArray(product.extension_list);
+  var productExtensionList = extensionList.length ? extensionList : normalizeArray(product.extension_list);
+  return [].concat(_toConsumableArray(productExtensionList), _toConsumableArray(discountList));
 }
 function buildProductOpenWeightRows(params) {
   var _productSku$unit, _productSku$net_weigh, _productSku$unit_pric;

package/dist/solution/BaseSales/index.js

@@ -786,8 +786,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadSalesDetail",
     value: (function () {
       var _loadSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(orderIdOrParams) {
-        var _ref11, _params$orderId;
-        var params, externalSaleNumber, lookup, res, message, currentTempOrder, record, sales;
+        var _ref11, _ref12, _ref13, _ref14, _params$orderId;
+        var params, externalSaleNumber, preloadedSalesDetail, lookup, loadedRecord, message, remoteRecord, currentTempOrder, record, sales;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -801,43 +801,55 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 orderId: orderIdOrParams
               };
               externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
-              lookup = (_ref11 = (_params$orderId = params.orderId) !== null && _params$orderId !== void 0 ? _params$orderId : externalSaleNumber) !== null && _ref11 !== void 0 ? _ref11 : params.orderNumber;
-              if (!(lookup === undefined || lookup === null || lookup === '')) {
-                _context7.next = 7;
+              preloadedSalesDetail = params.preloadedSalesDetail;
+              lookup = (_ref11 = (_ref12 = (_ref13 = (_ref14 = (_params$orderId = params.orderId) !== null && _params$orderId !== void 0 ? _params$orderId : externalSaleNumber) !== null && _ref14 !== void 0 ? _ref14 : params.orderNumber) !== null && _ref13 !== void 0 ? _ref13 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.order_id) !== null && _ref12 !== void 0 ? _ref12 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.external_sale_number) !== null && _ref11 !== void 0 ? _ref11 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.order_number;
+              if (!(!preloadedSalesDetail && (lookup === undefined || lookup === null || lookup === ''))) {
+                _context7.next = 8;
                 break;
               }
               throw new Error('加载销售详情需要 orderId、externalSaleNumber 或 orderNumber');
-            case 7:
-              _context7.next = 9;
+            case 8:
+              if (!(preloadedSalesDetail !== null && preloadedSalesDetail !== void 0)) {
+                _context7.next = 12;
+                break;
+              }
+              _context7.t0 = preloadedSalesDetail;
+              _context7.next = 15;
+              break;
+            case 12:
+              _context7.next = 14;
               return this.store.order.getSalesOrderByLookup({
                 lookup: lookup,
                 forceRemote: params.forceRemote
               });
-            case 9:
-              res = _context7.sent;
-              if (!(!res || res.code !== 200)) {
-                _context7.next = 13;
+            case 14:
+              _context7.t0 = _context7.sent;
+            case 15:
+              loadedRecord = _context7.t0;
+              if (!(!preloadedSalesDetail && (!loadedRecord || loadedRecord.code !== 200))) {
+                _context7.next = 19;
                 break;
               }
-              message = res && (res.message || res.msg) || "\u52A0\u8F7D\u9500\u552E\u8BE6\u60C5\u5931\u8D25: ".concat(lookup);
+              message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || "\u52A0\u8F7D\u9500\u552E\u8BE6\u60C5\u5931\u8D25: ".concat(lookup);
               throw new Error(message);
-            case 13:
+            case 19:
+              remoteRecord = preloadedSalesDetail !== null && preloadedSalesDetail !== void 0 ? preloadedSalesDetail : loadedRecord.data;
               currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-              record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, res.data) : res.data;
-              _context7.next = 17;
+              record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord) : remoteRecord;
+              _context7.next = 24;
               return this.store.order.hydrateTempOrderFromRecord(record, {
                 recalcOnHydrate: false
               });
-            case 17:
+            case 24:
               sales = _context7.sent;
               this.currentSalesDetail = sales;
-              _context7.next = 21;
+              _context7.next = 28;
               return this.core.effects.emit("".concat(this.name, ":onSalesOrderLoaded"), {
                 sales: sales
               });
-            case 21:
+            case 28:
               return _context7.abrupt("return", sales);
-            case 22:
+            case 29:
             case "end":
               return _context7.stop();
           }
@@ -2149,7 +2161,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
-        var _ref12, _params$businessCode, _this$otherParams18, _this$otherParams19, _params$channel;
+        var _ref15, _params$businessCode, _this$otherParams18, _this$otherParams19, _params$channel;
         var businessCode, channel, syncParams, syncState, payments, syncResult;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
@@ -2160,7 +2172,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('order 模块未初始化');
             case 2:
-              businessCode = (_ref12 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode) !== null && _ref12 !== void 0 ? _ref12 : (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.business_code;
+              businessCode = (_ref15 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode) !== null && _ref15 !== void 0 ? _ref15 : (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.business_code;
               channel = (_params$channel = params.channel) !== null && _params$channel !== void 0 ? _params$channel : this.getSubmitOrderSalesChannel();
               syncParams = _objectSpread(_objectSpread(_objectSpread({}, params), businessCode !== undefined ? {
                 businessCode: businessCode
@@ -2247,7 +2259,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _this$otherParams20,
         _paymentRecord$paymen,
         _paymentRecord$create,
-        _ref13,
+        _ref16,
         _paymentRecord$origin,
         _this7 = this;
       if (!this.store.order) throw new Error('order 模块未初始化');
@@ -2271,7 +2283,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var paymentTime = (_paymentRecord$paymen = paymentRecord.payment_time) !== null && _paymentRecord$paymen !== void 0 ? _paymentRecord$paymen : paymentTimestamp;
       var createdAt = (_paymentRecord$create = paymentRecord.created_at) !== null && _paymentRecord$create !== void 0 ? _paymentRecord$create : paymentTimestamp;
       var serviceCharge = paymentRecord.service_charge && _typeof(paymentRecord.service_charge) === 'object' ? paymentRecord.service_charge : null;
-      var calculatedServiceFee = serviceCharge ? new Decimal((_ref13 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref13 !== void 0 ? _ref13 : 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : undefined;
+      var calculatedServiceFee = serviceCharge ? new Decimal((_ref16 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref16 !== void 0 ? _ref16 : 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : undefined;
       var payments = this.store.order.addOrderPayment(_objectSpread(_objectSpread(_objectSpread({}, paymentRecord), calculatedServiceFee !== undefined ? {
         service_fee: calculatedServiceFee
       } : {}), {}, {
@@ -2382,7 +2394,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initWalletData",
     value: function () {
       var _initWalletData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
-        var _params$order_wait_pa, _ref14, _tempOrder$is_price_i;
+        var _params$order_wait_pa, _ref17, _tempOrder$is_price_i;
         var snapshot, tempOrder, amount, walletBusinessData, result;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
@@ -2425,7 +2437,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 },
                 products: this.getWalletProductList(),
                 order_wait_pay_amount: (_params$order_wait_pa = params === null || params === void 0 ? void 0 : params.order_wait_pay_amount) !== null && _params$order_wait_pa !== void 0 ? _params$order_wait_pa : Number(amount.amountGap || 0),
-                is_price_include_tax: (_ref14 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref14 !== void 0 ? _ref14 : 1
+                is_price_include_tax: (_ref17 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref17 !== void 0 ? _ref17 : 1
               }, snapshot.identity.orderId ? {
                 payment_order_id: String(snapshot.identity.orderId)
               } : {});
@@ -2556,7 +2568,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "sendCustomerPayLink",
     value: (function () {
       var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(params) {
-        var orderIds, _ref15, _ref16, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
+        var orderIds, _ref18, _ref19, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -2577,7 +2589,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
               submitResult = _context26.sent;
-              orderId = (_ref15 = (_ref16 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref16 !== void 0 ? _ref16 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref15 !== void 0 ? _ref15 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
+              orderId = (_ref18 = (_ref19 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref19 !== void 0 ? _ref19 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref18 !== void 0 ? _ref18 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
               if (orderId) {
                 _context26.next = 10;
                 break;
@@ -3003,14 +3015,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
         var _this$otherParams22;
-        var _ref17,
-          _ref17$cover,
+        var _ref20,
+          _ref20$cover,
           cover,
           _args36 = arguments;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
             case 0:
-              _ref17 = _args36.length > 1 && _args36[1] !== undefined ? _args36[1] : {}, _ref17$cover = _ref17.cover, cover = _ref17$cover === void 0 ? false : _ref17$cover;
+              _ref20 = _args36.length > 1 && _args36[1] !== undefined ? _args36[1] : {}, _ref20$cover = _ref20.cover, cover = _ref20$cover === void 0 ? false : _ref20$cover;
               if (cover) {
                 this.otherParams = _objectSpread({}, params);
               } else {

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 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.js

@@ -502,10 +502,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              debugger;
-              _context6.next = 3;
+              _context6.next = 2;
               return _get(_getPrototypeOf(BookingTicketImpl.prototype), "loadSalesDetail", this).call(this, orderIdOrParams);
-            case 3:
+            case 2:
               sales = _context6.sent;
               customerModule = this.store.customer;
               detailCustomer = sales === null || sales === void 0 ? void 0 : sales.customer;
@@ -534,7 +533,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 // await this.store.order.saveDraft();
               }
               return _context6.abrupt("return", sales);
-            case 12:
+            case 11:
             case "end":
               return _context6.stop();
           }

package/lib/modules/Order/index.js

@@ -934,8 +934,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (normalizedStatus !== "refunded" && normalizedStatus !== "partially_refunded") {
       return false;
     }
-    if (params.refundAmount.lte(0))
-      return false;
+    if (normalizedStatus === "refunded" && params.paymentTotal.gt(0) && params.refundAmount.gte(params.paymentTotal)) {
+      return true;
+    }
     if (params.previousSummary) {
       const previousTargetAmount = this.calculatePaymentTargetAmount(
         params.tempOrder,
@@ -945,10 +946,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       if (!previousTargetAmount.eq(params.targetAmount))
         return false;
     }
-    if (normalizedStatus === "refunded") {
-      return params.refundAmount.gte(params.paymentTotal);
-    }
-    return params.netPaymentTotal.gte(params.targetAmount);
+    return true;
   }
   resolveWalletPassUseValue(payment, amount) {
     const usageUnit = payment.wallet_pass_usage_unit && typeof payment.wallet_pass_usage_unit === "object" ? payment.wallet_pass_usage_unit : null;
@@ -2563,6 +2561,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    */
   async addProductToOrder(product, booking) {
     const tempOrder = this.ensureTempOrder();
+    debugger;
     if (booking) {
       const productRecord = product;
       const splitCount = (0, import_utils3.getSafeProductNum)(
@@ -3641,6 +3640,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       ...this.createDefaultTempOrderInstance(),
       ...raw || {}
     };
+    if ((nextTempOrder.order_id === void 0 || nextTempOrder.order_id === null) && (raw == null ? void 0 : raw.id) !== void 0 && (raw == null ? void 0 : raw.id) !== null) {
+      nextTempOrder.order_id = raw.id;
+    }
     delete nextTempOrder.summary;
     delete nextTempOrder.lastOrderInfo;
     delete nextTempOrder.discount_list;

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

@@ -518,6 +518,11 @@ export interface LoadSalesDetailParams {
     orderNumber?: string;
     externalSaleNumber?: string;
     external_sale_number?: string;
+    /**
+     * 已由调用方查询到的销售详情记录。
+     * 存在时 loadSalesDetail 会跳过远端 lookup，直接复用 hydrate 后半段逻辑。
+     */
+    preloadedSalesDetail?: Record<string, any>;
     forceRemote?: boolean;
     merge?: boolean;
 }

package/lib/server/index.d.ts

@@ -9,6 +9,20 @@ import { PisellCore, ServerModuleConfig, InitializeServerOptions } from '../type
 import type { RouteHandler, HttpMethod, RouteDefinition, Router, ModuleRegistryConfig, RequestSetting } from './types';
 import { OrderModule } from './modules/order';
 export type { RouteHandler, HttpMethod, RouteDefinition, Router, ModuleRegistryConfig, };
+/** Server 运行时诊断快照，用于排查订阅者是否持续增长。 */
+export interface ServerDiagnosticsSnapshot {
+    subscribers: {
+        productQuerySubscribers: number;
+        orderQuerySubscribers: number;
+        bookingQuerySubscribers: number;
+        bookingRemoteQuerySubscribers: number;
+        salesSearchSubscribers: number;
+        floorPlanQuerySubscribers: number;
+    };
+    caches: {
+        bookingRemoteCache: number;
+    };
+}
 /**
  * Server 类
  * 用于注册和管理服务端模块
@@ -44,6 +58,13 @@ declare class Server {
     private floorPlanQuerySubscribers;
     private moduleRegistry;
     constructor(core: PisellCore);
+    /**
+     * 获取 Server 内部订阅者和缓存数量快照。
+     *
+     * @example
+     * const snapshot = pisellos.server?.getDiagnosticsSnapshot?.();
+     */
+    getDiagnosticsSnapshot(): ServerDiagnosticsSnapshot;
     /**
      * 注册路由
      * @param routes 路由定义数组

package/lib/server/index.js

@@ -756,7 +756,7 @@ var Server = class {
     this.handleFloorPlanGet = async ({ url, data, config, path: routePath }) => {
       const base = "/shop/schedule/floor-plan";
       const path = this.parseRequestPath(url, routePath);
-      if (path === `${base}/unsubscribe`) {
+      if (path === `${base}/unsubscribe` || path === `${base}/code/unsubscribe`) {
         const subscriberId2 = data == null ? void 0 : data.subscriberId;
         if (subscriberId2) {
           this.floorPlanQuerySubscribers.delete(subscriberId2);
@@ -905,6 +905,27 @@ var Server = class {
       hasLogger: !!this.logger
     });
   }
+  /**
+   * 获取 Server 内部订阅者和缓存数量快照。
+   *
+   * @example
+   * const snapshot = pisellos.server?.getDiagnosticsSnapshot?.();
+   */
+  getDiagnosticsSnapshot() {
+    return {
+      subscribers: {
+        productQuerySubscribers: this.productQuerySubscribers.size,
+        orderQuerySubscribers: this.orderQuerySubscribers.size,
+        bookingQuerySubscribers: this.bookingQuerySubscribers.size,
+        bookingRemoteQuerySubscribers: this.bookingRemoteQuerySubscribers.size,
+        salesSearchSubscribers: this.salesSearchSubscribers.size,
+        floorPlanQuerySubscribers: this.floorPlanQuerySubscribers.size
+      },
+      caches: {
+        bookingRemoteCache: this.bookingRemoteCache.size
+      }
+    };
+  }
   /**
    * 注册路由
    * @param routes 路由定义数组

package/lib/server/modules/order/index.js

@@ -1256,7 +1256,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       "shop_discount",
       "summary",
       "products",
-      "bookings"
+      "bookings",
+      "note",
+      "customer_id",
+      "customer_name",
+      "customer",
+      "holder",
+      "contacts_info",
+      "phone",
+      "email",
+      "relation_forms"
     ];
     const mergedRecord = merged;
     const preferredRecord = preferred;

package/lib/server/modules/order/types.d.ts

@@ -458,7 +458,10 @@ export interface OrderFilters {
  * 预约展开列表筛选条件（订单级条件匹配 booking.order.*，预约级匹配 booking 自身）
  */
 export interface BookingFilters {
+    /** RecordBoard 通用搜索字段（单数），用于本地预约过滤 */
     keyword?: string;
+    /** `/shop/schedule/booking` 后端协议搜索字段（复数），OS Server 需兼容 */
+    keywords?: string;
     order_by?: string;
     order_payment_status?: string[];
     order_status?: string[];

package/lib/server/modules/order/utils/filterBookings.js

@@ -104,9 +104,14 @@ function parseNumberRange(range) {
     return null;
   return [min, max];
 }
+function resolveBookingKeyword(f) {
+  const keyword = f.keyword ?? f.keywords;
+  return typeof keyword === "string" ? keyword.trim() : "";
+}
 function prepareFilters(f) {
   var _a, _b, _c, _d, _e, _f;
   const hasCustomerId = f.customer_id !== void 0 && f.customer_id !== null;
+  const keyword = resolveBookingKeyword(f);
   return {
     orderPaymentStatusSet: ((_a = f.order_payment_status) == null ? void 0 : _a.length) ? new Set(f.order_payment_status) : null,
     orderStatusSet: ((_b = f.order_status) == null ? void 0 : _b.length) ? new Set(f.order_status) : null,
@@ -123,7 +128,7 @@ function prepareFilters(f) {
     updatedAtRange: parseDateRange(f.updated_at_between),
     numberRange: parseNumberRange(f.number_between),
     totalAmountRange: Array.isArray(f.total_amount_between) && f.total_amount_between.length === 2 ? f.total_amount_between : null,
-    keywordLower: f.keyword ? f.keyword.toLowerCase() : "",
+    keywordLower: keyword ? keyword.toLowerCase() : "",
     afterExecutionTimeMs: (() => {
       const raw = f.after_execution_time;
       if (raw === void 0 || raw === null || raw === "")

package/lib/server/utils/small-ticket.d.ts

@@ -35,7 +35,6 @@ export interface SmallTicketProduct {
     original_price: string;
     total_original_price: string;
     extension_list: any[];
-    discount_list?: any[];
     options?: Array<{
         name: string;
         num?: number;

package/lib/server/utils/small-ticket.js

@@ -200,7 +200,6 @@ function buildProducts(order, locale, productMap) {
       quantity,
       originalPrice
     });
-    const discountList = normalizeProductDiscounts({ product, locale, currencySymbol, quantity });
     return {
       product_title: productTitle,
       product_quantity: quantity,
@@ -208,7 +207,6 @@ function buildProducts(order, locale, productMap) {
       original_price: formatMoney(originalPrice, currencySymbol),
       total_original_price: formatMoney(new import_decimal.default(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
       extension_list: extensionList,
-      ...discountList.length ? { discount_list: discountList } : {},
       ...options.length ? { options } : {},
       ...resolvedVariant ? { variant: resolvedVariant } : {},
       ...Array.isArray(product.combinations) ? { combinations: product.combinations } : combinations.length ? { combinations } : {}
@@ -222,16 +220,14 @@ function normalizeProductDiscounts(params) {
     const amount = discount.amount ?? discount.value ?? discount.discount_amount;
     const formattedAmount = formatNegativeMoney(new import_decimal.default(toMoneyNumber(amount)).mul(quantity), currencySymbol);
     return {
-      ...discount,
       item: title,
-      name: title,
-      title,
       value: formattedAmount
     };
   });
 }
 function buildProductExtensionList(params) {
   const { product, locale, currencySymbol, quantity, originalPrice } = params;
+  const discountList = normalizeProductDiscounts({ product, locale, currencySymbol, quantity });
   const extensionList = [
     ...buildProductOpenWeightRows({ product, locale, currencySymbol }),
     ...quantity > 1 ? [{
@@ -239,7 +235,8 @@ function buildProductExtensionList(params) {
       value: ""
     }] : []
   ];
-  return extensionList.length ? extensionList : normalizeArray(product.extension_list);
+  const productExtensionList = extensionList.length ? extensionList : normalizeArray(product.extension_list);
+  return [...productExtensionList, ...discountList];
 }
 function buildProductOpenWeightRows(params) {
   const { product, locale, currencySymbol } = params;

package/lib/solution/BaseSales/index.js

@@ -596,21 +596,25 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     const params = typeof orderIdOrParams === "object" ? orderIdOrParams : { orderId: orderIdOrParams };
     const externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
-    const lookup = params.orderId ?? externalSaleNumber ?? params.orderNumber;
-    if (lookup === void 0 || lookup === null || lookup === "") {
+    const preloadedSalesDetail = params.preloadedSalesDetail;
+    const lookup = params.orderId ?? externalSaleNumber ?? params.orderNumber ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.order_id) ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.external_sale_number) ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.order_number);
+    if (!preloadedSalesDetail && (lookup === void 0 || lookup === null || lookup === "")) {
       throw new Error("加载销售详情需要 orderId、externalSaleNumber 或 orderNumber");
     }
-    const res = await this.store.order.getSalesOrderByLookup({
+    const loadedRecord = preloadedSalesDetail ?? await this.store.order.getSalesOrderByLookup({
       lookup,
       forceRemote: params.forceRemote
     });
-    if (!res || res.code !== 200) {
-      const message = res && (res.message || res.msg) || `加载销售详情失败: ${lookup}`;
+    if (!preloadedSalesDetail && (!loadedRecord || loadedRecord.code !== 200)) {
+      const message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || `加载销售详情失败: ${lookup}`;
       throw new Error(message);
     }
+    const remoteRecord = preloadedSalesDetail ?? loadedRecord.data;
     const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-    const record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, res.data) : res.data;
-    const sales = await this.store.order.hydrateTempOrderFromRecord(record, { recalcOnHydrate: false });
+    const record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord) : remoteRecord;
+    const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
+      recalcOnHydrate: false
+    });
     this.currentSalesDetail = sales;
     await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
     return sales;

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 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.js

@@ -307,7 +307,6 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
    * 让现有 setActiveCustomer / getActiveCustomer 调用方零成本拿到详情态客户。
    */
   async loadSalesDetail(orderIdOrParams) {
-    debugger;
     const sales = await super.loadSalesDetail(orderIdOrParams);
     const customerModule = this.store.customer;
     const detailCustomer = sales == null ? void 0 : sales.customer;

package/package.json

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