@pisell/pisellos 2.3.164 → 2.3.166

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

@@ -243,6 +243,11 @@ export interface OrderProduct extends OrderProductIdentity {
     product_cover?: string;
     metadata: Record<string, any>;
     note?: string;
+    /** 仅作按行更新输入；正式数据保存于订单顶层。 */
+    _extend?: {
+        holder_relations?: OrderHolderRelation[];
+        [key: string]: any;
+    };
 }
 export interface OrderSummary {
     product_quantity: number;
@@ -340,6 +345,17 @@ export interface SalesNotesMutationSnapshot {
 }
 export type SalesNoteProtocolRelation = SalesNoteRelation;
 export type SalesNoteProtocol = SalesNote;
+/** 后端关系及 metadata 均为开放对象，未知字段必须往返保留。 */
+export interface OrderHolderRelation {
+    /** 关系自身的 UUID；新选择/旧草稿可缺省，入单与提交时由 OS 补齐。 */
+    uuid?: string;
+    relation_model: string;
+    relation_uuid: string;
+    holder_type: 'form' | 'customer';
+    holder_id: number;
+    metadata?: Record<string, any>;
+    [key: string]: any;
+}
 export interface OrderTempOrder {
     order_id: number | null;
     external_sale_number: string;
@@ -379,6 +395,7 @@ export interface OrderTempOrder {
     created_at: string | undefined;
     request_unique_idempotency_token?: string;
     products: OrderProduct[];
+    holder_relations?: OrderHolderRelation[];
     notes: SalesNote[];
     bookings: any[];
     payments: any[];
@@ -398,7 +415,7 @@ export interface OrderTempOrder {
         [key: string]: any;
     };
 }
-export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identification_number' | 'num'> {
+export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identification_number' | 'num' | '_extend'> {
     product_quantity: number;
     payment_price: string;
     product_sku: OrderProductSku;
@@ -607,6 +624,7 @@ export interface SubmitSalesOrderParams {
         schedule_date: string;
         created_at?: string | undefined;
         products: OrderSubmitProduct[];
+        holder_relations?: OrderHolderRelation[];
         bookings: OrderSubmitBooking[];
         payments: any[];
         vouchers: any[];

package/lib/modules/Order/types.js

@@ -63,6 +63,7 @@ let OrderHooks = exports.OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * Sales Notes 乐观写入前的可恢复快照。
  * 该对象应视为 opaque token，只用于原样传回 restoreSalesNotesMutationSnapshot。
  */
+/** 后端关系及 metadata 均为开放对象，未知字段必须往返保留。 */
 /**
  * 添加商品行时的顺序控制。
  * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，

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

@@ -31,7 +31,7 @@ export declare const DISCOUNT_SPLIT_ORIGIN_UID_KEY = "discountSplitOriginUid";
  * 没有 UID 的裸商品不会被补写 UID。这是为了兼容 Rules/mock 的历史协议形状；
  * 正常 Order 写路径会在 normalize 阶段提前创建 UID。
  */
-export declare function ensureUniqueProductLineUids(tempOrder: OrderTempOrder): void;
+export declare function ensureUniqueProductLineUids(tempOrder: OrderTempOrder, discounts?: Array<Record<string, any>>): void;
 /**
  * 把券移除后已经恢复原价的同源折扣拆分行重新合并。
  *

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

@@ -9,6 +9,7 @@ exports.ensureUniqueProductLineUids = ensureUniqueProductLineUids;
 var _lodashEs = require("lodash-es");
 var _utils = require("../../../solution/ScanOrder/utils");
 var _orderCollectionIdentity = require("./orderCollectionIdentity");
+var _holderRelations = require("../holderRelations");
 /**
  * 商品券拆行的身份与回并工具。
  *
@@ -72,16 +73,20 @@ function ensureProductsByUid(tempOrder) {
  * 没有 UID 的裸商品不会被补写 UID。这是为了兼容 Rules/mock 的历史协议形状；
  * 正常 Order 写路径会在 normalize 阶段提前创建 UID。
  */
-function ensureUniqueProductLineUids(tempOrder) {
+function ensureUniqueProductLineUids(tempOrder, discounts = []) {
   // usedUids 只描述本次 Rules 返回的商品集合，不能直接依赖 productsByUid：
   // productsByUid 可能还保留已删除行的历史 runtime，历史 UID 不应导致当前行被改号。
   const usedUids = new Set();
   const productsByUid = ensureProductsByUid(tempOrder);
+  const splitGroups = new Map();
   tempOrder.products = (tempOrder.products || []).map(product => {
     const sourceUid = getProductLineUid(product);
     // 单测 mock 或兼容旧 Rules 时可能返回没有 UID 的裸商品。
     // 这里不主动补 UID，避免一个“校验重复”的工具意外改变旧协议对象形状。
     if (!sourceUid) return product;
+    const group = splitGroups.get(sourceUid) || [];
+    group.push(product);
+    splitGroups.set(sourceUid, group);
 
     // 实际场景：可乐 ×5 首次进入 Rules 时只有一行。
     // 使用三张券后 Rules 可能返回「可乐 ×2 + 三条可乐 ×1」，但四条都复制原 UID。
@@ -122,6 +127,50 @@ function ensureUniqueProductLineUids(tempOrder) {
     usedUids.add(splitUid);
     return product;
   });
+
+  // 仅按本次券上的明确 Holder 分配迁移。数组顺序不能代表券对应的人。
+  // 未能明确分配时保留原 UID，不把整组关系复制给每一个拆分行。
+  for (const [sourceUid, products] of splitGroups) {
+    if (products.length < 2) continue;
+    const relations = (0, _holderRelations.getProductHolderRelations)(tempOrder, {
+      metadata: {
+        unique_identification_number: sourceUid
+      }
+    });
+    if (!relations.length || relations.some(relation => relation.holder_type !== 'form')) continue;
+    const assignments = new Map();
+    let remaining = [...relations];
+    let ambiguous = false;
+    for (const product of products) {
+      const holderIds = new Set();
+      for (const item of product.discount_list || []) {
+        const discount = discounts.find(candidate => String(candidate.id) === String(item.discount?.resource_id));
+        if (discount?.holder?.holder_type !== 'form') continue;
+        const value = discount.holder.holder_id;
+        (Array.isArray(value) ? value : [value]).forEach(id => {
+          const recordId = id && typeof id === 'object' ? id.form_record_id : id;
+          if (recordId !== undefined && recordId !== null && recordId !== '') holderIds.add(String(recordId));
+        });
+      }
+      if (!holderIds.size) continue;
+      const assigned = remaining.filter(relation => holderIds.has(String(relation.holder_id)));
+      if (assigned.length !== Number(product.num)) {
+        ambiguous = true;
+        break;
+      }
+      assignments.set(product, assigned);
+      remaining = remaining.filter(relation => !assigned.includes(relation));
+    }
+    const unassigned = products.filter(product => !assignments.has(product));
+    if (ambiguous || unassigned.length > 1) continue;
+    if (unassigned.length === 1) {
+      if (remaining.length !== Number(unassigned[0].num)) continue;
+      assignments.set(unassigned[0], remaining);
+    } else if (remaining.length) continue;
+    for (const [product, assigned] of assignments) {
+      for (const relation of assigned) relation.relation_uuid = String(getProductLineUid(product));
+    }
+  }
 }
 
 /**
@@ -154,7 +203,7 @@ function consolidateDiscountFreeProductLines(tempOrder) {
     // - 手动改价/备注：用户显式表达了不同价格或不同制作要求；
     // - 称重商品：每次称重的净重和金额属于独立交易事实；
     // - 预约/holder/历史订单行：分别关联预约、持有人或后端 order_detail。
-    const hasMergeBoundary = hasDiscount || Boolean(product.metadata?._giftInfo || product._giftInfo) || Boolean(product.metadata?._promotion) || isManualProductDiscountLine(product) || hasProductLineNote(product) || Number(product.product_sku?.open_sold_weight || 0) === 1 || product.metadata?.is_edit_for_runtime === true || bookingId !== undefined && bookingId !== null && bookingId !== 0 && bookingId !== '0' || bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '' || holderId !== undefined && holderId !== null && String(holderId) !== '' || orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '';
+    const hasMergeBoundary = hasDiscount || Boolean(product.metadata?._giftInfo || product._giftInfo) || Boolean(product.metadata?._promotion) || isManualProductDiscountLine(product) || hasProductLineNote(product) || Number(product.product_sku?.open_sold_weight || 0) === 1 || product.metadata?.is_edit_for_runtime === true || bookingId !== undefined && bookingId !== null && bookingId !== 0 && bookingId !== '0' || bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '' || (0, _holderRelations.getProductHolderRelations)(tempOrder, product).length > 0 || holderId !== undefined && holderId !== null && String(holderId) !== '' || orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '';
     if (hasMergeBoundary) {
       consolidatedProducts.push(product);
       continue;

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

@@ -129,6 +129,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"));
@@ -139,6 +140,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';
@@ -833,7 +835,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 ?? '');
@@ -951,7 +953,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,
@@ -1242,6 +1246,7 @@ function normalizeSubmitProduct(product, formatOptions = {}) {
   } = product;
   const {
     num,
+    _extend: _productExtend,
     surcharge_fee: _productSurchargeFee,
     discount_amount: _deprecatedDiscountAmount,
     discount_type: _deprecatedDiscountType,
@@ -1428,6 +1433,7 @@ function createDefaultTempOrder(params) {
     request_unique_idempotency_token: '',
     vouchers: [],
     products: [],
+    holder_relations: [],
     notes: [],
     bookings: [],
     payments: [],
@@ -1503,6 +1509,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';
@@ -1542,6 +1549,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 ?? ''),
@@ -1734,15 +1744,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 || []) {
@@ -1760,11 +1779,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/modules/Rules/index.js

@@ -8,6 +8,7 @@ var _BaseModule = require("../BaseModule");
 var _types = require("./types");
 var _utils = require("../../solution/ShopDiscount/utils");
 var _utils2 = require("../Cart/utils");
+var _utils3 = require("../Holder/utils");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
 var _dayjs = _interopRequireDefault(require("dayjs"));
@@ -59,7 +60,7 @@ class RulesModule extends _BaseModule.BaseModule {
     if (discount.holder?.holder_type !== 'form') return true;
 
     // getProduct 会裁剪商品字段，从原始商品读取配置，套餐子项沿用父商品。
-    const holderConfig = holderSource?.holder_config ?? holderSource?.metadata?.holder_config ?? holderSource?.origin?.holder_config ?? holderSource?.metadata?.origin?.holder_config ?? holderSource?._origin?.holder_config ?? holderSource?._extend?.holder_config ?? holderSource?._extend?.product?.holder_config ?? holderSource?._extend?.product?.metadata?.holder_config;
+    const holderConfig = (0, _utils3.resolveProductHolderConfig)(holderSource);
     const holderStatus = holderConfig?.status;
     const holderEnabled = holderStatus === true || ['enable', '1'].includes(String(holderStatus).trim().toLowerCase());
     if (!holderEnabled || holderConfig?.resource_id === undefined || holderConfig?.resource_id === null || holderConfig?.resource_id === '') {

package/lib/server/index.js

@@ -836,6 +836,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,
@@ -5502,6 +5505,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

@@ -326,6 +326,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

@@ -289,6 +289,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);
@@ -365,7 +366,7 @@ class OrderModule extends _BaseModule.BaseModule {
         continue;
       }
 
-      // 远端商品成员确实发生增删时必须落库，避免内存已更新但 SQLite 仍被回声窗口跳过。
+      // 远端商品成员或 Holder 关系确实变化时必须落库，避免被回声窗口跳过。
       if (forceWriteStorageKeys.has(storageKey)) {
         toWrite.push(order);
         continue;
@@ -1339,6 +1340,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,
@@ -1617,7 +1619,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);
@@ -1810,6 +1815,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);
@@ -2110,6 +2118,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;
@@ -2152,6 +2192,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。
@@ -2593,7 +2634,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
       };
     }
@@ -2603,6 +2644,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`);
@@ -2618,7 +2660,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/server/modules/products/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ProductsModule = void 0;
 var _BaseModule = require("../../../modules/BaseModule");
+var _utils = require("../../../modules/Holder/utils");
 var _Quotation = require("../../../modules/Quotation");
 var _types = require("./types");
 var _product = require("../../utils/product");
@@ -983,7 +984,7 @@ class ProductsModule extends _BaseModule.BaseModule {
       if (!product) continue;
       snapshots[String(id)] = {
         cover: product.cover,
-        holder_config: product.holder_config
+        holder_config: (0, _utils.resolveProductHolderConfig)(product) ?? undefined
       };
     }
     return snapshots;

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'),
+        item: `${label(locale, 'productHolder')}: ${holderName}`,
+        value: ''
+      });
+    }
     const productNote = resolveProductNote(product, locale);
     const allergy = isPresentId(productUid) ? allergyByProductUid.get(String(productUid).trim()) || '' : '';
     const basePrice = resolveProductBasePrice(product);
@@ -1165,13 +1180,6 @@ function buildFees(params) {
   const isPriceIncludeTax = firstPresentValue(summary.is_price_include_tax, order.is_price_include_tax, shopInfo.is_price_include_tax);
   const roundingAmount = firstPresentValue(summary.rounding_amount, order.rounding_amount);
   const payProcessingFee = financials.payProcessingFee;
-  if (isNonZero(payProcessingFee)) {
-    fees.push({
-      ...receiptKey(order, 'payment-processing-fee'),
-      item: label(locale, 'payProcessingFee'),
-      value: formatMoney(payProcessingFee, currencySymbol)
-    });
-  }
   const productExpectAmount = firstPresentValue(summary.product_expect_amount, summary.product_amount, order.product_expect_amount);
   const productOriginalAmount = firstPresentValue(summary.product_original_amount, order.product_original_amount) ?? calculateProductOriginalAmount(order);
   const totalSavingsAmount = new _decimal.default(toMoneyNumber(productOriginalAmount)).minus(toMoneyNumber(productExpectAmount)).plus(toMoneyNumber(discountAmount));

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.d.ts

@@ -5,6 +5,7 @@ import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentS
 import { OrderModule } from '../../modules/Order';
 import { type PickupTimingBookingInput } from '../../modules/Order/pickupTiming';
 import type { PickupTimingAvailability, PickupTimingSelection, PickupTimingValidationResult } from '../../modules/FulfillmentTiming';
+import { type ContactInfoConfig } from '../../modules/OpenData/contactInfo';
 import type { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, ShopServiceData, ShopServiceType } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount, VirtualCurrencyAsset } from '../../modules/Discount/types';
@@ -281,6 +282,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     setPickupTimingBooking(input: PickupTimingBookingInput): import("../../modules/Order").PickupTimingBooking;
     clearPickupTimingBooking(): void;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
+    protected loadContactInfoOpenData(): Promise<OpenDataConfig | null>;
+    getContactInfoConfig(): Promise<ContactInfoConfig>;
+    validateContactInfo(): Promise<void>;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
     setEnableTempOrderPersist(enabled: boolean): void;
     /** 是否允许 saveDraft 写入 IndexedDB 草稿。 */