@pisell/pisellos 0.10.59 → 0.10.60

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

@@ -1,3 +1,11 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -10,6 +18,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 import { cloneDeep } from 'lodash-es';
 import { buildProductLineFingerprint, getSafeProductNum } from "../../../solution/ScanOrder/utils";
 import { createUuidV4 } from "./orderCollectionIdentity";
+import { getProductHolderRelations } from "../holderRelations";
 
 /**
  * 商品券拆行的身份与回并工具。
@@ -80,15 +89,20 @@ function ensureProductsByUid(tempOrder) {
  * 正常 Order 写路径会在 normalize 阶段提前创建 UID。
  */
 export function ensureUniqueProductLineUids(tempOrder) {
+  var discounts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   // usedUids 只描述本次 Rules 返回的商品集合，不能直接依赖 productsByUid：
   // productsByUid 可能还保留已删除行的历史 runtime，历史 UID 不应导致当前行被改号。
   var usedUids = new Set();
   var productsByUid = ensureProductsByUid(tempOrder);
+  var splitGroups = new Map();
   tempOrder.products = (tempOrder.products || []).map(function (product) {
     var sourceUid = getProductLineUid(product);
     // 单测 mock 或兼容旧 Rules 时可能返回没有 UID 的裸商品。
     // 这里不主动补 UID，避免一个“校验重复”的工具意外改变旧协议对象形状。
     if (!sourceUid) return product;
+    var group = splitGroups.get(sourceUid) || [];
+    group.push(product);
+    splitGroups.set(sourceUid, group);
 
     // 实际场景：可乐 ×5 首次进入 Rules 时只有一行。
     // 使用三张券后 Rules 可能返回「可乐 ×2 + 三条可乐 ×1」，但四条都复制原 UID。
@@ -122,6 +136,127 @@ export function ensureUniqueProductLineUids(tempOrder) {
     usedUids.add(splitUid);
     return product;
   });
+
+  // 仅按本次券上的明确 Holder 分配迁移。数组顺序不能代表券对应的人。
+  // 未能明确分配时保留原 UID，不把整组关系复制给每一个拆分行。
+  var _iterator = _createForOfIteratorHelper(splitGroups),
+    _step;
+  try {
+    var _loop = function _loop() {
+        var _step$value = _slicedToArray(_step.value, 2),
+          sourceUid = _step$value[0],
+          products = _step$value[1];
+        if (products.length < 2) return 0; // continue
+        var relations = getProductHolderRelations(tempOrder, {
+          metadata: {
+            unique_identification_number: sourceUid
+          }
+        });
+        if (!relations.length || relations.some(function (relation) {
+          return relation.holder_type !== 'form';
+        })) return 0; // continue
+        var assignments = new Map();
+        var remaining = _toConsumableArray(relations);
+        var ambiguous = false;
+        var _iterator2 = _createForOfIteratorHelper(products),
+          _step2;
+        try {
+          var _loop2 = function _loop2() {
+              var product = _step2.value;
+              var holderIds = new Set();
+              var _iterator4 = _createForOfIteratorHelper(product.discount_list || []),
+                _step4;
+              try {
+                var _loop3 = function _loop3() {
+                  var _discount$holder;
+                  var item = _step4.value;
+                  var discount = discounts.find(function (candidate) {
+                    var _item$discount;
+                    return String(candidate.id) === String((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id);
+                  });
+                  if ((discount === null || discount === void 0 || (_discount$holder = discount.holder) === null || _discount$holder === void 0 ? void 0 : _discount$holder.holder_type) !== 'form') return 1; // continue
+                  var value = discount.holder.holder_id;
+                  (Array.isArray(value) ? value : [value]).forEach(function (id) {
+                    var recordId = id && _typeof(id) === 'object' ? id.form_record_id : id;
+                    if (recordId !== undefined && recordId !== null && recordId !== '') holderIds.add(String(recordId));
+                  });
+                };
+                for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                  if (_loop3()) continue;
+                }
+              } catch (err) {
+                _iterator4.e(err);
+              } finally {
+                _iterator4.f();
+              }
+              if (!holderIds.size) return 0; // continue
+              var assigned = remaining.filter(function (relation) {
+                return holderIds.has(String(relation.holder_id));
+              });
+              if (assigned.length !== Number(product.num)) {
+                ambiguous = true;
+                return 1; // break
+              }
+              assignments.set(product, assigned);
+              remaining = remaining.filter(function (relation) {
+                return !assigned.includes(relation);
+              });
+            },
+            _ret2;
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            _ret2 = _loop2();
+            if (_ret2 === 0) continue;
+            if (_ret2 === 1) break;
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+        var unassigned = products.filter(function (product) {
+          return !assignments.has(product);
+        });
+        if (ambiguous || unassigned.length > 1) return 0; // continue
+        if (unassigned.length === 1) {
+          if (remaining.length !== Number(unassigned[0].num)) return 0; // continue
+          assignments.set(unassigned[0], remaining);
+        } else if (remaining.length) return 0; // continue
+        var _iterator3 = _createForOfIteratorHelper(assignments),
+          _step3;
+        try {
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var _step3$value = _slicedToArray(_step3.value, 2),
+              product = _step3$value[0],
+              assigned = _step3$value[1];
+            var _iterator5 = _createForOfIteratorHelper(assigned),
+              _step5;
+            try {
+              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                var relation = _step5.value;
+                relation.relation_uuid = String(getProductLineUid(product));
+              }
+            } catch (err) {
+              _iterator5.e(err);
+            } finally {
+              _iterator5.f();
+            }
+          }
+        } catch (err) {
+          _iterator3.e(err);
+        } finally {
+          _iterator3.f();
+        }
+      },
+      _ret;
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      _ret = _loop();
+      if (_ret === 0) continue;
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
 }
 
 /**
@@ -140,12 +275,12 @@ export function consolidateDiscountFreeProductLines(tempOrder) {
   // 清除客户/商品券后，四行都恢复为无折扣状态，应在本轮重算中立即回并为「可乐 ×5」。
   var consolidatedProducts = [];
   var productIndexByKey = new Map();
-  var _iterator = _createForOfIteratorHelper(tempOrder.products || []),
-    _step;
+  var _iterator6 = _createForOfIteratorHelper(tempOrder.products || []),
+    _step6;
   try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
       var _product$booking_uid, _product$metadata4, _booking_id, _product$metadata5, _product$order_detail, _holder_id, _product$metadata6, _product$metadata7, _product$metadata8, _product$product_sku2, _product$metadata9, _tempOrder$_extend, _product$selling_pric, _product$original_pri, _custom_price, _product$is_charge_ta, _product$gift_card, _product$bundle_edit, _product$metadata$pri, _product$metadata10, _product$metadata$sou, _product$metadata11, _product$metadata$mai, _product$metadata12, _product$metadata$mai2, _product$metadata13, _product$product_vari;
-      var product = _step.value;
+      var product = _step6.value;
       var productBundle = Array.isArray(product.product_bundle) ? product.product_bundle : [];
       var hasDiscount = (product.discount_list || []).length > 0 || productBundle.some(function (bundle) {
         return ((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []).length > 0;
@@ -161,7 +296,7 @@ export function consolidateDiscountFreeProductLines(tempOrder) {
       // - 手动改价/备注：用户显式表达了不同价格或不同制作要求；
       // - 称重商品：每次称重的净重和金额属于独立交易事实；
       // - 预约/holder/历史订单行：分别关联预约、持有人或后端 order_detail。
-      var hasMergeBoundary = hasDiscount || Boolean(((_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7._giftInfo) || product._giftInfo) || Boolean((_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8._promotion) || isManualProductDiscountLine(product) || hasProductLineNote(product) || Number(((_product$product_sku2 = product.product_sku) === null || _product$product_sku2 === void 0 ? void 0 : _product$product_sku2.open_sold_weight) || 0) === 1 || ((_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.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 !== '';
+      var hasMergeBoundary = hasDiscount || Boolean(((_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7._giftInfo) || product._giftInfo) || Boolean((_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8._promotion) || isManualProductDiscountLine(product) || hasProductLineNote(product) || Number(((_product$product_sku2 = product.product_sku) === null || _product$product_sku2 === void 0 ? void 0 : _product$product_sku2.open_sold_weight) || 0) === 1 || ((_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.is_edit_for_runtime) === true || bookingId !== undefined && bookingId !== null && bookingId !== 0 && bookingId !== '0' || bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '' || getProductHolderRelations(tempOrder, product).length > 0 || holderId !== undefined && holderId !== null && String(holderId) !== '' || orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '';
       if (hasMergeBoundary) {
         consolidatedProducts.push(product);
         continue;
@@ -219,9 +354,9 @@ export function consolidateDiscountFreeProductLines(tempOrder) {
       // 保留历史索引比立即清理更安全；当前购物车身份始终以 tempOrder.products 为准。
     }
   } catch (err) {
-    _iterator.e(err);
+    _iterator6.e(err);
   } finally {
-    _iterator.f();
+    _iterator6.f();
   }
   tempOrder.products = consolidatedProducts;
 }

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

@@ -367,12 +367,26 @@ export function applyOrderCollectionUidRemaps(sourceOrder, uidRemaps) {
             _iterator4.f();
           }
           if (remap.scope !== 'linked-owner') {
-            var _iterator5 = _createForOfIteratorHelper(order.products || []),
+            var _iterator5 = _createForOfIteratorHelper(order.holder_relations || []),
               _step5;
             try {
               for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                var relation = _step5.value;
+                if (relation.relation_model === 'order_detail' && String(relation.relation_uuid) === remap.from) {
+                  relation.relation_uuid = remap.to;
+                }
+              }
+            } catch (err) {
+              _iterator5.e(err);
+            } finally {
+              _iterator5.f();
+            }
+            var _iterator6 = _createForOfIteratorHelper(order.products || []),
+              _step6;
+            try {
+              for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
                 var _product$metadata, _product$metadata2;
-                var product = _step5.value;
+                var product = _step6.value;
                 if (String((product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.parent_unique_identification_number) || '') === remap.from) {
                   product.metadata = _objectSpread(_objectSpread({}, product.metadata || {}), {}, {
                     parent_unique_identification_number: remap.to
@@ -394,9 +408,9 @@ export function applyOrderCollectionUidRemaps(sourceOrder, uidRemaps) {
                 }
               }
             } catch (err) {
-              _iterator5.e(err);
+              _iterator6.e(err);
             } finally {
-              _iterator5.f();
+              _iterator6.f();
             }
           }
           var productsByUid = (_order$_extend = order._extend) === null || _order$_extend === void 0 ? void 0 : _order$_extend.productsByUid;
@@ -429,12 +443,12 @@ export function applyOrderCollectionUidRemaps(sourceOrder, uidRemaps) {
           }
         }
         if (remap.kind === 'booking') {
-          var _iterator6 = _createForOfIteratorHelper(order.products || []),
-            _step6;
+          var _iterator7 = _createForOfIteratorHelper(order.products || []),
+            _step7;
           try {
-            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+            for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
               var _product$metadata3;
-              var _product = _step6.value;
+              var _product = _step7.value;
               if (remap.scope === 'linked-owner' && (linkedOwnerIsAmbiguous || getOrderCollectionUid('product', _product) !== remap.referenceOwnerUid)) {
                 continue;
               }
@@ -448,9 +462,9 @@ export function applyOrderCollectionUidRemaps(sourceOrder, uidRemaps) {
               }
             }
           } catch (err) {
-            _iterator6.e(err);
+            _iterator7.e(err);
           } finally {
-            _iterator6.f();
+            _iterator7.f();
           }
         }
       },

package/dist/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/dist/modules/Order/utils.js

@@ -1,6 +1,6 @@
 var _excluded = ["custom_product_bundle_map_id"],
   _excluded2 = ["unique_identification_number"],
-  _excluded3 = ["num", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per", "production_code"],
+  _excluded3 = ["num", "_extend", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per", "production_code"],
   _excluded4 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "discount_list", "order_meta_list", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id", "payment_status", "notes"],
   _excluded5 = ["collect_pax", "table_occupancy_duration", "cart_settlement_key", "cart_settlement_snapshot", "legal_currency_snapshot"];
 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; }
@@ -22,6 +22,7 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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); }
+import { cloneDeep } from 'lodash-es';
 import dayjs from "dayjs";
 import customParseFormat from 'dayjs/plugin/customParseFormat';
 import Decimal from 'decimal.js';
@@ -32,6 +33,7 @@ import { buildProductLineFingerprint, createEmptySummary } from "../../solution/
 import { createUuidV4 } from "./utils/orderCollectionIdentity";
 import { encodeSalesNotes } from "./salesNotes";
 import { isFulfillmentTimingBooking } from "./pickupTiming";
+import { ensureHolderRelationUuids, getProductHolderRelations, hasProductBooking, removeProductHolderRelations } from "./holderRelations";
 dayjs.extend(customParseFormat);
 var POINT_CARD_SNAPSHOT_TAG = 'point_card';
 var VIRTUAL_CURRENCY_SNAPSHOT_TAG = 'virtual_currency';
@@ -788,7 +790,7 @@ export function resolveEffectivePerUnitDiscount(product) {
   if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice)) return fromList;
   return fromList + (originalPrice - finalPrice);
 }
-export function createDefaultOrderRulesHooks(getBookings) {
+export function createDefaultOrderRulesHooks(getBookings, getHolderRelations) {
   var getProductStartDate = function getProductStartDate(product) {
     var _ref17, _product$metadata$uni, _product$metadata2, _ref18, _product$booking_uid, _product$metadata3, _product$metadata4, _product$metadata5, _product$metadata6;
     var productUid = String((_ref17 = (_product$metadata$uni = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product.unique_identification_number) !== null && _ref17 !== void 0 ? _ref17 : '');
@@ -911,7 +913,13 @@ export function createDefaultOrderRulesHooks(getBookings) {
         // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
         // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
         isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
-        holder_id: (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.holder_id,
+        holder_id: hasProductBooking(product) || !getHolderRelations ? (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.holder_id : getProductHolderRelations({
+          holder_relations: getHolderRelations()
+        }, product).filter(function (relation) {
+          return relation.holder_type === 'form';
+        }).map(function (relation) {
+          return relation.holder_id;
+        }),
         startDate: getProductStartDate(product),
         main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new Decimal(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString() : undefined,
         inPromotion: ((_metadataAny$_promoti = metadataAny._promotion) === null || _metadataAny$_promoti === void 0 ? void 0 : _metadataAny$_promoti.inPromotion) === true,
@@ -1208,6 +1216,7 @@ function normalizeSubmitProduct(product) {
     _runtimeUid = _ref37.unique_identification_number,
     submitProduct = _objectWithoutProperties(_ref37, _excluded2);
   var num = submitProduct.num,
+    _productExtend = submitProduct._extend,
     _productSurchargeFee = submitProduct.surcharge_fee,
     _deprecatedDiscountAmount = submitProduct.discount_amount,
     _deprecatedDiscountType = submitProduct.discount_type,
@@ -1398,6 +1407,7 @@ export function createDefaultTempOrder(params) {
     request_unique_idempotency_token: '',
     vouchers: [],
     products: [],
+    holder_relations: [],
     notes: [],
     bookings: [],
     payments: [],
@@ -1474,6 +1484,7 @@ export function buildSubmitPayload(params) {
     type = params.type,
     summary = params.summary,
     enhance = params.enhance;
+  ensureHolderRelationUuids(tempOrder);
   var scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   var bookingUuid = createUuidV4();
   var virtualSettlementMode = ((_tempOrder$metadata2 = tempOrder.metadata) === null || _tempOrder$metadata2 === void 0 || (_tempOrder$metadata2 = _tempOrder$metadata2.currency_settlement_config) === null || _tempOrder$metadata2 === void 0 ? void 0 : _tempOrder$metadata2.settlement_type) === 'virtual_currency';
@@ -1510,7 +1521,9 @@ export function buildSubmitPayload(params) {
     tempOrderBusinessCode: tempOrder.business_code,
     bookings: tempOrder.bookings
   });
-  var payload = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, tempOrderRest), {}, {
+  var payload = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, tempOrderRest), tempOrder.holder_relations !== undefined ? {
+    holder_relations: cloneDeep(tempOrder.holder_relations)
+  } : {}), {}, {
     customer_id: (_tempOrder$customer_i = tempOrder.customer_id) !== null && _tempOrder$customer_i !== void 0 ? _tempOrder$customer_i : 1,
     customer_name: tempOrder.customer_name || 'Walk-In',
     country_calling_code: String((_tempOrder$country_ca = tempOrder.country_calling_code) !== null && _tempOrder$country_ca !== void 0 ? _tempOrder$country_ca : ''),
@@ -1697,21 +1710,32 @@ export function hasAssignedHolderId(value) {
  * clearTempOrderHolderAssignments(tempOrder);
  */
 export function clearTempOrderHolderAssignments(tempOrder) {
-  var _tempOrder$_extend2;
-  var changed = false;
+  var _tempOrder$holder_rel, _tempOrder$holder_rel2, _tempOrder$_extend2;
+  var previousRelationCount = ((_tempOrder$holder_rel = tempOrder.holder_relations) === null || _tempOrder$holder_rel === void 0 ? void 0 : _tempOrder$holder_rel.length) || 0;
+  removeProductHolderRelations(tempOrder, (tempOrder.products || []).filter(function (product) {
+    return !hasProductBooking(product);
+  }));
+  var changed = previousRelationCount !== (((_tempOrder$holder_rel2 = tempOrder.holder_relations) === null || _tempOrder$holder_rel2 === void 0 ? void 0 : _tempOrder$holder_rel2.length) || 0);
   var resetHolderField = function resetHolderField(target) {
     var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'holder_id';
     if (!hasAssignedHolderId(target[key])) return;
     target[key] = null;
     changed = true;
   };
+  var clearHolder = function clearHolder(target) {
+    resetHolderField(target);
+    if (target.holder !== undefined && target.holder !== null) {
+      target.holder = null;
+      changed = true;
+    }
+  };
   var _iterator8 = _createForOfIteratorHelper(tempOrder.products || []),
     _step8;
   try {
     for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
       var product = _step8.value;
       if (product.metadata && _typeof(product.metadata) === 'object') {
-        resetHolderField(product.metadata);
+        clearHolder(product.metadata);
       }
     }
   } catch (err) {
@@ -1744,11 +1768,13 @@ export function clearTempOrderHolderAssignments(tempOrder) {
       var entry = _Object$values[_i4];
       var origin = entry === null || entry === void 0 ? void 0 : 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/dist/server/index.js

@@ -2845,7 +2845,7 @@ var Server = /*#__PURE__*/function () {
               backendPath = params.backendPath, checkoutData = params.checkoutData, externalSaleNumber = params.externalSaleNumber, fresh = params.fresh, title = params.title, persistCheckoutDataWithResponse = params.persistCheckoutDataWithResponse;
               shouldMergeRemoteOrder = fresh ? this.isMergeableCheckoutOrder(fresh, externalSaleNumber) : false;
               if (!(this.order && fresh && (shouldMergeRemoteOrder || persistCheckoutDataWithResponse))) {
-                _context34.next = 9;
+                _context34.next = 10;
                 break;
               }
               syncedOrder = persistCheckoutDataWithResponse ? _objectSpread(_objectSpread(_objectSpread({}, checkoutData), this.mergeCheckoutSyncPayments(checkoutData, fresh, title)), {}, {
@@ -2857,9 +2857,12 @@ var Server = /*#__PURE__*/function () {
                 need_sync: 0,
                 is_draft_order: 0
               });
-              _context34.next = 6;
+              if (!Array.isArray(fresh.holder_relations) && Array.isArray(checkoutData === null || checkoutData === void 0 ? void 0 : checkoutData.holder_relations)) {
+                syncedOrder.holder_relations = cloneDeep(checkoutData.holder_relations);
+              }
+              _context34.next = 7;
               return this.order.upsertOrdersFromRemote([syncedOrder], 'checkoutSync');
-            case 6:
+            case 7:
               this.logInfo("".concat(title, ": sync_sales \u5B8C\u6574\u8BA2\u5355\u5DF2\u540C\u6B65\u5230\u672C\u5730"), {
                 order_id: fresh.order_id,
                 external_sale_number: syncedOrder.external_sale_number,
@@ -2867,20 +2870,20 @@ var Server = /*#__PURE__*/function () {
                 mergedRemoteOrder: shouldMergeRemoteOrder,
                 persistedCheckoutDataWithResponse: persistCheckoutDataWithResponse
               });
-              _context34.next = 19;
+              _context34.next = 20;
               break;
-            case 9:
+            case 10:
               if (!(this.order && externalSaleNumber && typeof this.order.markOrderSyncedByExternalSaleNumber === 'function')) {
-                _context34.next = 18;
+                _context34.next = 19;
                 break;
               }
               patch = this.buildCheckoutSyncSuccessPatch(fresh);
-              _context34.next = 13;
+              _context34.next = 14;
               return this.order.markOrderSyncedByExternalSaleNumber({
                 externalSaleNumber: externalSaleNumber,
                 patch: patch
               });
-            case 13:
+            case 14:
               result = _context34.sent;
               syncedOrder = (result === null || result === void 0 ? void 0 : result.order) || _objectSpread(_objectSpread(_objectSpread({}, checkoutData), patch), {}, {
                 external_sale_number: externalSaleNumber,
@@ -2893,17 +2896,17 @@ var Server = /*#__PURE__*/function () {
                 hasRemoteOrder: !!fresh,
                 mergedRemoteOrder: false
               });
-              _context34.next = 19;
+              _context34.next = 20;
               break;
-            case 18:
+            case 19:
               this.logWarning("".concat(title, ": sync_sales Order \u6A21\u5757\u672A\u6CE8\u518C"), {
                 backendPath: backendPath,
                 external_sale_number: externalSaleNumber,
                 order_id: fresh === null || fresh === void 0 ? void 0 : fresh.order_id
               });
-            case 19:
-              return _context34.abrupt("return", syncedOrder);
             case 20:
+              return _context34.abrupt("return", syncedOrder);
+            case 21:
             case "end":
               return _context34.stop();
           }
@@ -8002,6 +8005,9 @@ var Server = /*#__PURE__*/function () {
       if (fresh.order_number !== undefined && fresh.order_number !== null) {
         patch.order_number = fresh.order_number;
       }
+      if (Array.isArray(fresh.holder_relations)) {
+        patch.holder_relations = cloneDeep(fresh.holder_relations);
+      }
       return patch;
     }
   }, {

package/dist/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;