@pisell/pisellos 0.10.59 → 0.10.61

package/dist/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/dist/shared/receipt/small-ticket.js

@@ -20,6 +20,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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 dayjs from 'dayjs';
 import Decimal from 'decimal.js';
+import { getProductHolderRelations, hasProductBooking } from "../../modules/Order/holderRelations";
 import { isFulfillmentTimingBooking } from "../../modules/Order/pickupTiming";
 import { resolveInvoiceDataVisibility } from "./templateVisibility";
 var DEFAULT_LOCALES = ['en', 'zh_CN'];
@@ -115,6 +116,7 @@ var LABELS = {
     bookingDateTime: 'Date & time',
     bookingResource: 'Resource',
     bookingHolder: 'Holder',
+    productHolder: 'Holder',
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
     manualMarkup: 'Manual markup',
@@ -160,6 +162,7 @@ var LABELS = {
     bookingDateTime: '日期和时间',
     bookingResource: '资源',
     bookingHolder: '预约人',
+    productHolder: '持有人',
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
     manualMarkup: '手动加价',
@@ -205,6 +208,7 @@ var LABELS = {
     bookingDateTime: '日期和時間',
     bookingResource: '資源',
     bookingHolder: '預約人',
+    productHolder: '持有人',
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
     manualMarkup: '手動加價',
@@ -248,6 +252,7 @@ var LABELS = {
     bookingDateTime: '日時',
     bookingResource: 'リソース',
     bookingHolder: '予約者',
+    productHolder: '利用者',
     orderDiscount: '注文割引',
     manualDiscount: '手動割引',
     manualMarkup: '手動値上げ',
@@ -292,6 +297,7 @@ var LABELS = {
     bookingDateTime: 'Data e hora',
     bookingResource: 'Recurso',
     bookingHolder: 'Titular',
+    productHolder: 'Titular',
     orderDiscount: 'Desconto do pedido',
     manualDiscount: 'Desconto manual',
     manualMarkup: 'Acréscimo manual',
@@ -461,6 +467,17 @@ function buildProducts(order, locale, productMap) {
       quantity: quantity,
       originalPrice: originalPrice
     });
+    var holderName = hasProductBooking(product) ? '' : getProductHolderRelations(order, product).map(function (relation) {
+      var _relation$metadata;
+      return getLocalizedValue((_relation$metadata = relation.metadata) === null || _relation$metadata === void 0 ? void 0 : _relation$metadata.name, locale).trim();
+    }).filter(Boolean).join(', ');
+    if (holderName) {
+      // 复用 Web Invoice / 原生均支持的文本扩展行，不混入金额或商品备注。
+      extensionList.push(_objectSpread(_objectSpread({}, receiptKey(rawProduct, 'product-holder', 'text')), {}, {
+        item: "".concat(label(locale, 'productHolder'), ": ").concat(holderName),
+        value: ''
+      }));
+    }
     var productNote = resolveProductNote(product, locale);
     var allergy = isPresentId(productUid) ? allergyByProductUid.get(String(productUid).trim()) || '' : '';
     var basePrice = resolveProductBasePrice(product);

package/dist/shared/sales/loadSalesOrderSnapshot.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-export var SALES_ORDER_RELATIONS = ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'order_meta_list', 'refunds', 'notes'];
+export var 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. */
 export function loadSalesOrderSnapshot(request, params) {

package/dist/solution/BaseSales/index.js

@@ -39,6 +39,7 @@ import { BaseSalesHookNames } from "./types";
 import { OrderModule } from "../../modules/Order";
 import { isFulfillmentTimingBooking } from "../../modules/Order/pickupTiming";
 import { PickupTimingController } from "./pickupTiming";
+import { getProductHolderRelations, hasProductBooking } from "../../modules/Order/holderRelations";
 import Decimal from 'decimal.js';
 import { cloneDeep, isEqual, mergeWith } from 'lodash-es';
 import { createModule } from "../BookingByStep/types";
@@ -399,6 +400,67 @@ function areBaseSalesNotesEquivalent(currentValue, loadedValue, options) {
   var loadedNotes = normalizeBaseSalesNotesForComparison(loadedValue);
   return currentNotes !== null && loadedNotes !== null && isEqual(currentNotes, loadedNotes);
 }
+function mergeBaseSalesHolderRelations(currentRecord, incomingRecord, strategy) {
+  if (!Array.isArray(incomingRecord.holder_relations)) {
+    return cloneDeep(currentRecord.holder_relations);
+  }
+
+  // 仅保留商品集合合并实际留下的本地行关系；匹配的行沿用 incoming 快照。
+  // 未提供 products 的稀疏包不能据此判断哪些行已被删除或被本地保留。
+  var retainedProductUids = new Set();
+  if (Array.isArray(incomingRecord.products)) {
+    var _iterator2 = _createForOfIteratorHelper(currentRecord.products || []),
+      _step2;
+    try {
+      var _loop = function _loop() {
+        var product = _step2.value;
+        var retained = !incomingRecord.products.some(function (incomingProduct) {
+          return isSameOrderCollectionItem('product', product, incomingProduct);
+        }) && (strategy === 'preserve-local' || !getOrderCollectionPersistentId('product', product));
+        var uid = getOrderCollectionReferenceUid('product', product);
+        if (retained && uid) retainedProductUids.add(uid);
+      };
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        _loop();
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+  }
+  var belongsToRetainedProduct = function belongsToRetainedProduct(relation) {
+    return (relation === null || relation === void 0 ? void 0 : relation.relation_model) === 'order_detail' && retainedProductUids.has(String(relation.relation_uuid));
+  };
+  var selectedRelations = [].concat(_toConsumableArray(incomingRecord.holder_relations.filter(function (relation) {
+    return !belongsToRetainedProduct(relation);
+  })), _toConsumableArray(Array.isArray(currentRecord.holder_relations) ? currentRecord.holder_relations.filter(belongsToRetainedProduct) : []));
+  var result = [];
+  var indexByIdentity = new Map();
+  var _iterator3 = _createForOfIteratorHelper(selectedRelations),
+    _step3;
+  try {
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var relation = _step3.value;
+      var identityParts = [relation === null || relation === void 0 ? void 0 : relation.relation_model, relation === null || relation === void 0 ? void 0 : relation.relation_uuid, relation === null || relation === void 0 ? void 0 : relation.holder_type, relation === null || relation === void 0 ? void 0 : relation.holder_id];
+      var identity = identityParts.every(function (value) {
+        return value !== undefined && value !== null;
+      }) ? JSON.stringify(identityParts) : null;
+      var existingIndex = identity === null ? undefined : indexByIdentity.get(identity);
+      if (existingIndex !== undefined) {
+        result[existingIndex] = cloneDeep(relation);
+      } else {
+        if (identity !== null) indexByIdentity.set(identity, result.length);
+        result.push(cloneDeep(relation));
+      }
+    }
+  } catch (err) {
+    _iterator3.e(err);
+  } finally {
+    _iterator3.f();
+  }
+  return result;
+}
 function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, strategy) {
   var _currentTempOrder$_ex, _normalizedLoadedReco;
   var loadedHasOrderMetaList = Object.prototype.hasOwnProperty.call(loadedRecord || {}, 'order_meta_list');
@@ -418,8 +480,12 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
   var normalizedCurrentTempOrder = normalizeBaseSalesRecordCollections(currentTempOrder, {
     ensureUid: false
   });
+  var mergedHolderRelations = mergeBaseSalesHolderRelations(normalizedCurrentTempOrder, normalizedLoadedRecord, strategy);
   var uidRemaps = [];
-  var mergedRecord = mergeWith(normalizedCurrentTempOrder, normalizedLoadedRecord, function (currentValue, loadedValue, key) {
+  var mergedRecord = mergeWith(normalizedCurrentTempOrder, normalizedLoadedRecord, function (currentValue, loadedValue, key, object) {
+    if (key === 'holder_relations' && object === normalizedCurrentTempOrder) {
+      return cloneDeep(mergedHolderRelations);
+    }
     // order_meta_list 是服务端/本地订单携带的完整业务快照。若 incoming
     // 明确提供它，必须整体替换；若省略，则保留当前值，避免 snapshot
     // 数组递归拼接后出现同 ID 的旧数据。
@@ -1844,20 +1910,20 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getFulfillmentRefMode",
     value: function getFulfillmentRefMode() {
-      var _iterator2 = _createForOfIteratorHelper(this.getFulfillmentRefModeConfigs()),
-        _step2;
+      var _iterator4 = _createForOfIteratorHelper(this.getFulfillmentRefModeConfigs()),
+        _step4;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var config = _step2.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var config = _step4.value;
           var mode = config['fulfillment.fulfillment_ref_mode'];
           if (mode === undefined || mode === null) continue;
           var normalized = String(mode).trim();
           if (normalized) return normalized;
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator2.f();
+        _iterator4.f();
       }
       return undefined;
     }
@@ -3278,7 +3344,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           _this$store$order9,
           _this18 = this,
           _discountModule$getDi3;
-        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, requestOrderIdentityKey, discountConfigCacheKey, requestEpoch, isCurrentRequest, getCurrentResult, searchedDiscountList, searchedDiscountIds, preparedDiscountList, _this$store$order$get4, _this$store$order10, _discountModule$setOr, prepareConfigPromise, _discountModule$setOr2, _discountModule$setDi, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _orderStore$summary, orderTotalAmount, result, _iterator3, _step3, _product$metadata5, _tempOrder$_extend6, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
+        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, requestOrderIdentityKey, discountConfigCacheKey, requestEpoch, isCurrentRequest, getCurrentResult, searchedDiscountList, searchedDiscountIds, preparedDiscountList, _this$store$order$get4, _this$store$order10, _discountModule$setOr, prepareConfigPromise, _discountModule$setOr2, _discountModule$setDi, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _orderStore$summary, orderTotalAmount, result, _iterator5, _step5, _product$metadata5, _tempOrder$_extend6, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
@@ -3508,15 +3574,15 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               if (result.productList) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
-              _iterator3 = _createForOfIteratorHelper(tempOrder.products || []);
+              _iterator5 = _createForOfIteratorHelper(tempOrder.products || []);
               _context30.prev = 82;
-              _iterator3.s();
+              _iterator5.s();
             case 84:
-              if ((_step3 = _iterator3.n()).done) {
+              if ((_step5 = _iterator5.n()).done) {
                 _context30.next = 99;
                 break;
               }
-              product = _step3.value;
+              product = _step5.value;
               productUid = (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend6 = tempOrder._extend) === null || _tempOrder$_extend6 === void 0 || (_tempOrder$_extend6 = _tempOrder$_extend6.productsByUid) === null || _tempOrder$_extend6 === void 0 || (_tempOrder$_extend6 = _tempOrder$_extend6[productUid]) === null || _tempOrder$_extend6 === void 0 ? void 0 : _tempOrder$_extend6.origin : undefined;
               if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
@@ -3549,10 +3615,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 101:
               _context30.prev = 101;
               _context30.t0 = _context30["catch"](82);
-              _iterator3.e(_context30.t0);
+              _iterator5.e(_context30.t0);
             case 104:
               _context30.prev = 104;
-              _iterator3.f();
+              _iterator5.f();
               return _context30.finish(104);
             case 107:
               if (!result.discountList) {
@@ -3881,7 +3947,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountSelected",
     value: function () {
       var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
-        var currentOrder, _store3, _store3$setDiscountLi, list, updated, tempOrder, orderStore, _discountModule, rulesModule, nextDiscountList, _orderStore$summary3, orderTotalAmount, result, beforeSelectedIds, _iterator4, _step4, d, selectedResourceIds, filterSelectedDiscountDetails, _iterator5, _step5, _product$metadata8, _tempOrder$_extend7, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
+        var currentOrder, _store3, _store3$setDiscountLi, list, updated, tempOrder, orderStore, _discountModule, rulesModule, nextDiscountList, _orderStore$summary3, orderTotalAmount, result, beforeSelectedIds, _iterator6, _step6, d, selectedResourceIds, filterSelectedDiscountDetails, _iterator7, _step7, _product$metadata8, _tempOrder$_extend7, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
         return _regeneratorRuntime().wrap(function _callee34$(_context34) {
           while (1) switch (_context34.prev = _context34.next) {
             case 0:
@@ -3954,10 +4020,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                     }).map(function (d) {
                       return d.id;
                     }));
-                    _iterator4 = _createForOfIteratorHelper(nextDiscountList);
+                    _iterator6 = _createForOfIteratorHelper(nextDiscountList);
                     try {
-                      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                        d = _step4.value;
+                      for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                        d = _step6.value;
                         if (d.isSelected && !beforeSelectedIds.has(d.id)) {
                           d.isSelected = false;
                           d.isManualSelect = true;
@@ -3965,9 +4031,9 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                         }
                       }
                     } catch (err) {
-                      _iterator4.e(err);
+                      _iterator6.e(err);
                     } finally {
-                      _iterator4.f();
+                      _iterator6.f();
                     }
                   }
                 }
@@ -3984,15 +4050,15 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                   return rid != null && selectedResourceIds.has(rid);
                 });
               };
-              _iterator5 = _createForOfIteratorHelper(tempOrder.products);
+              _iterator7 = _createForOfIteratorHelper(tempOrder.products);
               _context34.prev = 27;
-              _iterator5.s();
+              _iterator7.s();
             case 29:
-              if ((_step5 = _iterator5.n()).done) {
+              if ((_step7 = _iterator7.n()).done) {
                 _context34.next = 46;
                 break;
               }
-              product = _step5.value;
+              product = _step7.value;
               productUid = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend7 = tempOrder._extend) === null || _tempOrder$_extend7 === void 0 || (_tempOrder$_extend7 = _tempOrder$_extend7.productsByUid) === null || _tempOrder$_extend7 === void 0 || (_tempOrder$_extend7 = _tempOrder$_extend7[productUid]) === null || _tempOrder$_extend7 === void 0 ? void 0 : _tempOrder$_extend7.origin : undefined;
               if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
@@ -4043,10 +4109,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 48:
               _context34.prev = 48;
               _context34.t0 = _context34["catch"](27);
-              _iterator5.e(_context34.t0);
+              _iterator7.e(_context34.t0);
             case 51:
               _context34.prev = 51;
-              _iterator5.f();
+              _iterator7.f();
               return _context34.finish(51);
             case 54:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
@@ -5172,7 +5238,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var walletProducts = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products.map(function (product) {
         var _product$holder_id, _product$product_vari3, _product$is_charge_ta, _metadata$main_produc, _metadata$main_produc2;
         var metadata = product.metadata || {};
-        var rawHolderId = (_product$holder_id = product.holder_id) !== null && _product$holder_id !== void 0 ? _product$holder_id : metadata.holder_id;
+        var rawHolderId = hasProductBooking(product) ? (_product$holder_id = product.holder_id) !== null && _product$holder_id !== void 0 ? _product$holder_id : metadata.holder_id : getProductHolderRelations(tempOrder, product).filter(function (relation) {
+          return relation.holder_type === 'form';
+        }).map(function (relation) {
+          return relation.holder_id;
+        });
         var holderIdValue = Array.isArray(rawHolderId) ? rawHolderId[0] : rawHolderId;
         var holder_id = Number.isInteger(Number(holderIdValue)) ? Number(holderIdValue) : undefined;
         return {

package/dist/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/dist/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/dist/solution/BaseSales/utils/parseSalesResponse.js

@@ -25,6 +25,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 
 import { normalizeOrderCollections } from "../../../modules/Order/utils/orderCollectionIdentity";
 import { isFulfillmentTimingBooking } from "../../../modules/Order/pickupTiming";
+import { cloneDeep } from 'lodash-es';
 /** OrderData 中除大数组外的"顶层 header 字段"白名单，按需扩展。 */
 var HEADER_KEYS = ['order_id', 'order_number', 'shop_order_number', 'shop_full_order_number', 'type', 'business_code', 'platform', 'sales_channel', 'order_sales_channel', 'vouchers', 'status', 'payment_status', 'shipping_status', 'customer_id', 'customer_name', 'country_calling_code', 'phone', 'email', 'is_price_include_tax', 'tax_title', 'tax_country_code', 'currency_code', 'currency_symbol', 'currency_format', 'is_deposit', 'deposit_amount', 'shop_discount', 'surcharge_fee', 'note', 'schedule_date', 'created_at', 'updated_at', 'order_meta_list', 'metadata', 'total_amount', 'shop_id', 'create_date', 'holder', 'relation_forms', 'contacts', 'contacts_info'];
 function pickHeader(raw) {
@@ -144,9 +145,12 @@ export function parseSalesResponse(input) {
     return _objectSpread({}, d || {});
   }) : [];
   var summary = raw !== null && raw !== void 0 && raw.summary && _typeof(raw.summary) === 'object' ? _objectSpread({}, raw.summary) : {};
-  return {
+  return _objectSpread(_objectSpread({
     header: pickHeader(raw),
-    products: products,
+    products: products
+  }, Array.isArray(raw === null || raw === void 0 ? void 0 : raw.holder_relations) ? {
+    holder_relations: cloneDeep(raw.holder_relations)
+  } : {}), {}, {
     bookings: bookings,
     rootBooking: rootBooking,
     bookingsByProductUid: bookingsByProductUid,
@@ -156,5 +160,5 @@ export function parseSalesResponse(input) {
     customer: pickCustomer(raw),
     summary: summary,
     raw: raw
-  };
+  });
 }

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

@@ -12,6 +12,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; }
 import { resolveWeighedSourcePrice, withOriginalBundleOptionPrices } from "../../../modules/Order/utils/weighedProduct";
+import { isBookingProduct } from "../../../modules/BookingContext/utils/serviceTimes";
 import { composeLinePrice, getBundleSellingMagnitude, normalizeProductSkuOptions, sumOptionUnitPrice } from "../../../modules/Order/utils";
 import { buildManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, shouldBuildManualProductDiscount } from "../../../modules/Order/utils/manualProductDiscount";
 function toNumber(value) {
@@ -168,7 +169,7 @@ function findVariantById(origin, variantId) {
  * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
  */
 export function transformBaseProductToOrderProduct(params) {
-  var _ref12, _ref13, _ref14, _payload$product_id, _ref15, _ref16, _payload$product_vari, _payload$_origin, _payload$_origin2, _payload$metadata, _sourceProduct$metada, _callbackOrigin$metad, _origin$metadata, _payload$metadata2, _payload$_extend, _sourceProduct$metada2, _sourceProduct$_exten, _callbackOrigin$metad2, _callbackOrigin$_exte, _payload$_dataVariant, _sourceProduct$_dataV, _callbackOrigin$_data, _origin$_dataVariant, _ref17, _findVariantById, _origin$production_co, _ref18, _ref19, _ref20, _ref21, _ref22, _matchedVariant$price, _payload$product_sku, _payload$_extend$weig, _payload$_extend2, _origin$_extend, _ref23, _ref24, _payload$price, _ref25, _payload$line_total, _payload$_extend3, _ref26, _ref27, _payload$product_sku$, _payload$product_sku2, _payload$bundle, _payload$quantity, _payload$_extend4, _extend, _extend2, _ref28, _ref29, _origin$base_price, _ref30, _ref31, _payload$line_total2, _payload$_extend5, _payload$_extend6, _extend3, _payload$_extend7, _payload$_extend8, _ref32, _ref33, _payload$tax_fee, _ref34, _ref35, _payload$is_charge_ta;
+  var _ref12, _ref13, _ref14, _payload$product_id, _ref15, _ref16, _payload$product_vari, _payload$_origin, _payload$_origin2, _payload$metadata, _sourceProduct$metada, _callbackOrigin$metad, _origin$metadata, _payload$metadata2, _payload$_extend, _sourceProduct$metada2, _sourceProduct$_exten, _callbackOrigin$metad2, _callbackOrigin$_exte, _payload$_dataVariant, _sourceProduct$_dataV, _callbackOrigin$_data, _origin$_dataVariant, _ref17, _findVariantById, _origin$production_co, _ref18, _ref19, _ref20, _ref21, _ref22, _matchedVariant$price, _payload$product_sku, _payload$_extend$weig, _payload$_extend2, _origin$_extend, _ref23, _ref24, _payload$price, _ref25, _payload$line_total, _payload$_extend3, _ref26, _ref27, _payload$product_sku$, _payload$product_sku2, _payload$bundle, _payload$quantity, _payload$_extend4, _extend, _extend2, _ref28, _ref29, _origin$base_price, _ref30, _ref31, _payload$line_total2, _payload$_extend5, _payload$_extend6, _extend3, _payload$_extend7, _payload$_extend8, _find, _ref32, _ref33, _payload$tax_fee, _ref34, _ref35, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
@@ -242,6 +243,9 @@ export function transformBaseProductToOrderProduct(params) {
   });
   var derivedMainSelling = hasExplicitLineTotal ? Number(lineCompositeTotal) - Number(bundleOnlyComposite) : Number(mainProductOriginalPrice);
   var mainProductSellingPrice = toPriceString(Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice));
+  var holderRelations = (_find = [payload._extend, callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin._extend, sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct._extend].find(function (source) {
+    return Array.isArray(source === null || source === void 0 ? void 0 : source.holder_relations);
+  })) === null || _find === void 0 ? void 0 : _find.holder_relations;
   var metadata = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     unique: payload.unique,
     session: payload.session,
@@ -275,7 +279,7 @@ export function transformBaseProductToOrderProduct(params) {
   var productTitle = _objectSpread(_objectSpread({}, productTitleI18n), {}, {
     original: productTitleI18n.original || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.original_title) || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
   });
-  return _objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread({
     product_id: productId,
     product_variant_id: productVariantId,
     production_code: productionCode,
@@ -294,7 +298,12 @@ export function transformBaseProductToOrderProduct(params) {
     original_price: lineOriginalPrice,
     tax_fee: toPriceString((_ref32 = (_ref33 = (_payload$tax_fee = payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.tax_fee) !== null && _ref33 !== void 0 ? _ref33 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref32 !== void 0 ? _ref32 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
     is_charge_tax: toNumber((_ref34 = (_ref35 = (_payload$is_charge_ta = payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref35 !== void 0 ? _ref35 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref34 !== void 0 ? _ref34 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.is_charge_tax, 0),
-    metadata: metadata,
+    metadata: metadata
+  }, holderRelations !== undefined && !isBookingProduct(origin) && !isBookingProduct(payload) ? {
+    _extend: {
+      holder_relations: holderRelations
+    }
+  } : {}), {}, {
     note: payload.note != null ? String(payload.note) : '',
     product_title: productTitle,
     product_cover: firstNonBlank(matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.cover, sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.cover),

package/dist/solution/BookingTicket/index.js

@@ -2622,7 +2622,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "buildNormalProductCacheItemFromOrderLine",
     value: function buildNormalProductCacheItemFromOrderLine(input) {
-      return buildNormalProductCacheItemFromOrderLineUtil(input);
+      var _input$holder_relatio, _this$store$order7;
+      return buildNormalProductCacheItemFromOrderLineUtil(_objectSpread(_objectSpread({}, input), {}, {
+        holder_relations: (_input$holder_relatio = input.holder_relations) !== null && _input$holder_relatio !== void 0 ? _input$holder_relatio : (_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 || (_this$store$order7 = _this$store$order7.getTempOrder()) === null || _this$store$order7 === void 0 ? void 0 : _this$store$order7.holder_relations
+      }));
     }
 
     /** 文档别名：与 OrderModule.updateOrderProduct 一致。 */
@@ -3147,7 +3150,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "handleRedeem",
     value: function () {
       var _handleRedeem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
-        var _this$store$order7, _this$store$order7$ge, _this$store$order8, _ref20, _tempOrder$order_id2;
+        var _this$store$order8, _this$store$order8$ge, _this$store$order9, _ref20, _tempOrder$order_id2;
         var voucherIds, status, voucherIdSet, tempOrder, vouchers, hasUpdatedVoucher, nextVouchers, identity, externalSaleNumber, orderId, orderLookup;
         return _regeneratorRuntime().wrap(function _callee38$(_context38) {
           while (1) switch (_context38.prev = _context38.next) {
@@ -3163,8 +3166,8 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 }
               });
               voucherIdSet = new Set(voucherIds);
-              tempOrder = (_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 || (_this$store$order7$ge = _this$store$order7.getTempOrder) === null || _this$store$order7$ge === void 0 ? void 0 : _this$store$order7$ge.call(_this$store$order7);
-              vouchers = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.vouchers) || ((_this$store$order8 = this.store.order) === null || _this$store$order8 === void 0 ? void 0 : _this$store$order8.getVouchers()) || [];
+              tempOrder = (_this$store$order8 = this.store.order) === null || _this$store$order8 === void 0 || (_this$store$order8$ge = _this$store$order8.getTempOrder) === null || _this$store$order8$ge === void 0 ? void 0 : _this$store$order8$ge.call(_this$store$order8);
+              vouchers = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.vouchers) || ((_this$store$order9 = this.store.order) === null || _this$store$order9 === void 0 ? void 0 : _this$store$order9.getVouchers()) || [];
               hasUpdatedVoucher = false;
               nextVouchers = vouchers.map(function (voucher) {
                 if (!voucherIdSet.has(voucher.voucher_id)) return voucher;

package/dist/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/dist/solution/BookingTicket/utils/addProductDecision.js

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

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

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

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

@@ -13,6 +13,7 @@ export var searchWalletPass = /*#__PURE__*/function () {
         case 0:
           params = {
             code: code,
+            resolve_ticket_order: 1,
             translate_flag: 1,
             // 翻译识别码名称 0:不翻译 1:翻译
             relation_product: 1,

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

@@ -10,6 +10,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { searchWalletPass, searchWallet, searchProduct, searchOrder } from "./cloudSearch";
 import scanCache from "./scanCache";
+import { isSelfServicePlatform } from "../../../../utils/platform";
 
 /**
  * Promise.any 的替代实现
@@ -161,7 +162,7 @@ export var handleGlobalScan = function handleGlobalScan(request, localSearch, ch
     if (value.startsWith('WL')) {
       requestList = [searchWallet(request, value)];
     } else {
-      requestList = [].concat(_toConsumableArray(channel === 'kiosk' ? [] : [searchOrder(request, value)]), [searchWalletPass(request, value), searchWallet(request, value), searchProduct(request, value)]);
+      requestList = [].concat(_toConsumableArray(isSelfServicePlatform(channel) ? [] : [searchOrder(request, value)]), [searchWalletPass(request, value), searchWallet(request, value), searchProduct(request, value)]);
     }
     return requestList;
   };

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

package/dist/solution/UnifiedBookingSales/index.js

@@ -45,7 +45,7 @@ import { AvailabilityRemoteOccupancyCache } from "./remoteOccupancyCache";
 import { BusinessAvailabilityController } from "./businessAvailability";
 import { BookingTicket } from "../BookingTicket";
 import { addLocalCalendarDays, captureRuntimeOffsetMinutes, formatLocalDate, formatLocalDateTime, formatLocalTime, localDateTimeToScalar, localDateToScalar, localDateToScalarStart, parseLocalDate, parseLocalDateTime } from "../../modules/ResourcePlanner/localClock";
-import { isCustomerUserPlatform, normalizeRuntimePlatform } from "../../utils/platform";
+import { isCustomerUserPlatform, isSelfServicePlatform, normalizeRuntimePlatform } from "../../utils/platform";
 import { ItemRuleEvaluator } from "../../model/strategy/adapter/itemRule";
 export * from "./types";
 export { AvailabilityError } from "../../modules/ResourcePlanner";
@@ -2005,7 +2005,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     }
 
     /**
-     * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+     * PC/H5 及自助终端结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
      * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
      */
   }, {
@@ -2015,7 +2015,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
       var configured = (_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.checkoutSyncTaskEnabled;
       if (configured === true) return true;
       var platform = normalizeRuntimePlatform((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.platform);
-      return !isCustomerUserPlatform(platform) && platform !== 'kiosk';
+      return !isCustomerUserPlatform(platform) && !isSelfServicePlatform(platform);
     }
 
     /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */
@@ -2838,7 +2838,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               throw new Error('[UnifiedBookingSales] getProtocol 需要 policyId');
             case 3:
               policyUrl = 'shop-policy';
-              if (this.otherParams.platform === 'kiosk' || this.otherParams.platform === 'pos' || this.otherParams.platform === 'shop') {
+              if (isSelfServicePlatform(this.otherParams.platform) || this.otherParams.platform === 'pos' || this.otherParams.platform === 'shop') {
                 policyUrl = 'policy';
               }
               return _context23.abrupt("return", this.request.get("/".concat(policyUrl, "/").concat(encodeURIComponent(normalizedPolicyId))));

package/dist/utils/platform.d.ts

@@ -6,3 +6,5 @@ export declare function normalizeRuntimePlatform(platform: unknown): string;
  * PC and H5 are authenticated-customer clients rather than staff terminals.
  */
 export declare function isCustomerUserPlatform(platform: unknown): boolean;
+/** Kiosk and vending retain distinct channels but share self-service checkout behavior. */
+export declare function isSelfServicePlatform(platform: unknown): boolean;