@pisell/pisellos 0.10.59 → 0.10.61

package/lib/modules/Order/utils/orderCollectionIdentity.js

@@ -331,6 +331,11 @@ function applyOrderCollectionUidRemaps(sourceOrder, uidRemaps) {
       }
       // 冲突 UID 仍由第一条持有；赠品父引用缺少可用的持久化行定位时不能全局改写。
       if (remap.scope !== 'linked-owner') {
+        for (const relation of order.holder_relations || []) {
+          if (relation.relation_model === 'order_detail' && String(relation.relation_uuid) === remap.from) {
+            relation.relation_uuid = remap.to;
+          }
+        }
         for (const product of order.products || []) {
           if (String(product?.metadata?.parent_unique_identification_number || '') === remap.from) {
             product.metadata = {

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

@@ -173,7 +173,7 @@ export declare function resolveManualOverrideLineOriginalPrice(params: {
  * // => -4
  */
 export declare function resolveEffectivePerUnitDiscount(product: Record<string, any>): number;
-export declare function createDefaultOrderRulesHooks(getBookings?: () => OrderTempOrder['bookings']): RulesParamsHooks;
+export declare function createDefaultOrderRulesHooks(getBookings?: () => OrderTempOrder['bookings'], getHolderRelations?: () => OrderTempOrder['holder_relations']): RulesParamsHooks;
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
  * @param {CartItem} cartItem

package/lib/modules/Order/utils.js

@@ -128,6 +128,7 @@ Object.defineProperty(exports, "syncManualProductDiscountProductNum", {
     return _manualProductDiscount.syncManualProductDiscountProductNum;
   }
 });
+var _lodashEs = require("lodash-es");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _customParseFormat = _interopRequireDefault(require("dayjs/plugin/customParseFormat"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
@@ -138,6 +139,7 @@ var _utils2 = require("../../solution/ScanOrder/utils");
 var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
 var _salesNotes = require("./salesNotes");
 var _pickupTiming = require("./pickupTiming");
+var _holderRelations = require("./holderRelations");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 _dayjs.default.extend(_customParseFormat.default);
 const POINT_CARD_SNAPSHOT_TAG = 'point_card';
@@ -824,7 +826,7 @@ function resolveEffectivePerUnitDiscount(product) {
   if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice)) return fromList;
   return fromList + (originalPrice - finalPrice);
 }
-function createDefaultOrderRulesHooks(getBookings) {
+function createDefaultOrderRulesHooks(getBookings, getHolderRelations) {
   const getProductStartDate = product => {
     const productUid = String(product.metadata?.unique_identification_number ?? product.unique_identification_number ?? '');
     const bookingUid = String(product.booking_uid ?? product.metadata?.booking_uid ?? '');
@@ -942,7 +944,9 @@ function createDefaultOrderRulesHooks(getBookings) {
         // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
         // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
         isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
-        holder_id: product.metadata?.holder_id,
+        holder_id: (0, _holderRelations.hasProductBooking)(product) || !getHolderRelations ? product.metadata?.holder_id : (0, _holderRelations.getProductHolderRelations)({
+          holder_relations: getHolderRelations()
+        }, product).filter(relation => relation.holder_type === 'form').map(relation => relation.holder_id),
         startDate: getProductStartDate(product),
         main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString() : undefined,
         inPromotion: metadataAny._promotion?.inPromotion === true,
@@ -1233,6 +1237,7 @@ function normalizeSubmitProduct(product, formatOptions = {}) {
   } = product;
   const {
     num,
+    _extend: _productExtend,
     surcharge_fee: _productSurchargeFee,
     discount_amount: _deprecatedDiscountAmount,
     discount_type: _deprecatedDiscountType,
@@ -1419,6 +1424,7 @@ function createDefaultTempOrder(params) {
     request_unique_idempotency_token: '',
     vouchers: [],
     products: [],
+    holder_relations: [],
     notes: [],
     bookings: [],
     payments: [],
@@ -1494,6 +1500,7 @@ function buildSubmitPayload(params) {
     summary,
     enhance
   } = params;
+  (0, _holderRelations.ensureHolderRelationUuids)(tempOrder);
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   const bookingUuid = (0, _orderCollectionIdentity.createUuidV4)();
   const virtualSettlementMode = tempOrder.metadata?.currency_settlement_config?.settlement_type === 'virtual_currency';
@@ -1533,6 +1540,9 @@ function buildSubmitPayload(params) {
   });
   const payload = {
     ...tempOrderRest,
+    ...(tempOrder.holder_relations !== undefined ? {
+      holder_relations: (0, _lodashEs.cloneDeep)(tempOrder.holder_relations)
+    } : {}),
     customer_id: tempOrder.customer_id ?? 1,
     customer_name: tempOrder.customer_name || 'Walk-In',
     country_calling_code: String(tempOrder.country_calling_code ?? ''),
@@ -1725,15 +1735,24 @@ function hasAssignedHolderId(value) {
  * clearTempOrderHolderAssignments(tempOrder);
  */
 function clearTempOrderHolderAssignments(tempOrder) {
-  let changed = false;
+  const previousRelationCount = tempOrder.holder_relations?.length || 0;
+  (0, _holderRelations.removeProductHolderRelations)(tempOrder, (tempOrder.products || []).filter(product => !(0, _holderRelations.hasProductBooking)(product)));
+  let changed = previousRelationCount !== (tempOrder.holder_relations?.length || 0);
   const resetHolderField = (target, key = 'holder_id') => {
     if (!hasAssignedHolderId(target[key])) return;
     target[key] = null;
     changed = true;
   };
+  const clearHolder = target => {
+    resetHolderField(target);
+    if (target.holder !== undefined && target.holder !== null) {
+      target.holder = null;
+      changed = true;
+    }
+  };
   for (const product of tempOrder.products || []) {
     if (product.metadata && typeof product.metadata === 'object') {
-      resetHolderField(product.metadata);
+      clearHolder(product.metadata);
     }
   }
   for (const booking of tempOrder.bookings || []) {
@@ -1751,11 +1770,13 @@ function clearTempOrderHolderAssignments(tempOrder) {
     for (const entry of Object.values(productsByUid)) {
       const origin = entry?.origin;
       if (!origin || typeof origin !== 'object') continue;
+      clearHolder(origin);
       if (origin.metadata && typeof origin.metadata === 'object') {
-        resetHolderField(origin.metadata);
+        clearHolder(origin.metadata);
       }
       if (origin._extend && typeof origin._extend === 'object') {
-        resetHolderField(origin._extend);
+        clearHolder(origin._extend);
+        delete origin._extend.holder_relations;
       }
     }
   }

package/lib/server/index.js

@@ -824,6 +824,9 @@ class Server {
         need_sync: 0,
         is_draft_order: 0
       };
+      if (!Array.isArray(fresh.holder_relations) && Array.isArray(checkoutData?.holder_relations)) {
+        syncedOrder.holder_relations = (0, _lodashEs.cloneDeep)(checkoutData.holder_relations);
+      }
       await this.order.upsertOrdersFromRemote([syncedOrder], 'checkoutSync');
       this.logInfo(`${title}: sync_sales 完整订单已同步到本地`, {
         order_id: fresh.order_id,
@@ -5423,6 +5426,9 @@ class Server {
     if (fresh.order_number !== undefined && fresh.order_number !== null) {
       patch.order_number = fresh.order_number;
     }
+    if (Array.isArray(fresh.holder_relations)) {
+      patch.holder_relations = (0, _lodashEs.cloneDeep)(fresh.holder_relations);
+    }
     return patch;
   }
   buildSyncedOrderForPrint(params) {

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

@@ -311,6 +311,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private getIdentifiedPendingPayments;
     private shouldProtectLocalOrderFromRemoteSnapshot;
     private getUnmatchedIdentifiedPendingPayments;
+    /** 关系数组是完整快照，不能拼接或按商品子项生成 UID；扩展字段整体保留。 */
+    private applyHolderRelationsSnapshot;
+    /** 全量拉取缺少关系字段时，仍保留同一订单已有的关系快照。 */
+    private preserveOmittedHolderRelations;
     private mergeOrderRecords;
     private summarizeDuplicateOrders;
     private logDuplicateOrders;

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

@@ -288,6 +288,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const existingRecord = existing;
     const incomingRecord = incoming;
     const uidRemaps = [];
+    this.applyHolderRelationsSnapshot(reconciled, existing, incoming);
     for (const field of ORDER_AUTHORITATIVE_COLLECTION_FIELDS) {
       if (!Array.isArray(incomingRecord[field])) continue;
       reconciled[field] = this.mergeAuthoritativeOrderCollection(field, existingRecord[field], incomingRecord[field], uidRemaps);
@@ -364,7 +365,7 @@ class OrderModule extends _BaseModule.BaseModule {
         continue;
       }
 
-      // 远端商品成员确实发生增删时必须落库，避免内存已更新但 SQLite 仍被回声窗口跳过。
+      // 远端商品成员或 Holder 关系确实变化时必须落库，避免被回声窗口跳过。
       if (forceWriteStorageKeys.has(storageKey)) {
         toWrite.push(order);
         continue;
@@ -1234,6 +1235,7 @@ class OrderModule extends _BaseModule.BaseModule {
       if (matchIndex >= 0) {
         const existingOrder = updatedList[matchIndex];
         const reconciledDraftOrder = this.preserveExistingBusinessCodeForDraft(existingOrder, draftOrder);
+        this.applyHolderRelationsSnapshot(reconciledDraftOrder, existingOrder, draftOrder);
         const mergedOrder = this.mergeOrderRecords(existingOrder, reconciledDraftOrder);
         const nextOrder = {
           ...mergedOrder,
@@ -1512,7 +1514,10 @@ class OrderModule extends _BaseModule.BaseModule {
       const hasSingleId = routeInfo.hasSingleId;
       const normalizedBody = this.normalizeOrderSyncPayload(msg.body || msg.data);
       if (routeInfo.route === 'bodyUpsert' && normalizedBody) {
-        upsertOrders.set(this.getIdKey(normalizedBody.order_id), normalizedBody);
+        const orderKey = this.getIdKey(normalizedBody.order_id);
+        const previousBody = upsertOrders.get(orderKey);
+        if (previousBody) this.applyHolderRelationsSnapshot(normalizedBody, previousBody, normalizedBody);
+        upsertOrders.set(orderKey, normalizedBody);
         return;
       }
       if (hasBatchIds) refreshIds.push(...routeInfo.batchIds);else if (routeInfo.route === 'httpRefresh.singleId' && singleId !== null) refreshIds.push(singleId);else if (routeInfo.route === 'httpRefresh.relationIds') refreshIds.push(...routeInfo.batchIds);
@@ -1705,6 +1710,9 @@ class OrderModule extends _BaseModule.BaseModule {
           const mergedStorageKey = this.getOrderStorageKey(mergedOrder);
           if (mergedStorageKey) forceWriteStorageKeys.add(mergedStorageKey);
         }
+        if (nextStorageKey && !(0, _lodashEs.isEqual)(existingOrder.holder_relations, mergedOrder.holder_relations)) {
+          forceWriteStorageKeys.add(nextStorageKey);
+        }
         // 合并后身份字段可能新增（如挂单拿到 order_id），同步登记到索引，
         // 供同批后续 fresh 命中同一槽位，避免重复插入
         this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, adjustedMatchIndex);
@@ -2005,6 +2013,38 @@ class OrderModule extends _BaseModule.BaseModule {
     const incomingIdentityKeys = new Set(incomingPayments.flatMap(payment => (0, _paymentUtils.getOrderPaymentIdentityKeys)(payment)));
     return existingPayments.filter(payment => (0, _paymentUtils.isIdentifiedPendingOrderPayment)(payment) && !(0, _paymentUtils.getOrderPaymentIdentityKeys)(payment).some(key => incomingIdentityKeys.has(key)));
   }
+
+  /** 关系数组是完整快照，不能拼接或按商品子项生成 UID；扩展字段整体保留。 */
+  applyHolderRelationsSnapshot(target, existing, incoming) {
+    if (Array.isArray(incoming.holder_relations)) {
+      target.holder_relations = (0, _lodashEs.cloneDeep)(incoming.holder_relations);
+    } else if (Array.isArray(existing.holder_relations)) {
+      target.holder_relations = (0, _lodashEs.cloneDeep)(existing.holder_relations);
+    } else {
+      delete target.holder_relations;
+    }
+  }
+
+  /** 全量拉取缺少关系字段时，仍保留同一订单已有的关系快照。 */
+  preserveOmittedHolderRelations(incomingOrders, existingOrders) {
+    const existingByIdentity = new Map();
+    for (const order of existingOrders) {
+      if (!Array.isArray(order.holder_relations)) continue;
+      for (const key of this.getOrderIdentityMatchKeys(order)) {
+        existingByIdentity.set(key, order);
+      }
+    }
+    return incomingOrders.map(order => {
+      if (Array.isArray(order.holder_relations)) return order;
+      const existingOrder = this.getOrderIdentityMatchKeys(order).map(key => existingByIdentity.get(key)).find(Boolean);
+      if (!existingOrder) return order;
+      const nextOrder = {
+        ...order
+      };
+      this.applyHolderRelationsSnapshot(nextOrder, existingOrder, order);
+      return nextOrder;
+    });
+  }
   mergeOrderRecords(existing, incoming) {
     const preferred = this.pickPreferredOrder(existing, incoming);
     const secondary = preferred === existing ? incoming : existing;
@@ -2041,6 +2081,7 @@ class OrderModule extends _BaseModule.BaseModule {
     if (Object.prototype.hasOwnProperty.call(incomingRecord, 'order_meta_list')) {
       mergedRecord.order_meta_list = (0, _lodashEs.cloneDeep)(incomingRecord.order_meta_list);
     }
+    this.applyHolderRelationsSnapshot(merged, existing, incoming);
 
     // 子项数组遵循完整快照语义：incoming 自有且为数组（包括 []）时权威替换；
     // 字段缺席或不是数组时视为稀疏 patch，继续保留 existing。
@@ -2482,7 +2523,7 @@ class OrderModule extends _BaseModule.BaseModule {
   async replaceOrdersSnapshotInSQLite(orderList, source, protectedOrdersBeforeRemoteFetch = []) {
     if (!this.dbManager) {
       return {
-        orders: this.compactOrderListByIdentity(orderList.map(order => this.normalizeRemoteSyncedOrder(order)), `${source}.snapshotNoDb`).list,
+        orders: this.compactOrderListByIdentity(this.preserveOmittedHolderRelations(orderList, this.store.list).map(order => this.normalizeRemoteSyncedOrder(order)), `${source}.snapshotNoDb`).list,
         persisted: false
       };
     }
@@ -2492,6 +2533,7 @@ class OrderModule extends _BaseModule.BaseModule {
     try {
       await this.runInOrderSQLiteSaveQueue(async () => {
         const existingOrders = typeof this.dbManager.getAll === 'function' ? await this.dbManager.getAll(INDEXDB_STORE_NAME) : [];
+        const remoteSnapshotWithHolderRelations = this.preserveOmittedHolderRelations(remoteSnapshot, [...protectedOrdersBeforeRemoteFetch, ...(existingOrders || [])]);
         const protectedLocalOrders = protectedOrdersBeforeRemoteFetch.map(order => this.normalizeOrderCollectionsForIngress(order, `${source}.protectedBeforeRemoteFetch`)).filter(order => this.shouldProtectLocalOrderFromRemoteSnapshot(order));
         for (const rawCurrentOrder of existingOrders || []) {
           const currentOrder = this.normalizeOrderCollectionsForIngress(rawCurrentOrder, `${source}.currentSQLite`);
@@ -2507,7 +2549,7 @@ class OrderModule extends _BaseModule.BaseModule {
           }
           if (currentNeedsProtection) protectedLocalOrders.push(currentOrder);
         }
-        const orderListSnapshot = this.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, protectedLocalOrders);
+        const orderListSnapshot = this.mergeRemoteSnapshotWithPendingOrders(remoteSnapshotWithHolderRelations, protectedLocalOrders);
         mergedSnapshot = this.compactOrderListByIdentity(orderListSnapshot, `${source}.sqliteSnapshot`).list;
         this.logInfo('replaceOrdersSnapshotInSQLite-开始', {
           source,

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

@@ -1,4 +1,5 @@
 import type { ScheduleEventResource } from '../resource/types';
+import type { OrderHolderRelation } from '../../../modules/Order/types';
 /**
  * Order 模块主键类型（对齐标准 Sales 协议的 order_id）
  */
@@ -448,6 +449,8 @@ export interface OrderData {
     contacts_info?: unknown[];
     /** 订单级主体参数 */
     holder?: Record<string, unknown> | null;
+    /** 非预约商品 Holder 关系完整快照；缺席表示本次回包未提供 */
+    holder_relations?: OrderHolderRelation[];
     /** 订单前端扩展快照 */
     order_meta_list?: {
         point_cards_snapshot?: Array<{

package/lib/shared/receipt/small-ticket.js

@@ -7,6 +7,7 @@ exports.buildSmallTicketData = buildSmallTicketData;
 exports.hasSmallTicketData = hasSmallTicketData;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
+var _holderRelations = require("../../modules/Order/holderRelations");
 var _pickupTiming = require("../../modules/Order/pickupTiming");
 var _templateVisibility = require("./templateVisibility");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -97,6 +98,7 @@ const LABELS = {
     bookingDateTime: 'Date & time',
     bookingResource: 'Resource',
     bookingHolder: 'Holder',
+    productHolder: 'Holder',
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
     manualMarkup: 'Manual markup',
@@ -142,6 +144,7 @@ const LABELS = {
     bookingDateTime: '日期和时间',
     bookingResource: '资源',
     bookingHolder: '预约人',
+    productHolder: '持有人',
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
     manualMarkup: '手动加价',
@@ -187,6 +190,7 @@ const LABELS = {
     bookingDateTime: '日期和時間',
     bookingResource: '資源',
     bookingHolder: '預約人',
+    productHolder: '持有人',
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
     manualMarkup: '手動加價',
@@ -230,6 +234,7 @@ const LABELS = {
     bookingDateTime: '日時',
     bookingResource: 'リソース',
     bookingHolder: '予約者',
+    productHolder: '利用者',
     orderDiscount: '注文割引',
     manualDiscount: '手動割引',
     manualMarkup: '手動値上げ',
@@ -274,6 +279,7 @@ const LABELS = {
     bookingDateTime: 'Data e hora',
     bookingResource: 'Recurso',
     bookingHolder: 'Titular',
+    productHolder: 'Titular',
     orderDiscount: 'Desconto do pedido',
     manualDiscount: 'Desconto manual',
     manualMarkup: 'Acréscimo manual',
@@ -445,6 +451,15 @@ function buildProducts(order, locale, productMap) {
       quantity,
       originalPrice
     });
+    const holderName = (0, _holderRelations.hasProductBooking)(product) ? '' : (0, _holderRelations.getProductHolderRelations)(order, product).map(relation => getLocalizedValue(relation.metadata?.name, locale).trim()).filter(Boolean).join(', ');
+    if (holderName) {
+      // 复用 Web Invoice / 原生均支持的文本扩展行，不混入金额或商品备注。
+      extensionList.push({
+        ...receiptKey(rawProduct, 'product-holder', 'text'),
+        item: `${label(locale, 'productHolder')}: ${holderName}`,
+        value: ''
+      });
+    }
     const productNote = resolveProductNote(product, locale);
     const allergy = isPresentId(productUid) ? allergyByProductUid.get(String(productUid).trim()) || '' : '';
     const basePrice = resolveProductBasePrice(product);

package/lib/shared/sales/loadSalesOrderSnapshot.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SALES_ORDER_RELATIONS = void 0;
 exports.loadSalesOrderSnapshot = loadSalesOrderSnapshot;
-const SALES_ORDER_RELATIONS = exports.SALES_ORDER_RELATIONS = ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'order_meta_list', 'refunds', 'notes'];
+const SALES_ORDER_RELATIONS = exports.SALES_ORDER_RELATIONS = ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'order_meta_list', 'refunds', 'notes', 'holder_relations'];
 
 /** Shared transport contract; remote callers use their host's /h5 prefix. */
 function loadSalesOrderSnapshot(request, params) {

package/lib/solution/BaseSales/index.js

@@ -24,6 +24,7 @@ Object.keys(_types).forEach(function (key) {
 var _Order = require("../../modules/Order");
 var _pickupTiming = require("../../modules/Order/pickupTiming");
 var _pickupTiming2 = require("./pickupTiming");
+var _holderRelations = require("../../modules/Order/holderRelations");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
 var _types2 = require("../BookingByStep/types");
@@ -348,6 +349,38 @@ function areBaseSalesNotesEquivalent(currentValue, loadedValue, options) {
   const loadedNotes = normalizeBaseSalesNotesForComparison(loadedValue);
   return currentNotes !== null && loadedNotes !== null && (0, _lodashEs.isEqual)(currentNotes, loadedNotes);
 }
+function mergeBaseSalesHolderRelations(currentRecord, incomingRecord, strategy) {
+  if (!Array.isArray(incomingRecord.holder_relations)) {
+    return (0, _lodashEs.cloneDeep)(currentRecord.holder_relations);
+  }
+
+  // 仅保留商品集合合并实际留下的本地行关系；匹配的行沿用 incoming 快照。
+  // 未提供 products 的稀疏包不能据此判断哪些行已被删除或被本地保留。
+  const retainedProductUids = new Set();
+  if (Array.isArray(incomingRecord.products)) {
+    for (const product of currentRecord.products || []) {
+      const retained = !incomingRecord.products.some(incomingProduct => (0, _orderCollectionIdentity.isSameOrderCollectionItem)('product', product, incomingProduct)) && (strategy === 'preserve-local' || !(0, _orderCollectionIdentity.getOrderCollectionPersistentId)('product', product));
+      const uid = (0, _orderCollectionIdentity.getOrderCollectionReferenceUid)('product', product);
+      if (retained && uid) retainedProductUids.add(uid);
+    }
+  }
+  const belongsToRetainedProduct = relation => relation?.relation_model === 'order_detail' && retainedProductUids.has(String(relation.relation_uuid));
+  const selectedRelations = [...incomingRecord.holder_relations.filter(relation => !belongsToRetainedProduct(relation)), ...(Array.isArray(currentRecord.holder_relations) ? currentRecord.holder_relations.filter(belongsToRetainedProduct) : [])];
+  const result = [];
+  const indexByIdentity = new Map();
+  for (const relation of selectedRelations) {
+    const identityParts = [relation?.relation_model, relation?.relation_uuid, relation?.holder_type, relation?.holder_id];
+    const identity = identityParts.every(value => value !== undefined && value !== null) ? JSON.stringify(identityParts) : null;
+    const existingIndex = identity === null ? undefined : indexByIdentity.get(identity);
+    if (existingIndex !== undefined) {
+      result[existingIndex] = (0, _lodashEs.cloneDeep)(relation);
+    } else {
+      if (identity !== null) indexByIdentity.set(identity, result.length);
+      result.push((0, _lodashEs.cloneDeep)(relation));
+    }
+  }
+  return result;
+}
 function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, strategy) {
   const loadedHasOrderMetaList = Object.prototype.hasOwnProperty.call(loadedRecord || {}, 'order_meta_list');
   const loadedHasSalesNotes = Object.prototype.hasOwnProperty.call(loadedRecord || {}, 'notes');
@@ -366,8 +399,12 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
   const normalizedCurrentTempOrder = normalizeBaseSalesRecordCollections(currentTempOrder, {
     ensureUid: false
   });
+  const mergedHolderRelations = mergeBaseSalesHolderRelations(normalizedCurrentTempOrder, normalizedLoadedRecord, strategy);
   const uidRemaps = [];
-  const mergedRecord = (0, _lodashEs.mergeWith)(normalizedCurrentTempOrder, normalizedLoadedRecord, (currentValue, loadedValue, key) => {
+  const mergedRecord = (0, _lodashEs.mergeWith)(normalizedCurrentTempOrder, normalizedLoadedRecord, (currentValue, loadedValue, key, object) => {
+    if (key === 'holder_relations' && object === normalizedCurrentTempOrder) {
+      return (0, _lodashEs.cloneDeep)(mergedHolderRelations);
+    }
     // order_meta_list 是服务端/本地订单携带的完整业务快照。若 incoming
     // 明确提供它，必须整体替换；若省略，则保留当前值，避免 snapshot
     // 数组递归拼接后出现同 ID 的旧数据。
@@ -3184,7 +3221,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
 
     const walletProducts = tempOrder?.products.map(product => {
       const metadata = product.metadata || {};
-      const rawHolderId = product.holder_id ?? metadata.holder_id;
+      const rawHolderId = (0, _holderRelations.hasProductBooking)(product) ? product.holder_id ?? metadata.holder_id : (0, _holderRelations.getProductHolderRelations)(tempOrder, product).filter(relation => relation.holder_type === 'form').map(relation => relation.holder_id);
       const holderIdValue = Array.isArray(rawHolderId) ? rawHolderId[0] : rawHolderId;
       const holder_id = Number.isInteger(Number(holderIdValue)) ? Number(holderIdValue) : undefined;
       return {

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

@@ -4,7 +4,7 @@ import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderCon
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { QuotationCustomerScopeInfo } from '../../modules/Quotation/types';
 import type { PaymentMethod } from '../../modules/Payment/types';
-import type { OrderPaymentSource } from '../../modules/Order/types';
+import type { OrderHolderRelation, OrderPaymentSource } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 /**
  * BaseSales 流程 hook 后缀。
@@ -277,6 +277,7 @@ export interface BaseSalesTempOrder {
     contacts: any[];
     contacts_info: Record<string, any> | null;
     holder: Record<string, any> | null;
+    holder_relations?: OrderHolderRelation[];
     metadata: Record<string, any>;
     _extend?: {
         productsByUid?: Record<string, Record<string, any>>;

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

@@ -14,7 +14,7 @@
  * - 不在此处发明等价关系；UI 侧（ticketBooking）若需要别的字段，由 view-model 适配层做转换
  */
 import type { BaseSalesOrderProduct } from '../types';
-import type { OrderMetaList } from '../../../modules/Order/types';
+import type { OrderHolderRelation, OrderMetaList } from '../../../modules/Order/types';
 export interface ISalesDetailHeader {
     order_id: number | string | null;
     order_number?: string;
@@ -121,6 +121,8 @@ export interface ISalesDetail {
     header: ISalesDetailHeader;
     /** 商品行快照（保留 tempOrder / 后端详情原字段） */
     products: BaseSalesOrderProduct[];
+    /** 非预约商品 Holder 关系，保留关系及 metadata 的扩展字段。 */
+    holder_relations?: OrderHolderRelation[];
     /** 全部 bookings，按服务端原始顺序输出（含 root + child） */
     bookings: ISalesBooking[];
     /** root booking（parent_id === 0），多个时取首个，无则为 null */

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.parseSalesResponse = parseSalesResponse;
 var _orderCollectionIdentity = require("../../../modules/Order/utils/orderCollectionIdentity");
 var _pickupTiming = require("../../../modules/Order/pickupTiming");
+var _lodashEs = require("lodash-es");
 /**
  * 把 `/order/sales/{id}` 响应（OrderData）解析为 ISalesDetail。
  *
@@ -130,6 +131,9 @@ function parseSalesResponse(input) {
   return {
     header: pickHeader(raw),
     products,
+    ...(Array.isArray(raw?.holder_relations) ? {
+      holder_relations: (0, _lodashEs.cloneDeep)(raw.holder_relations)
+    } : {}),
     bookings,
     rootBooking,
     bookingsByProductUid,

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.transformBaseProductToOrderProduct = transformBaseProductToOrderProduct;
 var _weighedProduct = require("../../../modules/Order/utils/weighedProduct");
+var _serviceTimes = require("../../../modules/BookingContext/utils/serviceTimes");
 var _utils = require("../../../modules/Order/utils");
 var _manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
 function toNumber(value, fallback = 0) {
@@ -205,6 +206,7 @@ function transformBaseProductToOrderProduct(params) {
   });
   const derivedMainSelling = hasExplicitLineTotal ? Number(lineCompositeTotal) - Number(bundleOnlyComposite) : Number(mainProductOriginalPrice);
   const mainProductSellingPrice = toPriceString(Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice));
+  const holderRelations = [payload._extend, callbackOrigin?._extend, sourceProduct?._extend].find(source => Array.isArray(source?.holder_relations))?.holder_relations;
   const metadata = {
     unique: payload.unique,
     session: payload.session,
@@ -264,6 +266,11 @@ function transformBaseProductToOrderProduct(params) {
     tax_fee: toPriceString(payload.tax_fee ?? matchedVariant?.tax_fee ?? origin?.tax_fee ?? sourceProduct?.tax_fee, '0.00'),
     is_charge_tax: toNumber(payload.is_charge_tax ?? matchedVariant?.is_charge_tax ?? origin?.is_charge_tax ?? sourceProduct?.is_charge_tax, 0),
     metadata,
+    ...(holderRelations !== undefined && !(0, _serviceTimes.isBookingProduct)(origin) && !(0, _serviceTimes.isBookingProduct)(payload) ? {
+      _extend: {
+        holder_relations: holderRelations
+      }
+    } : {}),
     note: payload.note != null ? String(payload.note) : '',
     product_title: productTitle,
     product_cover: firstNonBlank(matchedVariant?.cover, sourceProduct?.cover),

package/lib/solution/BookingTicket/index.js

@@ -1641,7 +1641,10 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
    * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
    */
   buildNormalProductCacheItemFromOrderLine(input) {
-    return (0, _buildNormalProductCacheItemFromOrderLine.buildNormalProductCacheItemFromOrderLine)(input);
+    return (0, _buildNormalProductCacheItemFromOrderLine.buildNormalProductCacheItemFromOrderLine)({
+      ...input,
+      holder_relations: input.holder_relations ?? this.store.order?.getTempOrder()?.holder_relations
+    });
   }
 
   /** 文档别名：与 OrderModule.updateOrderProduct 一致。 */

package/lib/solution/BookingTicket/utils/addProductDecision.d.ts

@@ -5,7 +5,7 @@ import type { OrderProduct, OrderProductIdentity, AddProductBookingInput } from
  * cart.addProduct 两阶段决策（与 ticketBooking `handleSelectProduct` 对齐）：
  *
  * 1. `requiresDetail`：规格 / SKU / 套餐 / Session / 称重弹窗（门禁：`isOpenDetailModal` / `cartDetailValue` / `open_sold_weight`）
- * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（kiosk 强制进入；其他渠道由 `getIsAutoClose` 决定）
+ * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（自助终端强制进入；其他渠道由 `getIsAutoClose` 决定）
  * 3. `add`：两关均通过，直接 transform + 加车
  */
 export type AddProductDecision = {

package/lib/solution/BookingTicket/utils/addProductDecision.js

@@ -17,12 +17,13 @@ var _dayjs = _interopRequireDefault(require("dayjs"));
 var _BookingContext = require("../../../modules/BookingContext");
 var _transformBaseProductToOrderProduct = require("../../BaseSales/utils/transformBaseProductToOrderProduct");
 var _weighingProductSku = require("./weighingProductSku");
+var _platform = require("../../../utils/platform");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * cart.addProduct 两阶段决策（与 ticketBooking `handleSelectProduct` 对齐）：
  *
  * 1. `requiresDetail`：规格 / SKU / 套餐 / Session / 称重弹窗（门禁：`isOpenDetailModal` / `cartDetailValue` / `open_sold_weight`）
- * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（kiosk 强制进入；其他渠道由 `getIsAutoClose` 决定）
+ * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（自助终端强制进入；其他渠道由 `getIsAutoClose` 决定）
  * 3. `add`：两关均通过，直接 transform + 加车
  */
 
@@ -39,11 +40,11 @@ function needsSpecDetailModal(item) {
 }
 
 /**
- * 第二段：预约商品是否仍需打开资源 / 时间编辑（kiosk 强制打开，其他渠道与 info2 `cacheItem.autoClose` 等价）。
+ * 第二段：预约商品是否仍需打开资源 / 时间编辑（自助终端强制打开，其他渠道与 info2 `cacheItem.autoClose` 等价）。
  */
 function needsBookingEdit(cacheItem, ctx) {
   if (isNormalBookingProduct(cacheItem)) return false;
-  if (ctx?.channel === 'kiosk') return true;
+  if ((0, _platform.isSelfServicePlatform)(ctx?.channel)) return true;
   const isAutoAllocationOn = ctx?.isAutoAllocationOn || (() => true);
   return !(0, _BookingContext.getIsAutoClose)(cacheItem, isAutoAllocationOn);
 }

package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js

@@ -32,9 +32,15 @@ async function processScannedProductItem(host, item, code, bridge) {
     return runRequiresDetailFlow(host, item, ctx, bridge);
   }
   const values = (0, _scanProductValues.genScanProductValues)(item, code);
-  const itemWithSelection = {
+  // 条码已唯一命中某个规格时，商品目录的 price 可能是“最低规格价”。
+  // 仅在扫码预选规格的这条路径改用命中规格价，避免影响商品卡片和手工选规格。
+  const itemWithSelection = values.price === undefined ? {
     ...item,
     cartDetailValue: values
+  } : {
+    ...item,
+    price: values.price,
+    cartDetailValue: values
   };
   const decision = host.decideAddProduct(itemWithSelection, ctx);
   return runAddProductDecision(host, item, decision, ctx, bridge);

package/lib/solution/BookingTicket/utils/scan/cloudSearch.js

@@ -10,6 +10,7 @@ exports.searchWalletPass = exports.searchWallet = exports.searchProduct = export
 const searchWalletPass = async (request, code) => {
   const params = {
     code,
+    resolve_ticket_order: 1,
     translate_flag: 1,
     // 翻译识别码名称 0:不翻译 1:翻译
     relation_product: 1,

package/lib/solution/BookingTicket/utils/scan/handleScan.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.handleUniversalScan = exports.handleGlobalScan = exports.handleCustomerScan = void 0;
 var _cloudSearch = require("./cloudSearch");
 var _scanCache = _interopRequireDefault(require("./scanCache"));
+var _platform = require("../../../../utils/platform");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Promise.any 的替代实现
@@ -107,7 +108,7 @@ const handleGlobalScan = (request, localSearch, channel) => {
     if (value.startsWith('WL')) {
       requestList = [(0, _cloudSearch.searchWallet)(request, value)];
     } else {
-      requestList = [...(channel === 'kiosk' ? [] : [(0, _cloudSearch.searchOrder)(request, value)]), (0, _cloudSearch.searchWalletPass)(request, value), (0, _cloudSearch.searchWallet)(request, value), (0, _cloudSearch.searchProduct)(request, value)];
+      requestList = [...((0, _platform.isSelfServicePlatform)(channel) ? [] : [(0, _cloudSearch.searchOrder)(request, value)]), (0, _cloudSearch.searchWalletPass)(request, value), (0, _cloudSearch.searchWallet)(request, value), (0, _cloudSearch.searchProduct)(request, value)];
     }
     return requestList;
   };

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

@@ -145,7 +145,7 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     clearSessionStorageOrderSnapshot(): void;
     /**
-     * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+     * PC/H5 及自助终端结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
      * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
      */
     protected shouldUseCheckoutSyncTask(): boolean;