@pisell/pisellos 2.2.264 → 2.2.265

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (152) hide show
  1. package/dist/model/strategy/adapter/dataVariant/adapter.d.ts +50 -0
  2. package/dist/model/strategy/adapter/dataVariant/adapter.js +167 -0
  3. package/dist/model/strategy/adapter/dataVariant/evaluator.d.ts +89 -0
  4. package/dist/model/strategy/adapter/dataVariant/evaluator.js +780 -0
  5. package/dist/model/strategy/adapter/dataVariant/examples.d.ts +39 -0
  6. package/dist/model/strategy/adapter/dataVariant/examples.js +277 -0
  7. package/dist/model/strategy/adapter/dataVariant/index.d.ts +4 -0
  8. package/dist/model/strategy/adapter/dataVariant/index.js +4 -0
  9. package/dist/model/strategy/adapter/dataVariant/type.d.ts +148 -0
  10. package/dist/model/strategy/adapter/dataVariant/type.js +54 -0
  11. package/dist/model/strategy/adapter/index.d.ts +4 -0
  12. package/dist/model/strategy/adapter/index.js +5 -1
  13. package/dist/model/strategy/adapter/promotion/adapter.d.ts +0 -4
  14. package/dist/model/strategy/adapter/promotion/adapter.js +0 -23
  15. package/dist/model/strategy/adapter/promotion/evaluator.d.ts +0 -17
  16. package/dist/model/strategy/adapter/promotion/evaluator.js +6 -279
  17. package/dist/model/strategy/adapter/promotion/examples.d.ts +0 -86
  18. package/dist/model/strategy/adapter/promotion/examples.js +0 -99
  19. package/dist/model/strategy/adapter/promotion/index.d.ts +1 -1
  20. package/dist/model/strategy/adapter/promotion/index.js +9 -0
  21. package/dist/model/strategy/adapter/promotion/type.d.ts +2 -90
  22. package/dist/model/strategy/adapter/promotion/type.js +0 -45
  23. package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js +16 -10
  24. package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js +2 -1
  25. package/dist/modules/BookingContext/utils/cacheItemToBookingInput.d.ts +1 -1
  26. package/dist/modules/BookingContext/utils/cacheItemToBookingInput.js +32 -1
  27. package/dist/modules/Discount/index.d.ts +5 -2
  28. package/dist/modules/Discount/index.js +30 -7
  29. package/dist/modules/Discount/types.d.ts +4 -0
  30. package/dist/modules/Order/index.d.ts +41 -10
  31. package/dist/modules/Order/index.js +1370 -808
  32. package/dist/modules/Order/payment-utils.d.ts +26 -0
  33. package/dist/modules/Order/payment-utils.js +225 -0
  34. package/dist/modules/Order/types.d.ts +49 -1
  35. package/dist/modules/Order/utils/orderCollectionIdentity.d.ts +53 -0
  36. package/dist/modules/Order/utils/orderCollectionIdentity.js +410 -0
  37. package/dist/modules/Order/utils.d.ts +4 -3
  38. package/dist/modules/Order/utils.js +62 -66
  39. package/dist/modules/Payment/index.d.ts +2 -0
  40. package/dist/modules/Payment/index.js +78 -49
  41. package/dist/modules/Payment/types.d.ts +26 -24
  42. package/dist/modules/Payment/types.js +2 -0
  43. package/dist/modules/Product/types.d.ts +22 -0
  44. package/dist/modules/ProductList/index.d.ts +1 -1
  45. package/dist/modules/ProductList/index.js +4 -2
  46. package/dist/modules/ProductList/types.d.ts +2 -0
  47. package/dist/modules/Rules/index.d.ts +2 -9
  48. package/dist/modules/Rules/index.js +69 -43
  49. package/dist/modules/Rules/types.d.ts +10 -1
  50. package/dist/server/index.d.ts +71 -0
  51. package/dist/server/index.js +2504 -1187
  52. package/dist/server/modules/order/index.d.ts +56 -5
  53. package/dist/server/modules/order/index.js +1718 -834
  54. package/dist/server/modules/order/types.d.ts +15 -3
  55. package/dist/server/modules/order/types.js +1 -1
  56. package/dist/server/modules/products/index.d.ts +31 -8
  57. package/dist/server/modules/products/index.js +549 -390
  58. package/dist/server/modules/products/types.d.ts +18 -0
  59. package/dist/solution/BaseSales/index.d.ts +54 -4
  60. package/dist/solution/BaseSales/index.js +1448 -788
  61. package/dist/solution/BaseSales/types.d.ts +6 -1
  62. package/dist/solution/BaseSales/types.js +1 -1
  63. package/dist/solution/BaseSales/utils/cartPromotion.d.ts +1 -3
  64. package/dist/solution/BaseSales/utils/cartPromotion.js +50 -97
  65. package/dist/solution/BaseSales/utils/parseSalesResponse.d.ts +9 -4
  66. package/dist/solution/BaseSales/utils/parseSalesResponse.js +6 -8
  67. package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +14 -1
  68. package/dist/solution/BookingByStep/index.d.ts +1 -1
  69. package/dist/solution/BookingTicket/index.js +61 -26
  70. package/dist/solution/BookingTicket/types.d.ts +2 -0
  71. package/dist/solution/Sales/index.d.ts +1 -0
  72. package/dist/solution/Sales/index.js +10 -2
  73. package/dist/solution/ScanOrder/index.js +20 -31
  74. package/dist/solution/ShopDiscount/index.js +15 -14
  75. package/dist/solution/VenueBooking/index.js +19 -30
  76. package/dist/utils/payment-number.d.ts +9 -0
  77. package/dist/utils/payment-number.js +69 -0
  78. package/lib/model/strategy/adapter/dataVariant/adapter.d.ts +50 -0
  79. package/lib/model/strategy/adapter/dataVariant/adapter.js +149 -0
  80. package/lib/model/strategy/adapter/dataVariant/evaluator.d.ts +89 -0
  81. package/lib/model/strategy/adapter/dataVariant/evaluator.js +583 -0
  82. package/lib/model/strategy/adapter/dataVariant/examples.d.ts +39 -0
  83. package/lib/model/strategy/adapter/dataVariant/examples.js +293 -0
  84. package/lib/model/strategy/adapter/dataVariant/index.d.ts +4 -0
  85. package/lib/model/strategy/adapter/dataVariant/index.js +38 -0
  86. package/lib/model/strategy/adapter/dataVariant/type.d.ts +148 -0
  87. package/lib/model/strategy/adapter/dataVariant/type.js +31 -0
  88. package/lib/model/strategy/adapter/index.d.ts +4 -0
  89. package/lib/model/strategy/adapter/index.js +13 -2
  90. package/lib/model/strategy/adapter/promotion/adapter.d.ts +0 -4
  91. package/lib/model/strategy/adapter/promotion/adapter.js +0 -20
  92. package/lib/model/strategy/adapter/promotion/evaluator.d.ts +0 -17
  93. package/lib/model/strategy/adapter/promotion/evaluator.js +0 -235
  94. package/lib/model/strategy/adapter/promotion/examples.d.ts +0 -86
  95. package/lib/model/strategy/adapter/promotion/examples.js +0 -91
  96. package/lib/model/strategy/adapter/promotion/index.d.ts +1 -1
  97. package/lib/model/strategy/adapter/promotion/index.js +0 -2
  98. package/lib/model/strategy/adapter/promotion/type.d.ts +2 -90
  99. package/lib/model/strategy/adapter/promotion/type.js +0 -2
  100. package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js +5 -0
  101. package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js +1 -0
  102. package/lib/modules/BookingContext/utils/cacheItemToBookingInput.d.ts +1 -1
  103. package/lib/modules/BookingContext/utils/cacheItemToBookingInput.js +23 -2
  104. package/lib/modules/Discount/index.d.ts +5 -2
  105. package/lib/modules/Discount/index.js +23 -3
  106. package/lib/modules/Discount/types.d.ts +4 -0
  107. package/lib/modules/Order/index.d.ts +41 -10
  108. package/lib/modules/Order/index.js +505 -119
  109. package/lib/modules/Order/payment-utils.d.ts +26 -0
  110. package/lib/modules/Order/payment-utils.js +224 -0
  111. package/lib/modules/Order/types.d.ts +49 -1
  112. package/lib/modules/Order/utils/orderCollectionIdentity.d.ts +53 -0
  113. package/lib/modules/Order/utils/orderCollectionIdentity.js +418 -0
  114. package/lib/modules/Order/utils.d.ts +4 -3
  115. package/lib/modules/Order/utils.js +27 -26
  116. package/lib/modules/Payment/index.d.ts +2 -0
  117. package/lib/modules/Payment/index.js +33 -12
  118. package/lib/modules/Payment/types.d.ts +26 -24
  119. package/lib/modules/Product/types.d.ts +22 -0
  120. package/lib/modules/ProductList/index.d.ts +1 -1
  121. package/lib/modules/ProductList/index.js +4 -2
  122. package/lib/modules/ProductList/types.d.ts +2 -0
  123. package/lib/modules/Rules/index.d.ts +2 -9
  124. package/lib/modules/Rules/index.js +61 -29
  125. package/lib/modules/Rules/types.d.ts +10 -1
  126. package/lib/server/index.d.ts +71 -0
  127. package/lib/server/index.js +1002 -52
  128. package/lib/server/modules/order/index.d.ts +56 -5
  129. package/lib/server/modules/order/index.js +798 -148
  130. package/lib/server/modules/order/types.d.ts +15 -3
  131. package/lib/server/modules/products/index.d.ts +31 -8
  132. package/lib/server/modules/products/index.js +134 -35
  133. package/lib/server/modules/products/types.d.ts +18 -0
  134. package/lib/solution/BaseSales/index.d.ts +54 -4
  135. package/lib/solution/BaseSales/index.js +475 -50
  136. package/lib/solution/BaseSales/types.d.ts +6 -1
  137. package/lib/solution/BaseSales/utils/cartPromotion.d.ts +1 -3
  138. package/lib/solution/BaseSales/utils/cartPromotion.js +25 -64
  139. package/lib/solution/BaseSales/utils/parseSalesResponse.d.ts +9 -4
  140. package/lib/solution/BaseSales/utils/parseSalesResponse.js +4 -5
  141. package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +8 -0
  142. package/lib/solution/BookingByStep/index.d.ts +1 -1
  143. package/lib/solution/BookingTicket/index.js +35 -9
  144. package/lib/solution/BookingTicket/types.d.ts +2 -0
  145. package/lib/solution/Sales/index.d.ts +1 -0
  146. package/lib/solution/Sales/index.js +5 -3
  147. package/lib/solution/ScanOrder/index.js +0 -8
  148. package/lib/solution/ShopDiscount/index.js +2 -1
  149. package/lib/solution/VenueBooking/index.js +0 -8
  150. package/lib/utils/payment-number.d.ts +9 -0
  151. package/lib/utils/payment-number.js +64 -0
  152. package/package.json +1 -1
