@pisell/pisellos 2.2.264 → 2.2.266

package/dist/solution/BaseSales/types.d.ts

@@ -1,3 +1,4 @@
+import type { Discount } from '../../modules/Discount/types';
 import { OrderModule, ProductList, QuotationModule, SalesSummaryModule, ScanOrderLoggerModule as BaseSalesLoggerModule, ScheduleModule } from '../../modules';
 import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderConfig as BaseSalesLoggerProviderConfig, ScanOrderLoggerProviderType as BaseSalesLoggerProviderType } from '../../modules/ScanOrderLogger/types';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
@@ -85,6 +86,8 @@ export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
     booking_uid?: string;
     /** 多语言商品标题快照，随 tempOrder 提交到 checkout。 */
     product_title?: BaseSalesLocalizedText;
+    /** 商品封面图快照，随 tempOrder 提交到 checkout。 */
+    product_cover?: string;
     /**
      * 行级扩展 metadata。价格相关的权威字段：
      *
@@ -381,9 +384,11 @@ export interface BaseSalesLoggerRuntimeConfig {
 }
 export interface BaseSalesAddLogParams extends BaseSalesLogInput {
 }
-/** BaseSales.scanPromotionCode 对外的轻量结果（不含 discountList，UI 在 resolve 后调 getDiscountList） */
+/** BaseSales.scanPromotionCode 对外的轻量结果（UI 可用 getDiscountList 或 scannedDiscountList 补 Holder） */
 export interface BaseSalesScanCodeResult {
     isAvailable: boolean;
     type?: 'server' | string;
     unavailableReason?: 'time_limit' | string;
+    /** batchSearch 原始结果；isAvailable=false 时 discountList 可能未写入 store，Holder 补全需读此字段 */
+    scannedDiscountList?: Discount[];
 }

package/dist/solution/BaseSales/types.js

