@pisell/pisellos 0.10.59 → 0.10.60

package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.d.ts

@@ -1,8 +1,10 @@
-import type { OrderProduct } from '../../Order/types';
+import type { OrderHolderRelation, OrderProduct } from '../../Order/types';
 export interface BuildNormalProductCacheItemFromOrderLineInput {
     /** tempOrder.products 中的一行（普通商品，无关联 booking） */
     product: OrderProduct;
     /** 商品 catalog / 详情，用于 variant / option / bundle 模板字段 */
     sourceProduct?: Record<string, any> | null;
+    /** 整单关系集合，按商品行 UID 回填。 */
+    holder_relations?: OrderHolderRelation[];
 }
 export declare function buildNormalProductCacheItemFromOrderLine(input: BuildNormalProductCacheItemFromOrderLineInput): Record<string, any>;

package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -7,13 +7,15 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import { cloneDeep } from 'lodash-es';
+import { getProductHolderRelations } from "../../Order/holderRelations";
 import { getProductSkuOptions } from "../../Order/utils";
 import { isEntitlementPass } from "../../Discount/entitlementPass";
 import { buildProductOptionStringFromOrderLine } from "./orderLineDisplay";
 /**
  * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
  *
- * 与 `buildCacheItemFromOrderLine`（预约行 + booking）并列；不含 resource / duration / holder 等预约字段。
+ * 与 `buildCacheItemFromOrderLine`（预约行 + booking）并列；Holder 从订单关系回填，不生成预约字段。
  */
 /**
  * 解析 v2 主商品 source 价（不含 option、不含 bundle），供 SkuDetailModal / transform 使用。
@@ -85,7 +87,7 @@ function mapOrderBundleToOtherBundle(bundle) {
   });
 }
 export function buildNormalProductCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$metadata3, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata4, _originExtend$priceOv, _product$metadata5, _ref7, _title2, _ref8, _cover, _price3, _product$order_detail, _product$product_sku;
+  var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$metadata3, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata4, _originExtend$priceOv, _product$metadata5, _product$metadata6, _ref7, _title2, _ref8, _cover, _price3, _product$order_detail, _product$product_sku;
   var product = input.product,
     sourceProduct = input.sourceProduct;
   var resolvedId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id;
@@ -94,6 +96,23 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
   var original = Number((_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : selling);
   var uid = (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.unique_identification_number;
   var originExtend = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 || (_product$metadata2 = _product$metadata2.origin) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2._extend;
+  var holderRelations = cloneDeep(getProductHolderRelations(input, product));
+  var formRelations = holderRelations.filter(function (relation) {
+    return relation.holder_type === 'form';
+  });
+  var holderIds = formRelations.map(function (relation) {
+    return relation.holder_id;
+  });
+  var holderNames = formRelations.map(function (relation) {
+    var _relation$metadata;
+    return (_relation$metadata = relation.metadata) === null || _relation$metadata === void 0 ? void 0 : _relation$metadata.name;
+  }).filter(function (name) {
+    return typeof name === 'string' && name.length > 0;
+  });
+  var holder = formRelations.length > 0 ? _objectSpread(_objectSpread({}, formRelations[0].metadata || {}), {}, {
+    form_record: holderIds,
+    name: holderNames.join(',')
+  }) : null;
   var shouldPreserveEntitlementPriceOverride = hasEntitlementPassDiscount(product) && ((originExtend === null || originExtend === void 0 ? void 0 : originExtend.priceOverride) !== undefined || ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.price_override) != null);
   var hasPriceOverride = (originExtend === null || originExtend === void 0 ? void 0 : originExtend.priceOverride) !== undefined || shouldPreserveEntitlementPriceOverride;
   var option = getProductSkuOptions(product);
@@ -125,6 +144,9 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
     skuValue: JSON.parse(JSON.stringify(skuValue)),
     _skuValue: JSON.parse(JSON.stringify(skuValue)),
     isNormalProduct: true,
+    holder_relations: holderRelations,
+    holder: holder,
+    holder_id: holderIds,
     metadata: {
       product_add_schedule_time: (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.product_add_schedule_time
     }
@@ -140,6 +162,7 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
     extend._skuValue = JSON.parse(JSON.stringify(extend.skuValue));
   }
   return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
+    holder_config: (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.holder_config) !== undefined ? sourceProduct.holder_config : (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.holder_config,
     id: resolvedId,
     product_id: resolvedId,
     _id: uid,

package/dist/modules/Order/holderRelations.d.ts

@@ -0,0 +1,14 @@
+import type { OrderHolderRelation, OrderTempOrder } from './types';
+/** 在原订单上补齐关系身份，让缓存、提交和重试共用同一个 UUID。 */
+export declare function ensureHolderRelationUuids(order: {
+    holder_relations?: OrderHolderRelation[];
+}): void;
+export declare function hasProductBooking(product: Record<string, any>): boolean;
+export declare function getProductHolderRelations(order: {
+    holder_relations?: OrderHolderRelation[];
+}, product: Record<string, any>): OrderHolderRelation[];
+export declare function replaceProductHolderRelations(order: OrderTempOrder, product: Record<string, any>, patch: OrderHolderRelation[] | undefined): void;
+/** 只删除明确被用户删除的行，不从稀疏远端快照推断删除。 */
+export declare function removeProductHolderRelations(order: OrderTempOrder, products: Array<Record<string, any>>): void;
+/** 仅兼容尚无新字段的旧测试草稿；显式 [] 永远不恢复旧 product 数据。 */
+export declare function restoreLegacyHolderRelations(order: Record<string, any>): OrderHolderRelation[] | undefined;