@@ -63,6 +63,8 @@ export interface OrderProductBundleItem {
63
63
  bundle_group_id?: number;
64
64
  /** 套餐商品 ID */
65
65
  bundle_id?: number;
66
+ /** 套餐子商品封面图 */
67
+ cover?: string | null;
66
68
  /** 套餐商品规格 ID */
67
69
  bundle_variant_id?: number;
68
70
  /** 数量 */
@@ -104,6 +106,8 @@ export interface OrderProductLineItem {
104
106
  num: number;
105
107
  /** 商品标题快照;本地待同步订单会补齐为多语言对象。 */
106
108
  product_title?: OrderProductTitleSnapshot | string | null;
109
+ /** 商品封面图 */
110
+ product_cover?: string | null;
107
111
  /** 多规格 ID。来源:Detail.product_variant_id */
108
112
  product_variant_id?: number;
109
113
  /**
@@ -209,10 +213,12 @@ export interface OrderBookingItem {
209
213
  [key: string]: unknown;
210
214
  }[];
211
215
  }
212
- /** 支付记录 metadata,常含 unique_payment_number */
216
+ /** 支付记录 metadata */
213
217
  export interface OrderPaymentMetadata {
214
- /** 设备端本地支付唯一标识 */
218
+ /** 三方支付交易流水号 */
215
219
  unique_payment_number?: string;
220
+ /** 刷卡机设备快照;server 不解析内部字段,仅透传并持久化 */
221
+ card_reader_snapshot?: Record<string, unknown>;
216
222
  [key: string]: unknown;
217
223
  }
218
224
  /**
@@ -221,6 +227,8 @@ export interface OrderPaymentMetadata {
221
227
  export interface OrderPaymentItem {
222
228
  /** 支付记录 ID;存量/更新时传。来源:OrderPayment.id */
223
229
  order_payment_id?: number | null;
230
+ /** 支付项稳定唯一号;历史支付项允许缺失 */
231
+ payment_number?: string;
224
232
  /** 支付方式 ID(设备端从本地支付方式配置取详情)。来源:OrderPayment.custom_payment_id */
225
233
  custom_payment_id?: number;
226
234
  /** 支付方式编码。来源:OrderPayment.payment_method */
@@ -245,11 +253,13 @@ export interface OrderPaymentItem {
245
253
  created_at?: string | null;
246
254
  /** 手续费配置。来源:OrderPayment.service_charge */
247
255
  service_charge?: Record<string, unknown> | null;
256
+ /** 已计算的支付手续费。来源:OrderPayment.service_fee */
257
+ service_fee?: OrderMoneyString;
248
258
  /** Wallet Pass 使用单位 */
249
259
  wallet_pass_usage_unit?: unknown[] | null;
250
260
  /** Wallet Pass 使用值 */
251
261
  wallet_pass_use_value?: number | null;
252
- /** 元数据;含 unique_payment_number。来源:OrderPayment.metadata */
262
+ /** 元数据;三方支付成功后可含 unique_payment_number */
253
263
  metadata?: OrderPaymentMetadata | null;
254
264
  }
255
265
  /**
@@ -409,6 +419,8 @@ export interface OrderData {
409
419
  create_date?: string;
410
420
  /** 本地待同步标记:1 表示需要后续同步到云端 */
411
421
  need_sync?: 0 | 1 | number;
422
+ /** 本地草稿标记:1 表示仅为 POS 可恢复草稿,不代表已提交云端 */
423
+ is_draft_order?: 0 | 1 | number;
412
424
  /** 兼容:部分场景仍使用顶层 total_amount */
413
425
  total_amount?: OrderMoneyString | number;
414
426
  /** 扩展字段(物流、标签等);使用 any 以便筛选与数据源扩展 */
@@ -2,7 +2,7 @@ import { Module, PisellCore } from '../../../types';
2
2
  import { BaseModule } from '../../../modules/BaseModule';
3
3
  import { ProductData } from '../../../modules/Product/types';
4
4
  import type { RouteDefinition } from '../../types';
5
- import { ProductIdScope, ProductFormatter, ProductFormatterContext } from './types';
5
+ import { ProductIdScope, type ProductSnapshot, ProductFormatter, ProductFormatterContext } from './types';
6
6
  /**
7
7
  * Products 模块 - 用于获取和管理完整的商品详细数据
8
8
  * 相比 ProductList 模块,Products 会获取所有详细信息并缓存
@@ -18,7 +18,8 @@ export declare class ProductsModule extends BaseModule implements Module {
18
18
  private productsPriceCache;
19
19
  private readonly CACHE_MAX_DAYS;
20
20
  private formatters;
21
- private isPriceFormatterRegistered;
21
+ private isBuiltinFormatterRegistered;
22
+ private isLegacyPriceFormatterEnabled;
22
23
  private quotationPriceBridge?;
23
24
  private quotationBridgeChannel?;
24
25
  private quotationBridgeLoadedKey?;
@@ -36,6 +37,8 @@ export declare class ProductsModule extends BaseModule implements Module {
36
37
  private lastPreloadCompletedAtMs;
37
38
  /** IndexDB 写入串行队列,避免快照与 patch 并发交错 */
38
39
  private productIndexDBSaveQueue;
40
+ /** 最近一次智能定价评估提取的 schedule 变价时间点(HH:mm),供 Server 订阅定时刷新使用 */
41
+ private lastScheduleTimePoints;
39
42
  constructor(name?: string, version?: string);
40
43
  initialize(core: PisellCore, options: any): Promise<void>;
41
44
  /**
@@ -108,6 +111,10 @@ export declare class ProductsModule extends BaseModule implements Module {
108
111
  */
109
112
  private prepareProductsWithPrice;
110
113
  private getProductsPriceCacheKey;
114
+ /**
115
+ * 稳定序列化策略上下文,避免对象 key 顺序不同导致缓存 key 抖动。
116
+ */
117
+ private stringifyStable;
111
118
  private normalizeProductIds;
112
119
  /**
113
120
  * 按轻量范围返回商品 ID,不做 structuredClone。
@@ -122,14 +129,26 @@ export declare class ProductsModule extends BaseModule implements Module {
122
129
  */
123
130
  private applyFormatters;
124
131
  /**
125
- * 注册内置的价格格式化器
126
- * 这个格式化器负责将价格数据应用到商品上
132
+ * 注册内置商品格式化器。
133
+ *
134
+ * 智能定价默认替代报价单逻辑;报价单 formatter 仅在 enableLegacyPriceFormatter=true 时启用。
127
135
  * @private
128
136
  */
129
- private registerBuiltinPriceFormatter;
137
+ private registerBuiltinProductFormatters;
138
+ /**
139
+ * 是否启用旧报价单价格 formatter。
140
+ *
141
+ * 默认关闭,避免报价单逻辑覆盖智能定价结果。
142
+ */
143
+ private shouldEnableLegacyPriceFormatter;
144
+ /**
145
+ * 返回最近一次 prepareProductsWithPrice / DataVariant 评估提取的变价时间点(HH:mm)。
146
+ * 供 OS Server 商品 query 订阅定时刷新使用。
147
+ */
148
+ getLastScheduleTimePoints(): string[];
130
149
  /**
131
150
  * 注册商品格式化器
132
- * 格式化器会按注册顺序依次执行(内置价格格式化器始终是第一个)
151
+ * 格式化器会按注册顺序依次执行;legacy 启用时先兜底报价,再由智能定价覆盖。
133
152
  * @param formatter 格式化函数
134
153
  * @param prepend 是否插入到队列开头(默认 false,追加到末尾)
135
154
  * @example
@@ -144,8 +163,8 @@ export declare class ProductsModule extends BaseModule implements Module {
144
163
  */
145
164
  registerFormatter(formatter: ProductFormatter, prepend?: boolean): void;
146
165
  /**
147
- * 清空所有格式化器(包括内置价格格式化器)
148
- * @param keepBuiltin 是否保留内置价格格式化器(默认 true)
166
+ * 清空所有格式化器(包括内置智能定价格式化器)
167
+ * @param keepBuiltin 是否保留内置智能定价格式化器(默认 true)
149
168
  */
150
169
  clearFormatters(keepBuiltin?: boolean): void;
151
170
  /**
@@ -185,6 +204,10 @@ export declare class ProductsModule extends BaseModule implements Module {
185
204
  * 获取商品列表(深拷贝,供外部安全使用)
186
205
  */
187
206
  getProducts(): Promise<ProductData[]>;
207
+ /**
208
+ * 批量获取商品轻量快照,供订单详情等响应补齐展示协议字段。
209
+ */
210
+ getProductSnapshotsByIds(ids: number[]): Promise<Record<string, ProductSnapshot>>;
188
211
  /**
189
212
  * 内部获取商品列表的直接引用(无拷贝)
190
213
  * 仅供内部 formatter 流程使用,因为 formatter 会创建新对象
@@ -43,8 +43,10 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
43
43
  // 最多缓存7天
44
44
  // 商品格式化器列表
45
45
  this.formatters = [];
46
- // 是否已注册内置价格格式化器
47
- this.isPriceFormatterRegistered = false;
46
+ // 是否已注册内置商品格式化器
47
+ this.isBuiltinFormatterRegistered = false;
48
+ // 旧报价单格式化器默认关闭,仅显式开启时作为兼容兜底注册
49
+ this.isLegacyPriceFormatterEnabled = false;
48
50
  this.quotationBridgeLoadedKey = "";
49
51
  this.quotationScheduleCache = /* @__PURE__ */ new Map();
50
52
  this.quotationScheduleCacheSource = null;
@@ -56,6 +58,8 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
56
58
  this.lastPreloadCompletedAtMs = 0;
57
59
  /** IndexDB 写入串行队列,避免快照与 patch 并发交错 */
58
60
  this.productIndexDBSaveQueue = Promise.resolve();
61
+ /** 最近一次智能定价评估提取的 schedule 变价时间点(HH:mm),供 Server 订阅定时刷新使用 */
62
+ this.lastScheduleTimePoints = [];
59
63
  }
60
64
  async initialize(core, options) {
61
65
  var _a;
@@ -82,7 +86,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
82
86
  console.warn("[Products] IndexDB Manager 未找到");
83
87
  }
84
88
  }