@@ -37,4 +37,4 @@ export function createBaseSalesHook(moduleName, hookName) {
 
 /** `/order/resource/occupy-detail` 单条 `occupy_details[i]` */
 
-/** BaseSales.scanPromotionCode 对外的轻量结果（不含 discountList，UI 在 resolve 后调 getDiscountList） */
+/** BaseSales.scanPromotionCode 对外的轻量结果（UI 可用 getDiscountList 或 scannedDiscountList 补 Holder） */

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

@@ -287,9 +287,10 @@ export function mergeIdenticalPromotionCartLines(products) {
       var unitPrice = String((_ref2 = (_line$metadata$source = (_line$metadata2 = line.metadata) === null || _line$metadata2 === void 0 ? void 0 : _line$metadata2.source_product_price) !== null && _line$metadata$source !== void 0 ? _line$metadata$source : line.selling_price) !== null && _ref2 !== void 0 ? _ref2 : '');
       var promoUnitPrice = String((_ref3 = (_promotion$finalPrice = promotion.finalPrice) !== null && _promotion$finalPrice !== void 0 ? _promotion$finalPrice : (_line$metadata3 = line.metadata) === null || _line$metadata3 === void 0 ? void 0 : _line$metadata3.main_product_selling_price) !== null && _ref3 !== void 0 ? _ref3 : '');
       var noteSignature = getProductLineNoteSignature(line);
+      var lineMergeBoundary = getPromotionLineMergeBoundary(line);
       var bookingUid = (_line$booking_uid = line === null || line === void 0 ? void 0 : line.booking_uid) !== null && _line$booking_uid !== void 0 ? _line$booking_uid : line === null || line === void 0 || (_line$metadata4 = line.metadata) === null || _line$metadata4 === void 0 ? void 0 : _line$metadata4.booking_uid;
       var orderDetailId = (_line$order_detail_id = line === null || line === void 0 ? void 0 : line.order_detail_id) !== null && _line$order_detail_id !== void 0 ? _line$order_detail_id : line === null || line === void 0 ? void 0 : line.orderDetailId;
-      var mergeKey = [line.product_id, (_line$product_variant = line.product_variant_id) !== null && _line$product_variant !== void 0 ? _line$product_variant : 0, fingerprint, noteSignature, bookingUid ? String(bookingUid) : '', orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '' ? String(orderDetailId) : '', promotion.strategyId, unitPrice, promoUnitPrice].join('#');
+      var mergeKey = [line.product_id, (_line$product_variant = line.product_variant_id) !== null && _line$product_variant !== void 0 ? _line$product_variant : 0, fingerprint, noteSignature, lineMergeBoundary, bookingUid ? String(bookingUid) : '', orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '' ? String(orderDetailId) : '', promotion.strategyId, unitPrice, promoUnitPrice].join('#');
       var hitIndex = indexByKey.get(mergeKey);
       if (hitIndex === undefined) {
         indexByKey.set(mergeKey, merged.length);
@@ -465,6 +466,16 @@ function getProductLineNoteSignature(product) {
   var uid = getOrderProductUid(product);
   return uid ? "note:".concat(uid) : "note:".concat(normalizedNote);
 }
+
+/**
+ * 编辑订单时，历史行仍参与整车促销评估，但不能与本次新增行合并。
+ * 以历史行 uid 作为促销前后的行边界；新增行返回空边界，仍保留原有合并语义。
+ */
+function getPromotionLineMergeBoundary(product) {
+  var _product$metadata3;
+  if ((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.is_edit_for_runtime) !== true) return '';
+  return "edit:".concat(getOrderProductUid(product));
+}
 function isPersistedGeneratedVoucher(product) {
   var _product$order_detail;
   var orderDetailId = (_product$order_detail = product === null || product === void 0 ? void 0 : product.order_detail_id) !== null && _product$order_detail !== void 0 ? _product$order_detail : product === null || product === void 0 ? void 0 : product.orderDetailId;
@@ -505,17 +516,18 @@ export function buildConsolidateKeyForPromotion(item) {
   var _item$booking_uid, _item$metadata4, _item$order_detail_id, _item$product_variant3;
   var fingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
   var noteSignature = getProductLineNoteSignature(item);
+  var lineMergeBoundary = getPromotionLineMergeBoundary(item);
   var bookingUid = (_item$booking_uid = item === null || item === void 0 ? void 0 : item.booking_uid) !== null && _item$booking_uid !== void 0 ? _item$booking_uid : item === null || item === void 0 || (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.booking_uid;
   var orderDetailId = (_item$order_detail_id = item === null || item === void 0 ? void 0 : item.order_detail_id) !== null && _item$order_detail_id !== void 0 ? _item$order_detail_id : item === null || item === void 0 ? void 0 : item.orderDetailId;
   if (orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '') {
     var _item$product_variant;
-    return [item.product_id, (_item$product_variant = item.product_variant_id) !== null && _item$product_variant !== void 0 ? _item$product_variant : 0, fingerprint, noteSignature, String(orderDetailId)].join('#');
+    return [item.product_id, (_item$product_variant = item.product_variant_id) !== null && _item$product_variant !== void 0 ? _item$product_variant : 0, fingerprint, noteSignature, lineMergeBoundary, String(orderDetailId)].join('#');
   }
   if (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '') {
     var _item$product_variant2;
-    return [item.product_id, (_item$product_variant2 = item.product_variant_id) !== null && _item$product_variant2 !== void 0 ? _item$product_variant2 : 0, fingerprint, noteSignature, String(bookingUid)].join('#');
+    return [item.product_id, (_item$product_variant2 = item.product_variant_id) !== null && _item$product_variant2 !== void 0 ? _item$product_variant2 : 0, fingerprint, noteSignature, lineMergeBoundary, String(bookingUid)].join('#');
   }
-  return [item.product_id, (_item$product_variant3 = item.product_variant_id) !== null && _item$product_variant3 !== void 0 ? _item$product_variant3 : 0, fingerprint, noteSignature].join('#');
+  return [item.product_id, (_item$product_variant3 = item.product_variant_id) !== null && _item$product_variant3 !== void 0 ? _item$product_variant3 : 0, fingerprint, noteSignature, lineMergeBoundary].join('#');
 }
 function consolidateMainProductsForPromotion(entries) {
   if (!Array.isArray(entries) || entries.length <= 1) {
@@ -886,13 +898,13 @@ export function resolveStrategyEligibleProducts(matched) {
 export function calculateUnfulfilledPromotions(processedProducts, applicableStrategiesResult, mainProducts) {
   var unfulfilledMap = new Map();
   var _loop2 = function _loop2() {
-      var _product$metadata3, _ref13, _product$_originalPro, _product$metadata4, _product$num2;
+      var _product$metadata4, _ref13, _product$_originalPro, _product$metadata5, _product$num2;
       var product = processedProducts[i];
-      var promotion = product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3._promotion;
+      var promotion = product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4._promotion;
       if (!promotion || promotion.inPromotion !== false) return 0; // continue
       var strategyId = promotion.strategyId;
       if (!strategyId) return 0; // continue
-      var lookupUid = String((_ref13 = (_product$_originalPro = product === null || product === void 0 ? void 0 : product._originalProductUid) !== null && _product$_originalPro !== void 0 ? _product$_originalPro : product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.unique_identification_number) !== null && _ref13 !== void 0 ? _ref13 : '');
+      var lookupUid = String((_ref13 = (_product$_originalPro = product === null || product === void 0 ? void 0 : product._originalProductUid) !== null && _product$_originalPro !== void 0 ? _product$_originalPro : product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) !== null && _ref13 !== void 0 ? _ref13 : '');
       var originalIndex = mainProducts.findIndex(function (item) {
         return getOrderProductUid(item) === lookupUid;
       });

package/dist/solution/BaseSales/utils/parseSalesResponse.d.ts

@@ -2,7 +2,7 @@
  * 把 `/order/sales/{id}` 响应（OrderData）解析为 ISalesDetail。
  *
  * - 纯函数：不依赖任何运行时模块/插件，便于单测与 view-model 适配
- * - products 保留 tempOrder / 后端详情原字段，仅做浅拷贝，避免丢失 product_sku 等协议字段
+ * - products 保留 tempOrder / 后端详情原字段，仅规范化集合身份并浅拷贝，避免丢失 product_sku 等协议字段
  * - bookings 平铺保留服务端原顺序，同时输出 byProductUid 反查表与 rootBooking
  * - header 收敛"非数组顶层字段"，便于 ticketBooking view-model 直接消费
  *
@@ -82,8 +82,13 @@ export interface ISalesBooking {
     metadata?: Record<string, any> | null;
     [key: string]: any;
 }
+export interface ISalesPaymentMetadata extends Record<string, any> {
+    /** 刷卡机设备快照；OS 不解析内部字段 */
+    card_reader_snapshot?: Record<string, unknown>;
+}
 export interface ISalesPayment {
     order_payment_id?: number | null;
+    payment_number?: string;
     custom_payment_id?: number;
     code?: string;
     name?: string;
@@ -95,7 +100,7 @@ export interface ISalesPayment {
     status?: string;
     payment_time?: string | null;
     service_charge?: Record<string, any> | null;
-    metadata?: Record<string, any> | null;
+    metadata?: ISalesPaymentMetadata | null;
     [key: string]: any;
 }
 export interface ISalesSurcharge {
@@ -130,7 +135,7 @@ export interface ISalesDetail {
     customer: ISalesDetailCustomer | null;
     /** 服务端 summary（仅输出） */
     summary: Record<string, any>;
-    /** 原始响应快照，方便 UI 兜底使用 */
+    /** 规范化后的响应快照，方便 UI 兜底使用 */
     raw: Record<string, any>;
 }
 /**
@@ -138,7 +143,7 @@ export interface ISalesDetail {
  *
  * 注意：
  * - 入参允许是 `{ data: OrderData }` 或直接 `OrderData`，自动识别。
- * - products 保留原字段；字段补齐由 OrderModule hydrate 负责。
+ * - products/bookings/payments 在此补齐集合身份；其余 runtime 字段由 OrderModule hydrate 负责。
  * - 不做远程请求；不修改入参；返回新对象。
  */
 export declare function parseSalesResponse(input: Record<string, any> | null | undefined): ISalesDetail;

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

@@ -11,7 +11,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
  * 把 `/order/sales/{id}` 响应（OrderData）解析为 ISalesDetail。
  *
  * - 纯函数：不依赖任何运行时模块/插件，便于单测与 view-model 适配
- * - products 保留 tempOrder / 后端详情原字段，仅做浅拷贝，避免丢失 product_sku 等协议字段
+ * - products 保留 tempOrder / 后端详情原字段，仅规范化集合身份并浅拷贝，避免丢失 product_sku 等协议字段
  * - bookings 平铺保留服务端原顺序，同时输出 byProductUid 反查表与 rootBooking
  * - header 收敛"非数组顶层字段"，便于 ticketBooking view-model 直接消费
  *
@@ -23,6 +23,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
  * - 不在此处发明等价关系；UI 侧（ticketBooking）若需要别的字段，由 view-model 适配层做转换
  */
 
+import { normalizeOrderCollections } from "../../../modules/Order/utils/orderCollectionIdentity";
 /** OrderData 中除大数组外的"顶层 header 字段"白名单，按需扩展。 */
 var HEADER_KEYS = ['order_id', 'order_number', 'shop_order_number', 'shop_full_order_number', 'type', 'business_code', 'platform', 'sales_channel', 'order_sales_channel', 'vouchers', 'status', 'payment_status', 'shipping_status', 'customer_id', 'customer_name', 'country_calling_code', 'phone', 'email', 'is_price_include_tax', 'tax_title', 'tax_country_code', 'currency_code', 'currency_symbol', 'currency_format', 'is_deposit', 'deposit_amount', 'shop_discount', 'surcharge_fee', 'note', 'schedule_date', 'created_at', 'updated_at', 'metadata', 'total_amount', 'shop_id', 'create_date', 'holder', 'relation_forms', 'contacts', 'contacts_info'];
 function pickHeader(raw) {
@@ -108,19 +109,16 @@ function indexBookingsByProductUid(bookings) {
  *
  * 注意：
  * - 入参允许是 `{ data: OrderData }` 或直接 `OrderData`，自动识别。
- * - products 保留原字段；字段补齐由 OrderModule hydrate 负责。
+ * - products/bookings/payments 在此补齐集合身份；其余 runtime 字段由 OrderModule hydrate 负责。
  * - 不做远程请求；不修改入参；返回新对象。
  */
 export function parseSalesResponse(input) {
-  var raw = input && _typeof(input) === 'object' && input.data && input.order_id == null ? input.data : input || {};
+  var sourceRaw = input && _typeof(input) === 'object' && input.data && input.order_id == null ? input.data : input || {};
+  var raw = normalizeOrderCollections(sourceRaw).order;
   var productsRaw = Array.isArray(raw === null || raw === void 0 ? void 0 : raw.products) ? raw.products : [];
-  var products = productsRaw.map(function (p, index) {
+  var products = productsRaw.map(function (p) {
     var row = _objectSpread({}, p || {});
     var metadata = row.metadata && _typeof(row.metadata) === 'object' ? _objectSpread({}, row.metadata) : {};
-    if (!metadata.unique_identification_number) {
-      var _row$product_id, _row$product_variant_;
-      metadata.unique_identification_number = "sales-product-".concat((_row$product_id = row.product_id) !== null && _row$product_id !== void 0 ? _row$product_id : 'unknown', "-").concat((_row$product_variant_ = row.product_variant_id) !== null && _row$product_variant_ !== void 0 ? _row$product_variant_ : 0, "-").concat(index);
-    }
     delete metadata.price_schema_version;
     delete row.identity_key;
     return _objectSpread(_objectSpread({}, row), {}, {

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

@@ -30,6 +30,17 @@ function toPriceString(value) {
   if (!Number.isFinite(parsedValue)) return fallback;
   return parsedValue.toFixed(2);
 }
+function isBlankValue(value) {
+  return value === undefined || value === null || typeof value === 'string' && value.trim() === '';
+}
+function firstNonBlank() {
+  for (var _len = arguments.length, values = new Array(_len), _key = 0; _key < _len; _key++) {
+    values[_key] = arguments[_key];
+  }
+  return values.find(function (value) {
+    return !isBlankValue(value);
+  });
+}
 function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems)) return [];
   return optionItems.map(function (optionItem) {
@@ -166,7 +177,8 @@ export function transformBaseProductToOrderProduct(params) {
     source_product_price: sourceProductPrice,
     main_product_selling_price: mainProductSellingPrice,
     main_product_original_price: mainProductOriginalPrice,
-    price_schema_version: 2
+    price_schema_version: 2,
+    holder_config: sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.holder_config
   }, hasPriceOverride ? {
     price_override: String(payload.price_override),
     is_manual_discount: 1
@@ -198,6 +210,7 @@ export function transformBaseProductToOrderProduct(params) {
     metadata: metadata,
     note: payload.note != null ? String(payload.note) : '',
     product_title: productTitle,
+    product_cover: firstNonBlank(matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.cover, sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.cover),
     _origin: _objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
       callbackData: payload
     })

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

package/dist/solution/BookingTicket/index.js

@@ -1,8 +1,8 @@
 var _excluded = ["id"],
   _excluded2 = ["product_id"],
   _excluded3 = ["product_id"];
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
@@ -397,49 +397,52 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
+              // 业务码切换或配置失败时不能复用上一次初始化的短号。
+              this.setPaymentNumberDevicePrefix(null);
               openDataConfig = null;
-              _context5.prev = 1;
-              _context5.next = 4;
+              _context5.prev = 2;
+              _context5.next = 5;
               return this.loadOpenDataConfig();
-            case 4:
+            case 5:
               openDataConfig = _context5.sent;
-              _context5.next = 11;
+              _context5.next = 12;
               break;
-            case 7:
-              _context5.prev = 7;
-              _context5.t0 = _context5["catch"](1);
+            case 8:
+              _context5.prev = 8;
+              _context5.t0 = _context5["catch"](2);
               console.warn('[BookingTicket] OpenData 配置加载失败，跳过 idGenerator 配置', _context5.t0);
               return _context5.abrupt("return");
-            case 11:
+            case 12:
               // if (!openDataConfig) return;
               idGenerator = this.getIdGeneratorPlugin();
               if (idGenerator !== null && idGenerator !== void 0 && idGenerator.configure) {
-                _context5.next = 15;
+                _context5.next = 16;
                 break;
               }
               console.warn('[BookingTicket] idGenerator 插件不可用，跳过配置');
               return _context5.abrupt("return");
-            case 15:
+            case 16:
               receiptSequenceLength = this.normalizePositiveInteger((_openDataConfig = openDataConfig) === null || _openDataConfig === void 0 ? void 0 : _openDataConfig['sale.short_number_digits'], 5);
               receiptSequenceStart = this.normalizePositiveInteger((_openDataConfig2 = openDataConfig) === null || _openDataConfig2 === void 0 ? void 0 : _openDataConfig2['sale.short_number_start_number'], 1);
               prefix = this.normalizeIdPrefix((_openDataConfig3 = openDataConfig) === null || _openDataConfig3 === void 0 ? void 0 : _openDataConfig3['sale.short_number_prefix'], '');
               shopOrderPrefix = this.normalizeIdPrefix((_openDataConfig4 = openDataConfig) === null || _openDataConfig4 === void 0 ? void 0 : _openDataConfig4['sale.sale_number_prefix'], '');
               resetReceiptSequenceDaily = typeof ((_openDataConfig5 = openDataConfig) === null || _openDataConfig5 === void 0 ? void 0 : _openDataConfig5['sale.short_number_daily_reset']) === 'boolean' ? (_openDataConfig6 = openDataConfig) === null || _openDataConfig6 === void 0 ? void 0 : _openDataConfig6['sale.short_number_daily_reset'] : false;
               operatingDayBoundary = this.getAppData('operating_day_boundary');
-              _context5.next = 23;
+              _context5.next = 24;
               return this.getShortNumberOrDeviceId();
-            case 23:
+            case 24:
               deviceId = _context5.sent;
+              this.setPaymentNumberDevicePrefix(deviceId);
               businessCode = this.getBookingTicketBusinessCode();
               if (businessCode) {
-                _context5.next = 28;
+                _context5.next = 30;
                 break;
               }
               console.warn('[BookingTicket] businessCode 缺失，跳过 idGenerator 配置');
               return _context5.abrupt("return");
-            case 28:
-              _context5.prev = 28;
-              _context5.next = 31;
+            case 30:
+              _context5.prev = 30;
+              _context5.next = 33;
               return idGenerator.configure({
                 biz: businessCode,
                 config: {
@@ -454,18 +457,18 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                   shopOrderPrefix: shopOrderPrefix
                 }
               });
-            case 31:
-              _context5.next = 36;
-              break;
             case 33:
-              _context5.prev = 33;
-              _context5.t1 = _context5["catch"](28);
+              _context5.next = 38;
+              break;
+            case 35:
+              _context5.prev = 35;
+              _context5.t1 = _context5["catch"](30);
               console.warn('[BookingTicket] idGenerator 配置失败', _context5.t1);
-            case 36:
+            case 38:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[1, 7], [28, 33]]);
+        }, _callee5, this, [[2, 8], [30, 35]]);
       }));
       function configureIdGeneratorFromOpenData() {
         return _configureIdGeneratorFromOpenData.apply(this, arguments);
@@ -549,7 +552,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "scanPromotionCode",
     value: function () {
       var _scanPromotionCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(code, customerId) {
-        var raw;
+        var raw, scannedList, extractedCustomerId, hasOrderCustomer, tempOrder;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -563,26 +566,42 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               return this.store.order.scanCode(code, customerId);
             case 4:
               raw = _context7.sent;
-              if (!raw.isAvailable) {
+              scannedList = raw.scannedDiscountList || [];
+              extractedCustomerId = this.getDiscountCustomerId(scannedList);
+              hasOrderCustomer = Boolean(this.store.order.getOrderCustomer()); // 缺 Holder 等场景 isAvailable=false，但仍需把 Pass 归属客户带入订单，供 Holder 弹窗使用。
+              if (!(!hasOrderCustomer && extractedCustomerId)) {
                 _context7.next = 11;
                 break;
               }
-              _context7.next = 8;
-              return this.hydrateOrderCustomerFromScanDiscounts(raw.scannedDiscountList || []);
-            case 8:
-              _context7.next = 10;
+              _context7.next = 11;
+              return this.hydrateOrderCustomerFromScanDiscounts(scannedList);
+            case 11:
+              if (!raw.isAvailable) {
+                _context7.next = 18;
+                break;
+              }
+              _context7.next = 14;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 10:
+            case 14:
               this.store.order.persistTempOrder();
-            case 11:
+              tempOrder = this.store.order.ensureTempOrder();
+              _context7.next = 18;
+              return this.effectsEmit('onDiscountApplied', {
+                productList: tempOrder.products || [],
+                discountList: this.store.order.getDiscountList(),
+                selectedDiscountList: tempOrder.discount_list || [],
+                tempOrder: tempOrder
+              });
+            case 18:
               return _context7.abrupt("return", {
                 isAvailable: raw.isAvailable,
                 type: raw.type,
-                unavailableReason: raw.unavailableReason
+                unavailableReason: raw.unavailableReason,
+                scannedDiscountList: raw.scannedDiscountList
               });
-            case 12:
+            case 19:
             case "end":
               return _context7.stop();
           }
@@ -641,12 +660,22 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "getDiscountCustomerId",
     value: function getDiscountCustomerId(discounts) {
-      var discount = discounts.find(function (item) {
-        return item.customer_id != null;
-      });
-      var customerId = Number(discount === null || discount === void 0 ? void 0 : discount.customer_id);
-      if (!Number.isFinite(customerId) || customerId <= 0) return null;
-      return customerId;
+      var _iterator = _createForOfIteratorHelper(discounts),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var item = _step.value;
+          var topLevelId = Number(item.customer_id);
+          if (Number.isFinite(topLevelId) && topLevelId > 0) {
+            return topLevelId;
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return null;
     }
   }, {
     key: "resolveCustomerByDiscountCustomerId",
@@ -1501,7 +1530,15 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       void this.store.order.recalculateSummary({
         createIfMissing: true
       }).then(function () {
-        return _this3.store.order.persistTempOrder();
+        var _discountModule$getDi;
+        var tempOrder = _this3.store.order.ensureTempOrder();
+        _this3.store.order.persistTempOrder();
+        return _this3.effectsEmit('onDiscountApplied', {
+          productList: tempOrder.products || [],
+          discountList: (discountModule === null || discountModule === void 0 || (_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [],
+          selectedDiscountList: tempOrder.discount_list || [],
+          tempOrder: tempOrder
+        });
       }).catch(function (error) {
         console.error('Failed to recalculate summary after clearing customer:', error);
       });
@@ -1959,7 +1996,8 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "getBookingConfig",
     value: function getBookingConfig() {
-      return this.store.bookingContext.getBookingConfig();
+      var _this$store$bookingCo;
+      return (_this$store$bookingCo = this.store.bookingContext) === null || _this$store$bookingCo === void 0 ? void 0 : _this$store$bookingCo.getBookingConfig();
     }
 
     /** 写入资源全集（来源：`/form/schedule`），同步派生 resourcesOriginMap。 */
@@ -2468,7 +2506,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       var _addAddTimeProductsToBooking = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(input) {
         var _this7 = this,
           _input$bookingPatch;
-        var bookingUid, orderLines, coveredMinutes, bookingTimePatch, result, _iterator, _step, line;
+        var bookingUid, orderLines, coveredMinutes, bookingTimePatch, result, _iterator2, _step2, line;
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
@@ -2508,15 +2546,15 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               }));
             case 11:
               result = [];
-              _iterator = _createForOfIteratorHelper(orderLines);
+              _iterator2 = _createForOfIteratorHelper(orderLines);
               _context30.prev = 13;
-              _iterator.s();
+              _iterator2.s();
             case 15:
-              if ((_step = _iterator.n()).done) {
+              if ((_step2 = _iterator2.n()).done) {
                 _context30.next = 29;
                 break;
               }
-              line = _step.value;
+              line = _step2.value;
               _context30.t0 = result.splice;
               _context30.t1 = result;
               _context30.t2 = [0, result.length];
@@ -2537,10 +2575,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case 31:
               _context30.prev = 31;
               _context30.t7 = _context30["catch"](13);
-              _iterator.e(_context30.t7);
+              _iterator2.e(_context30.t7);
             case 34:
               _context30.prev = 34;
-              _iterator.f();
+              _iterator2.f();
               return _context30.finish(34);
             case 37:
               return _context30.abrupt("return", result);
@@ -2567,16 +2605,18 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           while (1) switch (_context31.prev = _context31.next) {
             case 0:
               _ref19 = _args31.length > 1 && _args31[1] !== undefined ? _args31[1] : {}, _ref19$cover = _ref19.cover, cover = _ref19$cover === void 0 ? false : _ref19$cover;
-              _get(_getPrototypeOf(BookingTicketImpl.prototype), "setOtherParams", this).call(this, params, {
+              _context31.next = 3;
+              return _get(_getPrototypeOf(BookingTicketImpl.prototype), "setOtherParams", this).call(this, params, {
                 cover: cover
               });
-              if (!(params !== null && params !== void 0 && params.businessCode)) {
-                _context31.next = 5;
+            case 3:
+              if (!((params === null || params === void 0 ? void 0 : params.businessCode) !== undefined || (params === null || params === void 0 ? void 0 : params.business_code) !== undefined)) {
+                _context31.next = 6;
                 break;
               }
-              _context31.next = 5;
+              _context31.next = 6;
               return this.configureIdGeneratorFromOpenData();
-            case 5:
+            case 6:
             case "end":
               return _context31.stop();
           }

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

@@ -83,6 +83,8 @@ export interface ILoadProductsParams {
     extension_type?: string[];
     /** 商品发布状态 */
     status?: string;
+    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
+    strategy_context?: Record<string, any>;
 }
 /**
  * 加载商品详情的参数

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

@@ -83,6 +83,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getBookingAppointmentStatus;
     private isBookingIncludedInStats;
     private getBookingOrderPaymentStatus;
+    private isUnpaidBooking;
     private countBookingOrders;
     private countCompletedBookings;
     private groupBookingsByResource;

package/dist/solution/Sales/index.js

@@ -29,6 +29,7 @@ import dayjs from 'dayjs';
 import { BaseModule } from "../../modules/BaseModule";
 import { SalesHooks } from "./types";
 export * from "./types";
+var UNPAID_PAYMENT_STATUSES = new Set(['unpaid', 'partially_paid', 'payment_processing']);
 
 /**
  * Sales 解决方案基础骨架
@@ -415,6 +416,11 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _booking$order$paymen, _booking$order;
       return String((_booking$order$paymen = (_booking$order = booking.order) === null || _booking$order === void 0 ? void 0 : _booking$order.payment_status) !== null && _booking$order$paymen !== void 0 ? _booking$order$paymen : '');
     }
+  }, {
+    key: "isUnpaidBooking",
+    value: function isUnpaidBooking(booking) {
+      return UNPAID_PAYMENT_STATUSES.has(this.getBookingOrderPaymentStatus(booking));
+    }
   }, {
     key: "countBookingOrders",
     value: function countBookingOrders(bookings) {
@@ -895,9 +901,11 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
               completedBookingList = matchedBookingList.filter(function (booking) {
                 return _this7.getBookingAppointmentStatus(booking) === 'completed';
-              });
+              }); // const unpaidBookingList = matchedBookingList.filter(
+              //   (booking) => this.getBookingOrderPaymentStatus(booking) === 'unpaid' || this.getBookingOrderPaymentStatus(booking) === 'payment_processing',
+              // );
               unpaidBookingList = matchedBookingList.filter(function (booking) {
-                return _this7.getBookingOrderPaymentStatus(booking) === 'unpaid' || _this7.getBookingOrderPaymentStatus(booking) === 'payment_processing';
+                return _this7.isUnpaidBooking(booking);
               });
               bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList));
               completedBookings = completedBookingList.map(function (booking) {