package/dist/modules/Order/holderRelations.js

@@ -0,0 +1,154 @@
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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); }
+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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _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; }
+import { createUuidV4 } from "./utils/orderCollectionIdentity";
+function getHolderRelationUuid(relation) {
+  return typeof (relation === null || relation === void 0 ? void 0 : relation.uuid) === 'string' && relation.uuid.trim() ? relation.uuid : undefined;
+}
+
+/** 在原订单上补齐关系身份，让缓存、提交和重试共用同一个 UUID。 */
+export function ensureHolderRelationUuids(order) {
+  if (!Array.isArray(order.holder_relations)) return;
+  var _iterator = _createForOfIteratorHelper(order.holder_relations),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var relation = _step.value;
+      if (relation && _typeof(relation) === 'object' && !getHolderRelationUuid(relation)) {
+        relation.uuid = createUuidV4();
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+}
+export function hasProductBooking(product) {
+  var _product$metadata, _product$metadata2;
+  var bookingIds = [product.booking_id, (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.booking_id, product.schedule_event_id];
+  return Boolean(product.booking_uid || ((_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.booking_uid)) || bookingIds.some(function (id) {
+    return id !== undefined && id !== null && String(id) !== '' && String(id) !== '0';
+  });
+}
+export function getProductHolderRelations(order, product) {
+  var _product$metadata$uni, _product$metadata3;
+  var uid = (_product$metadata$uni = (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product.unique_identification_number;
+  if (uid === undefined || uid === null || uid === '') return [];
+  return (order.holder_relations || []).filter(function (relation) {
+    return relation.relation_model === 'order_detail' && String(relation.relation_uuid) === String(uid);
+  });
+}
+export function replaceProductHolderRelations(order, product, patch) {
+  var _product$metadata$uni2, _product$metadata4;
+  if (patch === undefined || hasProductBooking(product)) return;
+  var uid = (_product$metadata$uni2 = (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.unique_identification_number) !== null && _product$metadata$uni2 !== void 0 ? _product$metadata$uni2 : product.unique_identification_number;
+  if (uid === undefined || uid === null || uid === '') return;
+  var existing = getProductHolderRelations(order, product);
+  var next = new Map();
+  var _iterator2 = _createForOfIteratorHelper(patch),
+    _step2;
+  try {
+    var _loop = function _loop() {
+      var relation = _step2.value;
+      var key = "".concat(relation.holder_type, ":").concat(relation.holder_id);
+      var previous = existing.find(function (item) {
+        return item.holder_type === relation.holder_type && String(item.holder_id) === String(relation.holder_id);
+      });
+      next.set(key, _objectSpread(_objectSpread(_objectSpread({}, previous), relation), {}, {
+        uuid: getHolderRelationUuid(previous) || getHolderRelationUuid(relation) || createUuidV4(),
+        relation_model: 'order_detail',
+        relation_uuid: String(uid)
+      }, previous !== null && previous !== void 0 && previous.metadata || relation.metadata ? {
+        metadata: _objectSpread(_objectSpread({}, previous === null || previous === void 0 ? void 0 : previous.metadata), relation.metadata)
+      } : {}));
+    };
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      _loop();
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  order.holder_relations = [].concat(_toConsumableArray((order.holder_relations || []).filter(function (relation) {
+    return relation.relation_model !== 'order_detail' || String(relation.relation_uuid) !== String(uid);
+  })), _toConsumableArray(next.values()));
+}
+
+/** 只删除明确被用户删除的行，不从稀疏远端快照推断删除。 */
+export function removeProductHolderRelations(order, products) {
+  if (!Array.isArray(order.holder_relations)) return;
+  var removedUids = new Set(products.map(function (product) {
+    var _ref, _product$metadata$uni3, _product$metadata5;
+    return String((_ref = (_product$metadata$uni3 = (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) !== null && _product$metadata$uni3 !== void 0 ? _product$metadata$uni3 : product.unique_identification_number) !== null && _ref !== void 0 ? _ref : '');
+  }));
+  order.holder_relations = order.holder_relations.filter(function (relation) {
+    return relation.relation_model !== 'order_detail' || !removedUids.has(String(relation.relation_uuid));
+  });
+}
+
+/** 仅兼容尚无新字段的旧测试草稿；显式 [] 永远不恢复旧 product 数据。 */
+export function restoreLegacyHolderRelations(order) {
+  if (Object.prototype.hasOwnProperty.call(order, 'holder_relations')) {
+    return Array.isArray(order.holder_relations) ? order.holder_relations : undefined;
+  }
+  var relations = [];
+  var bookingProductUids = new Set((order.bookings || []).map(function (booking) {
+    var _ref2, _booking$product_uid, _booking$metadata;
+    return String((_ref2 = (_booking$product_uid = booking.product_uid) !== null && _booking$product_uid !== void 0 ? _booking$product_uid : (_booking$metadata = booking.metadata) === null || _booking$metadata === void 0 ? void 0 : _booking$metadata.product_uid) !== null && _ref2 !== void 0 ? _ref2 : '');
+  }));
+  var _iterator3 = _createForOfIteratorHelper(order.products || []),
+    _step3;
+  try {
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var _product$metadata$uni4, _product$metadata6, _product$metadata7, _product$metadata$hol, _product$metadata8;
+      var product = _step3.value;
+      if (hasProductBooking(product)) continue;
+      var uid = (_product$metadata$uni4 = (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.unique_identification_number) !== null && _product$metadata$uni4 !== void 0 ? _product$metadata$uni4 : product.unique_identification_number;
+      if (uid === undefined || uid === null || uid === '' || bookingProductUids.has(String(uid))) continue;
+      var holder = ((_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.holder) || {};
+      var rawIds = (_product$metadata$hol = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.holder_id) !== null && _product$metadata$hol !== void 0 ? _product$metadata$hol : holder.form_record;
+      var ids = (Array.isArray(rawIds) ? rawIds : [rawIds]).filter(function (id) {
+        return id !== undefined && id !== null && id !== '' && Number.isInteger(Number(id)) && Number(id) >= 0;
+      });
+      var _iterator4 = _createForOfIteratorHelper(ids),
+        _step4;
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var id = _step4.value;
+          var metadata = _objectSpread(_objectSpread({}, holder), {}, {
+            form_record: [Number(id)]
+          });
+          if (ids.length !== 1) delete metadata.name;
+          relations.push({
+            relation_model: 'order_detail',
+            relation_uuid: String(uid),
+            holder_type: 'form',
+            holder_id: Number(id),
+            metadata: metadata
+          });
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
+    }
+  } catch (err) {
+    _iterator3.e(err);
+  } finally {
+    _iterator3.f();
+  }
+  return relations.length ? relations : undefined;
+}

package/dist/modules/Order/index.d.ts

@@ -609,7 +609,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;
@@ -687,6 +687,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getOrderInfo(order_id: number): Promise<any>;
     getVouchers(): any[];
 }
-export type { AddProductToOrderOptions, OrderMetaList, PointCardSnapshotItem, VirtualCurrencySnapshotItem, RemoveProductsFromOrderOptions, SalesNote, SalesNoteDraftInput, SalesNoteLocalizedSelection, SalesNoteLocalizedText, SalesNoteRelation, SalesNoteTextInput, SetSalesNoteInput, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';
+export type { OrderHolderRelation, AddProductToOrderOptions, OrderMetaList, PointCardSnapshotItem, VirtualCurrencySnapshotItem, RemoveProductsFromOrderOptions, SalesNote, SalesNoteDraftInput, SalesNoteLocalizedSelection, SalesNoteLocalizedText, SalesNoteRelation, SalesNoteTextInput, SetSalesNoteInput, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';
 export { isFulfillmentTimingBooking } from './pickupTiming';
 export type { PickupTimingBooking, PickupTimingBookingInput, PickupTimingBookingMetadata, PickupTimingSelectionMode, PickupTimingSource, } from './pickupTiming';