85
- this.registerBuiltinPriceFormatter();
89
+ this.registerBuiltinProductFormatters();
86
90
  this.initProductDataSource();
87
91
  this.setupProductSync();
88
92
  this.logInfo("模块初始化完成", {
@@ -474,7 +478,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
474
478
  * @private
475
479
  */
476
480
  async prepareProductsWithPrice(schedule_date, extraContext, options) {
477
- var _a, _b;
481
+ var _a, _b, _c, _d;
478
482
  const tTotal = performance.now();
479
483
  const targetIds = options == null ? void 0 : options.productIds;
480
484
  const isIncremental = Array.isArray(targetIds);
@@ -499,21 +503,28 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
499
503
  (0, import_product.perfMark)("prepareProducts.extractIds", performance.now() - tIds, { count: ids.length });
500
504
  }
501
505
  this.logInfo("获取到商品列表", { productCount: products.length });
502
- const tPrice = performance.now();
503
- const priceData = await this.loadProductsPrice({
504
- ids,
505
- schedule_date,
506
- schedule_datetime: extraContext == null ? void 0 : extraContext.schedule_datetime,
507
- customer_id: extraContext == null ? void 0 : extraContext.customer_id
508
- });
509
- (0, import_product.perfMark)("prepareProducts.loadPrice", performance.now() - tPrice, { count: ids.length });
510
- this.logInfo("获取商品报价单价格成功", { priceDataCount: (priceData == null ? void 0 : priceData.length) ?? 0 });
506
+ let priceData = [];
507
+ if (this.isLegacyPriceFormatterEnabled) {
508
+ const tPrice = performance.now();
509
+ priceData = await this.loadProductsPrice({
510
+ ids,
511
+ schedule_date,
512
+ schedule_datetime: extraContext == null ? void 0 : extraContext.schedule_datetime,
513
+ customer_id: extraContext == null ? void 0 : extraContext.customer_id
514
+ });
515
+ (0, import_product.perfMark)("prepareProducts.loadPrice", performance.now() - tPrice, { count: ids.length });
516
+ this.logInfo("获取商品报价单价格成功", { priceDataCount: (priceData == null ? void 0 : priceData.length) ?? 0 });
517
+ }
511
518
  const context = {
512
519
  schedule_date,
513
520
  schedule_datetime: extraContext == null ? void 0 : extraContext.schedule_datetime,
514
521
  customer_id: extraContext == null ? void 0 : extraContext.customer_id,
515
522
  priceData,
516
523
  locale: (_b = (_a = this.core) == null ? void 0 : _a.context) == null ? void 0 : _b.locale,
524
+ dataVariantEvaluator: (extraContext == null ? void 0 : extraContext.dataVariantEvaluator) || ((_d = (_c = this.core) == null ? void 0 : _c.context) == null ? void 0 : _d.dataVariantEvaluator),
525
+ menuList: (extraContext == null ? void 0 : extraContext.menuList) || [],
526
+ scheduleList: (extraContext == null ? void 0 : extraContext.scheduleList) || [],
527
+ strategy_context: extraContext == null ? void 0 : extraContext.strategy_context,
517
528
  ...extraContext
518
529
  };
519
530
  const tFormat = performance.now();
@@ -553,7 +564,21 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
553
564
  getProductsPriceCacheKey(schedule_date, extraContext, productIds) {
554
565
  const datetime = (extraContext == null ? void 0 : extraContext.schedule_datetime) || schedule_date;
555
566
  const productScope = productIds ? `:products:${productIds.join(",")}` : "";
556
- return `${datetime}:customer:${(extraContext == null ? void 0 : extraContext.customer_id) ?? ""}${productScope}`;
567
+ const strategyScope = this.stringifyStable((extraContext == null ? void 0 : extraContext.strategy_context) || {});
568
+ return `${datetime}:customer:${(extraContext == null ? void 0 : extraContext.customer_id) ?? ""}:strategy:${strategyScope}${productScope}`;
569
+ }
570
+ /**
571
+ * 稳定序列化策略上下文,避免对象 key 顺序不同导致缓存 key 抖动。
572
+ */
573
+ stringifyStable(value) {
574
+ if (value == null)
575
+ return "";
576
+ if (Array.isArray(value))
577
+ return `[${value.map((item) => this.stringifyStable(item)).join(",")}]`;
578
+ if (typeof value === "object") {
579
+ return `{${Object.keys(value).sort().map((key) => `${key}:${this.stringifyStable(value[key])}`).join(",")}}`;
580
+ }
581
+ return String(value);
557
582
  }
558
583
  normalizeProductIds(productIds) {
559
584
  if (!Array.isArray(productIds))
@@ -637,21 +662,50 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
637
662
  return result;
638
663
  }
639
664
  /**
640
- * 注册内置的价格格式化器
641
- * 这个格式化器负责将价格数据应用到商品上
665
+ * 注册内置商品格式化器。
666
+ *
667
+ * 智能定价默认替代报价单逻辑;报价单 formatter 仅在 enableLegacyPriceFormatter=true 时启用。
642
668
  * @private
643
669
  */
644
- registerBuiltinPriceFormatter() {
645
- if (this.isPriceFormatterRegistered) {
646
- console.warn("[ProductsModule] 内置价格格式化器已注册,跳过");
670
+ registerBuiltinProductFormatters() {
671
+ if (this.isBuiltinFormatterRegistered) {
672
+ console.warn("[ProductsModule] 内置商品格式化器已注册,跳过");
647
673
  return;
648
674
  }
649
- const priceFormatter = (products, context) => {
675
+ this.isLegacyPriceFormatterEnabled = this.shouldEnableLegacyPriceFormatter();
676
+ const dataVariantFormatter = (products, context) => {
677
+ var _a, _b;
678
+ const evaluator = context.dataVariantEvaluator || ((_b = (_a = this.core) == null ? void 0 : _a.context) == null ? void 0 : _b.dataVariantEvaluator);
679
+ if (!evaluator || typeof evaluator.resolveProducts !== "function") {
680
+ this.lastScheduleTimePoints = [];
681
+ this.logWarning("智能定价评估器未注入,跳过 DataVariant 格式化", {
682
+ productCount: products.length
683
+ });
684
+ return products;
685
+ }
686
+ const strategyContext = context.strategy_context || {};
687
+ const businessData = {
688
+ products,
689
+ scheduleDateTime: context.schedule_datetime || context.schedule_date,
690
+ scheduleList: context.scheduleList || [],
691
+ menuList: context.menuList || [],
692
+ customerId: context.customer_id,
693
+ channel: strategyContext.channel,
694
+ orderType: strategyContext.orderType || strategyContext.order_type,
695
+ businessCode: strategyContext.business_code ?? strategyContext.businessCode,
696
+ availableWalletIds: strategyContext.available_wallet_ids,
697
+ custom: strategyContext
698
+ };
699
+ const result = evaluator.resolveProducts(businessData);
700
+ this.lastScheduleTimePoints = Array.isArray(result == null ? void 0 : result.scheduleTimePoints) ? [...result.scheduleTimePoints] : [];
701
+ return Array.isArray(result == null ? void 0 : result.products) ? result.products : products;
702
+ };
703
+ const legacyPriceFormatter = (products, context) => {
650
704
  if (!context.priceData || context.priceData.length === 0) {
651
- console.log("[ProductsModule] 💰 没有价格数据,跳过价格应用");
705
+ console.log("[ProductsModule] 💰 没有价格数据,跳过 legacy 报价单价格应用");
652
706
  return products;
653
707
  }
654
- console.log(`[ProductsModule] 💰 应用价格数据到 ${products.length} 个商品`);
708
+ console.log(`[ProductsModule] 💰 应用 legacy 报价单价格到 ${products.length} 个商品`);
655
709
  return (0, import_product.applyPriceDataToProducts)(products, context.priceData);
656
710
  };
657
711
  const i18nFormatter = (products, context) => {
@@ -660,15 +714,34 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
660
714
  const detailValueFormatter = (products, context) => {
661
715
  return (0, import_product.applyDetailValueToProducts)(products, context);
662
716
  };
663
- this.formatters.unshift(priceFormatter);
717
+ if (this.isLegacyPriceFormatterEnabled) {
718
+ this.formatters.push(legacyPriceFormatter);
719
+ }
720
+ this.formatters.push(dataVariantFormatter);
664
721
  this.formatters.push(i18nFormatter);
665
722
  this.formatters.push(detailValueFormatter);
666
- this.isPriceFormatterRegistered = true;
667
- console.log("[ProductsModule] ✅ 内置价格格式化器已注册(第 1 个)");
723
+ this.isBuiltinFormatterRegistered = true;
724
+ console.log("[ProductsModule] ✅ 内置商品格式化器已注册(智能定价优先)");
725
+ }
726
+ /**
727
+ * 是否启用旧报价单价格 formatter。
728
+ *
729
+ * 默认关闭,避免报价单逻辑覆盖智能定价结果。
730
+ */
731
+ shouldEnableLegacyPriceFormatter() {
732
+ var _a, _b, _c;
733
+ return ((_a = this.otherParams) == null ? void 0 : _a.enableLegacyPriceFormatter) === true || ((_c = (_b = this.core) == null ? void 0 : _b.context) == null ? void 0 : _c.enableLegacyPriceFormatter) === true;
734
+ }
735
+ /**
736
+ * 返回最近一次 prepareProductsWithPrice / DataVariant 评估提取的变价时间点(HH:mm)。
737
+ * 供 OS Server 商品 query 订阅定时刷新使用。
738
+ */
739
+ getLastScheduleTimePoints() {
740
+ return [...this.lastScheduleTimePoints];
668
741
  }
669
742
  /**
670
743
  * 注册商品格式化器
671
- * 格式化器会按注册顺序依次执行(内置价格格式化器始终是第一个)
744
+ * 格式化器会按注册顺序依次执行;legacy 启用时先兜底报价,再由智能定价覆盖。
672
745
  * @param formatter 格式化函数
673
746
  * @param prepend 是否插入到队列开头(默认 false,追加到末尾)
674
747
  * @example
@@ -683,7 +756,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
683
756
  */
684
757
  registerFormatter(formatter, prepend = false) {
685
758
  if (prepend) {
686
- const insertIndex = this.isPriceFormatterRegistered ? 1 : 0;
759
+ const insertIndex = this.isBuiltinFormatterRegistered ? this.isLegacyPriceFormatterEnabled ? 2 : 1 : 0;
687
760
  this.formatters.splice(insertIndex, 0, formatter);
688
761
  console.log(`[ProductsModule] 📌 已在位置 ${insertIndex + 1} 插入格式化器,当前共 ${this.formatters.length} 个`);
689
762
  } else {
@@ -692,16 +765,17 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
692
765
  }
693
766
  }
694
767
  /**
695
- * 清空所有格式化器(包括内置价格格式化器)
696
- * @param keepBuiltin 是否保留内置价格格式化器(默认 true)
768
+ * 清空所有格式化器(包括内置智能定价格式化器)
769
+ * @param keepBuiltin 是否保留内置智能定价格式化器(默认 true)
697
770
  */
698
771
  clearFormatters(keepBuiltin = true) {
699
- if (keepBuiltin && this.isPriceFormatterRegistered) {
700
- this.formatters = [this.formatters[0]];
701
- console.log("[ProductsModule] 🧹 已清空自定义格式化器,保留内置价格格式化器");
772
+ if (keepBuiltin && this.isBuiltinFormatterRegistered) {
773
+ const builtinCount = this.isLegacyPriceFormatterEnabled ? 2 : 1;
774
+ this.formatters = this.formatters.slice(0, builtinCount);
775
+ console.log("[ProductsModule] 🧹 已清空自定义格式化器,保留内置智能定价格式化器");
702
776
  } else {
703
777
  this.formatters = [];
704
- this.isPriceFormatterRegistered = false;
778
+ this.isBuiltinFormatterRegistered = false;
705
779
  console.log("[ProductsModule] 🧹 已清空所有格式化器");
706
780
  }
707
781
  }
@@ -802,7 +876,8 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
802
876
  "resourceRelation",
803
877
  "bundleGroup.bundleItem",
804
878
  "optionGroup.optionItem",
805
- "variantGroup.variantItem"
879
+ "variantGroup.variantItem",
880
+ "dataVariants"
806
881
  ],
807
882
  open_deposit: 1,
808
883
  is_append_product_description: 1,
@@ -860,6 +935,26 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
860
935
  (0, import_product.perfMark)("ProductsModule.getProducts(structuredClone)", performance.now() - t0, { count: result.length });
861
936
  return result;
862
937
  }
938
+ /**
939
+ * 批量获取商品轻量快照,供订单详情等响应补齐展示协议字段。
940
+ */
941
+ async getProductSnapshotsByIds(ids) {
942
+ const snapshots = {};
943
+ const seen = /* @__PURE__ */ new Set();
944
+ for (const id of ids) {
945
+ if (!Number.isFinite(id) || seen.has(id))
946
+ continue;
947
+ seen.add(id);
948
+ const product = this.store.map.get(id);
949
+ if (!product)
950
+ continue;
951
+ snapshots[String(id)] = {
952
+ cover: product.cover,
953
+ holder_config: product.holder_config
954
+ };
955
+ }
956
+ return snapshots;
957
+ }
863
958
  /**
864
959
  * 内部获取商品列表的直接引用(无拷贝)
865
960
  * 仅供内部 formatter 流程使用,因为 formatter 会创建新对象
@@ -1227,7 +1322,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
1227
1322
  * Server 层监听该事件后对变更商品增量执行 prepareProductsWithPrice 并更新缓存
1228
1323
  */
1229
1324
  async processProductSyncMessages() {
1230
- var _a, _b, _c, _d, _e, _f;
1325
+ var _a, _b, _c, _d, _e, _f, _g;
1231
1326
  const messages = [...this.pendingSyncMessages];
1232
1327
  this.pendingSyncMessages = [];
1233
1328
  if (messages.length === 0)
@@ -1281,6 +1376,10 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
1281
1376
  if ((_f = msg.relation_product_ids) == null ? void 0 : _f.length) {
1282
1377
  sseRefreshIds.push(...msg.relation_product_ids);
1283
1378
  }
1379
+ } else if (["product_data_variant"].includes(channelKey)) {
1380
+ if ((_g = msg.product_ids) == null ? void 0 : _g.length) {
1381
+ sseRefreshIds.push(...msg.product_ids);
1382
+ }
1284
1383
  }
1285
1384
  }
1286
1385
  const uniqueDeleteIds = [...new Set(deleteIds)];
@@ -28,6 +28,10 @@ export interface ProductIdScope {
28
28
  /** 指定商品集合 ID */
29
29
  collectionIds?: number[];
30
30
  }
31
+ export interface ProductSnapshot {
32
+ cover?: ProductData['cover'];
33
+ holder_config?: ProductData['holder_config'];
34
+ }
31
35
  /**
32
36
  * 加载报价单商品价格参数
33
37
  */
@@ -110,6 +114,8 @@ export interface ProductSyncMessage {
110
114
  change_types?: string[];
111
115
  /** 关联商品 ID(product_collection / product_category / product_quotation 变更时携带) */
112
116
  relation_product_ids?: number[];
117
+ /** 关联商品 ID(product_data_variant 变更时携带) */
118
+ product_ids?: number[];
113
119
  message_uuid?: string;
114
120
  timestamp?: string;
115
121
  /** 内部标记:来源频道 key */
@@ -124,6 +130,18 @@ export interface ProductFormatterContext {
124
130
  customer_id?: number | string;
125
131
  priceData?: LoadProductsPriceData[];
126
132
  scheduleModule?: any;
133
+ /** 全量餐牌列表,供智能定价 menu_match 等条件判断使用 */
134
+ menuList?: any[];
135
+ /** 全量日程列表,供智能定价 schedule_match 等条件判断使用 */
136
+ scheduleList?: any[];
137
+ /** 外部传入的策略上下文,仅承载定价条件,不参与商品集合筛选 */
138
+ strategy_context?: Record<string, any>;
139
+ /** 智能定价评估器,由宿主统一注入到 PisellOS context */
140
+ dataVariantEvaluator?: {
141
+ resolveProducts: (businessData: any) => {
142
+ products: ProductData[];
143
+ };
144
+ };
127
145
  locale?: string;
128
146
  }
129
147
  /**
@@ -2,7 +2,7 @@ import { Module, ModuleOptions, PisellCore } from '../../types';
2
2
  import { BaseModule } from '../../modules/BaseModule';
3
3
  import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult } from './types';
4
4
  import { OrderModule } from '../../modules/Order';
5
- import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from '../../modules/Order/types';
5
+ import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from '../../modules/Order/types';
6
6
  import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
7
7
  import type { Discount } from '../../modules/Discount/types';
8
8
  import { RequestPlugin, WindowPlugin } from '../../plugins';
@@ -24,6 +24,19 @@ export interface BaseSalesState {
24
24
  schedule?: ScheduleModule;
25
25
  quotation?: QuotationModule;
26
26
  }
27
+ export interface BaseSalesUpdateOrderPaymentOptions extends OrderPaymentUpdateOptions {
28
+ persistDraft?: boolean;
29
+ submitWhenPaid?: boolean;
30
+ forceSubmitIfPaid?: boolean;
31
+ /** 草稿恢复时,允许将新回调字段合并进已 paid 的支付项。 */
32
+ applyUpdatesWhenPaid?: boolean;
33
+ smallTicketDataFlag?: number;
34
+ }
35
+ export interface BaseSalesUpdateOrderPaymentResult extends OrderPaymentUpdateResult {
36
+ draftResult?: unknown;
37
+ draftError?: unknown;
38
+ syncResult?: SyncPaymentsToOrderResult<any>;
39
+ }
27
40
  export type BaseSalesPrintLocalOrderReceiptParams = string | number;
28
41
  export declare class BaseSalesImpl extends BaseModule implements Module {
29
42
  protected defaultName: string;
@@ -49,9 +62,13 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
49
62
  private queuedAutoPaymentSync;
50
63
  private autoPaymentSyncFlushing;
51
64
  private autoPaymentSyncTimer;
52
- private salesDetailLoadInFlight;
65
+ private salesDetailLoadInFlightCount;
66
+ private salesDetailLoadSequence;
67
+ private salesDetailHydrateQueue;
53
68
  private serverOrderChangeUnsubscribe;
54
69
  private serverOrderChangeHydrateInFlight;
70
+ private queuedServerOrderChanges;
71
+ private serverOrderChangeSyncEnabled;
55
72
  constructor(name?: string, version?: string);
56
73
  /**
57
74
  * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -73,8 +90,12 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
73
90
  */
74
91
  private logError;
75
92
  private isCurrentSalesOrderRecord;
93
+ setServerOrderChangeSyncEnabled(enabled: boolean): void;
94
+ private queueLatestServerOrderChange;
95
+ private drainQueuedServerOrderChanges;
76
96
  private syncCurrentSalesDetailFromServerOrderChange;
77
97
  private registerServerOrderChangeSync;
98
+ private hydrateLatestLoadedSalesDetail;
78
99
  private hydrateOrderPaymentNames;
79
100
  get payment(): PaymentModule | undefined;
80
101
  private getCurrentOrderCustomerId;
@@ -120,6 +141,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
120
141
  */
121
142
  protected readSessionCacheData(): Record<string, any>;
122
143
  protected getAppData<T>(key: string): T | undefined;
144
+ private getPaymentNumberDevicePrefixSync;
145
+ private getPaymentNumberDevicePrefixAsync;
123
146
  private syncAppDataToTempOrder;
124
147
  initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
125
148
  destroy(): Promise<void>;
@@ -185,12 +208,24 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
185
208
  }): Promise<{
186
209
  productList: Record<string, any>[];
187
210
  discountList: Discount[];
211
+ availableWalletIds: number[];
188
212
  }>;
213
+ getAvailableWalletIds(): number[];
189
214
  bestDiscount(cb?: (result: any) => void): Promise<{
190
215
  productList: Record<string, any>[];
191
216
  discountList: Discount[];
192
217
  }>;
193
218
  getDiscountList(): Discount[];
219
+ /** 读取 Discount 模块原始券列表(未经过 bookingTime 等过滤)。 */
220
+ getOriginalDiscountList(): Discount[];
221
+ /**
222
+ * 同步写入 Discount 模块的 discountList / originalDiscountList。
223
+ * 供 Holder 补全等场景在 OS store 层更新 machinecode holder 字段。
224
+ */
225
+ replaceDiscountStoreLists(params: {
226
+ discountList: Discount[];
227
+ originalDiscountList?: Discount[];
228
+ }): Promise<void>;
194
229
  scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
195
230
  setDiscountSelected(params: {
196
231
  discountId: number;
@@ -220,6 +255,13 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
220
255
  confirmPendingVoucherPayments?: boolean;
221
256
  enhancePayload?: SubmitPayloadEnhancer;
222
257
  }): Promise<T>;
258
+ saveSalesOrderDraft<T = any>(params?: {
259
+ platform?: string;
260
+ businessCode?: string;
261
+ channel?: string;
262
+ type?: string;
263
+ enhancePayload?: SubmitPayloadEnhancer;
264
+ }): Promise<T>;
223
265
  submitTempOrderAsync<T = any>(params?: {
224
266
  payments?: OrderPaymentSource[];
225
267
  paymentStatus?: BaseSalesPaymentStatus;
@@ -238,16 +280,24 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
238
280
  private queueLatestAutoPaymentSync;
239
281
  private scheduleQueuedAutoPaymentSyncFlush;
240
282
  private flushQueuedAutoPaymentSync;
241
- /** 追加单个支付项到当前订单。 */
283
+ /**
284
+ * 同步兼容入口。无法等待 IoT 短号时,按调用当下的 device_id 或 LOCAL 生成。
285
+ */
242
286
  addOrderPayment(payment: OrderPaymentSource): OrderPaymentData[];
287
+ /** 创建新支付项时读取最新设备短号,不缓存运行时设备信息。 */
288
+ addOrderPaymentAsync(payment: OrderPaymentSource): Promise<OrderPaymentData[]>;
289
+ private addOrderPaymentWithDevicePrefix;
243
290
  /** 更新当前订单中的指定支付项。 */
244
- updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>): OrderPaymentData[];
291
+ updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>, options?: BaseSalesUpdateOrderPaymentOptions): Promise<BaseSalesUpdateOrderPaymentResult>;
245
292
  /** 删除当前订单中的指定支付项。 */
246
293
  deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
247
294
  /** 覆盖 wallet pass 支付项,同时保留普通支付项。 */
248
295
  updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
249
296
  status?: 'paid' | 'payment_pending';
250
297
  }): OrderPaymentData[];
298
+ updateVoucherOrderPaymentsAsync(payments: OrderPaymentSource[], options?: {
299
+ status?: 'paid' | 'payment_pending';
300
+ }): Promise<OrderPaymentData[]>;
251
301
  confirmPendingVoucherPayments(): OrderPaymentData[];
252
302
  discardPendingVoucherPayments(): OrderPaymentData[];
253
303
  private getWalletProductList;