@pisell/pisellos 2.3.33 → 2.3.35

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

@@ -48,7 +48,7 @@ export interface BookingResourceInput {
     capacity?: number;
     like_status?: string;
     metadata?: Record<string, any>;
-    children?: any[];
+    children?: BookingResourceInput[];
 }
 /** custom / package 人数维度快照，与 info2 `_extend.capacity` / `metadata.capacity` 对齐。 */
 export interface BookingCapacityMetadataItem {

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

@@ -76,6 +76,33 @@ function resolveDurationMinutes(value) {
   return Number.isNaN(n) ? undefined : n;
 }
 
+/**
+ * 将组合资源子项收敛为 checkout resources 协议。
+ *
+ * resourcesOriginMap 中的子资源是 UI 运行态结构，通常只有 id / main_field / form_id，
+ * 不保证携带后端必填的 relation_type。这里不能原样透传，否则会触发
+ * `bookings.*.resources.*.children.*.relation_type` 校验错误。
+ */
+function normalizeChildResource(child, parentFormId) {
+  var _child$form_id, _child$relation_id;
+  var item = {
+    form_id: (_child$form_id = child === null || child === void 0 ? void 0 : child.form_id) !== null && _child$form_id !== void 0 ? _child$form_id : parentFormId,
+    relation_type: (child === null || child === void 0 ? void 0 : child.relation_type) || 'form',
+    relation_id: (_child$relation_id = child === null || child === void 0 ? void 0 : child.relation_id) !== null && _child$relation_id !== void 0 ? _child$relation_id : child === null || child === void 0 ? void 0 : child.id,
+    capacity: child === null || child === void 0 ? void 0 : child.capacity,
+    like_status: (child === null || child === void 0 ? void 0 : child.like_status) || 'common'
+  };
+  if ((child === null || child === void 0 ? void 0 : child.metadata) !== undefined) {
+    item.metadata = _objectSpread({}, child.metadata);
+  }
+  if (Array.isArray(child === null || child === void 0 ? void 0 : child.children)) {
+    item.children = child.children.map(function (nestedChild) {
+      return normalizeChildResource(nestedChild, item.form_id);
+    });
+  }
+  return item;
+}
+
 /**
  * cacheItem._extend.resource 形如 `{ [form_id]: [{ relation_id, form_id, like_status, metadata, children }] }`。
  * 这里扁平化为符合协议的 resources[] 数组；id=0 的「无资源」占位行**保留**（与 info2 业务等价；协议 `relation_id=0` 合法）。
@@ -101,7 +128,11 @@ function flattenResources(cacheItem) {
         // 协议允许 metadata 自由透传；为了与 info2 行为等价，把 form_name / resource_name / combined_resource 一并保留。
         item.metadata = _objectSpread({}, r.metadata);
       }
-      if ((r === null || r === void 0 ? void 0 : r.children) !== undefined) item.children = r.children;
+      if (Array.isArray(r === null || r === void 0 ? void 0 : r.children)) {
+        item.children = r.children.map(function (child) {
+          return normalizeChildResource(child, item.form_id);
+        });
+      }
       result.push(item);
     });
   });

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

@@ -485,7 +485,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;

package/dist/modules/Order/index.js

@@ -3852,9 +3852,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
               shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
+                var _item$metadata3;
                 if (_this26.hasGoodPassDiscount(item)) return false;
                 if (_this26.hasOrderProductLineNote(item)) return false;
                 if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
+                if ((_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.is_edit_for_runtime) return false;
                 if (item.product_id !== productToAdd.product_id) return false;
                 if (item.product_variant_id !== productToAdd.product_variant_id) return false;
                 var existedFingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
@@ -4177,7 +4179,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyOrderProductUpdateToTempOrder",
     value: function applyOrderProductUpdateToTempOrder(tempOrder, params) {
-      var _targetProduct$metada2, _product_sku, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _metadata7, _nextProduct$metadata, _targetProduct$metada8, _tempOrder$products$p, _tempOrder$products$p2;
+      var _targetProduct$metada2, _product_sku, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _metadata7, _metadata8, _metadata9, _metadata10, _nextProduct$metadata, _targetProduct$metada15, _tempOrder$products$p, _tempOrder$products$p2;
       var product_id = params.product_id,
         product_variant_id = params.product_variant_id,
         updates = params.updates,
@@ -4205,8 +4207,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (unique_identification_number !== undefined) {
         var targetUid = String(unique_identification_number);
         productIndex = tempOrder.products.findIndex(function (item) {
-          var _item$metadata3;
-          return String(((_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.unique_identification_number) || item.unique_identification_number || '') === targetUid;
+          var _item$metadata4;
+          return String(((_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.unique_identification_number) || item.unique_identification_number || '') === targetUid;
         });
       }
       if (productIndex === -1) {
@@ -4237,9 +4239,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       // 如果 caller 走推荐路径（updates.metadata.* 显式指定主价），保留 metadata 由 normalize 认它。
       var callerUpdatesTopPrice = Object.prototype.hasOwnProperty.call(updates || {}, 'selling_price') || Object.prototype.hasOwnProperty.call(updates || {}, 'original_price');
       var callerUpdatesMainMeta = (updates === null || updates === void 0 || (_metadata2 = updates.metadata) === null || _metadata2 === void 0 ? void 0 : _metadata2.main_product_selling_price) !== undefined || (updates === null || updates === void 0 || (_metadata3 = updates.metadata) === null || _metadata3 === void 0 ? void 0 : _metadata3.main_product_original_price) !== undefined || (updates === null || updates === void 0 || (_metadata4 = updates.metadata) === null || _metadata4 === void 0 ? void 0 : _metadata4.source_product_price) !== undefined;
+      var callerUpdatesSourcePrice = (updates === null || updates === void 0 || (_metadata5 = updates.metadata) === null || _metadata5 === void 0 ? void 0 : _metadata5.source_product_price) !== undefined;
+      var callerUpdatesMainSellingPrice = (updates === null || updates === void 0 || (_metadata6 = updates.metadata) === null || _metadata6 === void 0 ? void 0 : _metadata6.main_product_selling_price) !== undefined;
+      var callerUpdatesMainOriginalPrice = (updates === null || updates === void 0 || (_metadata7 = updates.metadata) === null || _metadata7 === void 0 ? void 0 : _metadata7.main_product_original_price) !== undefined;
+      var previousLineFingerprint = buildProductLineFingerprint(getProductSkuOptions(targetProduct), targetProduct.product_bundle);
+      var nextLineFingerprint = buildProductLineFingerprint(getProductSkuOptions(nextProduct), nextProduct.product_bundle);
+      var callerChangesVariant = Number(product_variant_id || 0) !== Number(targetProduct.product_variant_id || 0);
+      var callerChangesLineConfiguration = callerChangesVariant || previousLineFingerprint !== nextLineFingerprint;
       var isPersistedOrderLine = targetProduct.order_detail_id !== undefined && targetProduct.order_detail_id !== null;
       var callerChangesDiscountList = Array.isArray(updates === null || updates === void 0 ? void 0 : updates.discount_list) && updates.discount_list.length > 0 && !isSameDiscountList(updates.discount_list, targetProduct.discount_list);
-      var callerUpdatesManualPrice = (updates === null || updates === void 0 || (_metadata5 = updates.metadata) === null || _metadata5 === void 0 ? void 0 : _metadata5.price_override) !== undefined || (updates === null || updates === void 0 || (_metadata6 = updates.metadata) === null || _metadata6 === void 0 ? void 0 : _metadata6.is_manual_discount) !== undefined || (updates === null || updates === void 0 || (_metadata7 = updates.metadata) === null || _metadata7 === void 0 ? void 0 : _metadata7.product_discount_reason) !== undefined || callerChangesDiscountList;
+      var callerUpdatesManualPrice = (updates === null || updates === void 0 || (_metadata8 = updates.metadata) === null || _metadata8 === void 0 ? void 0 : _metadata8.price_override) !== undefined || (updates === null || updates === void 0 || (_metadata9 = updates.metadata) === null || _metadata9 === void 0 ? void 0 : _metadata9.is_manual_discount) !== undefined || (updates === null || updates === void 0 || (_metadata10 = updates.metadata) === null || _metadata10 === void 0 ? void 0 : _metadata10.product_discount_reason) !== undefined || callerChangesDiscountList;
       var callerAllowsBookingReprice = function () {
         if (params.allow_booking_reprice !== true || !booking || !callerUpdatesTopPrice || !callerUpdatesMainMeta) {
           return false;
@@ -4252,7 +4261,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         };
         return hasChangedPrice(updates.selling_price, targetProduct.selling_price) || hasChangedPrice(updates.original_price, targetProduct.original_price);
       }();
-      if (isPersistedOrderLine && !callerUpdatesManualPrice && !callerAllowsBookingReprice) {
+      if (isPersistedOrderLine && !callerChangesLineConfiguration && !callerUpdatesManualPrice && !callerAllowsBookingReprice) {
         var _targetProduct$metada3, _targetProduct$metada4, _targetProduct$metada5, _targetProduct$metada6, _targetProduct$metada7;
         nextProduct.selling_price = targetProduct.selling_price;
         nextProduct.original_price = targetProduct.original_price;
@@ -4264,19 +4273,60 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           price_schema_version: (_targetProduct$metada6 = (_targetProduct$metada7 = targetProduct.metadata) === null || _targetProduct$metada7 === void 0 ? void 0 : _targetProduct$metada7.price_schema_version) !== null && _targetProduct$metada6 !== void 0 ? _targetProduct$metada6 : 2
         });
         nextProduct.product_bundle = this.preservePersistedBundlePriceFields(targetProduct.product_bundle, nextProduct.product_bundle);
-      } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+      } else if (callerChangesLineConfiguration && callerUpdatesSourcePrice && (!callerUpdatesMainSellingPrice || !callerUpdatesMainOriginalPrice)) {
+        var _targetProduct$metada8, _targetProduct$metada9;
+        // 新配置只传了 source 时，不能把未传的 main_product_* 从旧行继承下来。
+        // 以新 source + 新 option 重建券前价；券后价未显式提供时保留旧主商品折扣额。
+        var previousMainOriginal = new Decimal(Number((_targetProduct$metada8 = targetProduct.metadata) === null || _targetProduct$metada8 === void 0 ? void 0 : _targetProduct$metada8.main_product_original_price) || 0);
+        var previousMainSelling = new Decimal(Number((_targetProduct$metada9 = targetProduct.metadata) === null || _targetProduct$metada9 === void 0 ? void 0 : _targetProduct$metada9.main_product_selling_price) || previousMainOriginal.toNumber());
+        var preservedDiscount = previousMainOriginal.minus(previousMainSelling);
+        var nextMainOriginal = new Decimal(Number(updates.metadata.source_product_price) || 0).plus(sumOptionUnitPrice(getProductSkuOptions(nextProduct)));
+        nextProduct.metadata = _objectSpread(_objectSpread({}, nextProduct.metadata || {}), {}, {
+          source_product_price: String(updates.metadata.source_product_price),
+          main_product_original_price: callerUpdatesMainOriginalPrice ? String(updates.metadata.main_product_original_price) : nextMainOriginal.toDecimalPlaces(2).toFixed(2),
+          main_product_selling_price: callerUpdatesMainSellingPrice ? String(updates.metadata.main_product_selling_price) : nextMainOriginal.minus(preservedDiscount).toDecimalPlaces(2).toFixed(2),
+          price_schema_version: 2
+        });
+      } else if (callerChangesVariant && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+        // variant 已变化但 caller 没有显式报价时，旧 v2 metadata 不能继续充当权威价格源。
+        // 清理后由 normalize 优先读取 metadata.origin.variant 中新 variant 的目录价；
+        // 顶层 original/selling 的旧差额仍会作为 legacy discount 迁移到新价格。
         var existedMeta = nextProduct.metadata || {};
         nextProduct.metadata = _objectSpread({}, existedMeta);
         delete nextProduct.metadata.source_product_price;
         delete nextProduct.metadata.main_product_selling_price;
         delete nextProduct.metadata.main_product_original_price;
         delete nextProduct.metadata.price_schema_version;
+      } else if (callerChangesLineConfiguration && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+        var _ref68, _targetProduct$metada10, _targetProduct$metada11, _ref69, _targetProduct$metada12, _targetProduct$metada13, _targetProduct$metada14;
+        // 仅 option / bundle 变化时，保留历史 source 和主商品折扣金额，
+        // 但必须让 original 与 selling 一起随新的 option 金额移动。
+        var previousOptionSum = sumOptionUnitPrice(getProductSkuOptions(targetProduct));
+        var nextOptionSum = sumOptionUnitPrice(getProductSkuOptions(nextProduct));
+        var _previousMainOriginal = new Decimal(Number((_ref68 = (_targetProduct$metada10 = (_targetProduct$metada11 = targetProduct.metadata) === null || _targetProduct$metada11 === void 0 ? void 0 : _targetProduct$metada11.main_product_original_price) !== null && _targetProduct$metada10 !== void 0 ? _targetProduct$metada10 : targetProduct.original_price) !== null && _ref68 !== void 0 ? _ref68 : 0) || 0);
+        var _previousMainSelling = new Decimal(Number((_ref69 = (_targetProduct$metada12 = (_targetProduct$metada13 = targetProduct.metadata) === null || _targetProduct$metada13 === void 0 ? void 0 : _targetProduct$metada13.main_product_selling_price) !== null && _targetProduct$metada12 !== void 0 ? _targetProduct$metada12 : targetProduct.selling_price) !== null && _ref69 !== void 0 ? _ref69 : _previousMainOriginal.toNumber()) || 0);
+        var _preservedDiscount = _previousMainOriginal.minus(_previousMainSelling);
+        var previousSource = ((_targetProduct$metada14 = targetProduct.metadata) === null || _targetProduct$metada14 === void 0 ? void 0 : _targetProduct$metada14.source_product_price) != null ? new Decimal(Number(targetProduct.metadata.source_product_price) || 0) : _previousMainOriginal.minus(previousOptionSum);
+        var _nextMainOriginal = previousSource.plus(nextOptionSum);
+        nextProduct.metadata = _objectSpread(_objectSpread({}, nextProduct.metadata || {}), {}, {
+          source_product_price: previousSource.toDecimalPlaces(2).toFixed(2),
+          main_product_original_price: _nextMainOriginal.toDecimalPlaces(2).toFixed(2),
+          main_product_selling_price: _nextMainOriginal.minus(_preservedDiscount).toDecimalPlaces(2).toFixed(2),
+          price_schema_version: 2
+        });
+      } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+        var _existedMeta = nextProduct.metadata || {};
+        nextProduct.metadata = _objectSpread({}, _existedMeta);
+        delete nextProduct.metadata.source_product_price;
+        delete nextProduct.metadata.main_product_selling_price;
+        delete nextProduct.metadata.main_product_original_price;
+        delete nextProduct.metadata.price_schema_version;
       }
       // normalizeOrderProduct 幂等：v2 metadata 存在 → 保留 main_product_* 折扣重算 composite；
       // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
       var normalizedProduct = mergeOrderProductDisplayFields(nextProduct, normalizeOrderProduct(nextProduct));
       normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
-      var preservedBookingUid = nextProduct.booking_uid || ((_nextProduct$metadata = nextProduct.metadata) === null || _nextProduct$metadata === void 0 ? void 0 : _nextProduct$metadata.booking_uid) || targetProduct.booking_uid || ((_targetProduct$metada8 = targetProduct.metadata) === null || _targetProduct$metada8 === void 0 ? void 0 : _targetProduct$metada8.booking_uid);
+      var preservedBookingUid = nextProduct.booking_uid || ((_nextProduct$metadata = nextProduct.metadata) === null || _nextProduct$metadata === void 0 ? void 0 : _nextProduct$metadata.booking_uid) || targetProduct.booking_uid || ((_targetProduct$metada15 = targetProduct.metadata) === null || _targetProduct$metada15 === void 0 ? void 0 : _targetProduct$metada15.booking_uid);
       if (!booking && preservedBookingUid) {
         normalizedProduct.booking_uid = preservedBookingUid;
         normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
@@ -4284,8 +4334,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
       }
       if (booking) {
-        var _normalizedProduct$me, _targetProduct$metada9;
-        var productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada9 = targetProduct.metadata) === null || _targetProduct$metada9 === void 0 ? void 0 : _targetProduct$metada9.unique_identification_number) || unique_identification_number || createUuidV4());
+        var _normalizedProduct$me, _targetProduct$metada16;
+        var productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada16 = targetProduct.metadata) === null || _targetProduct$metada16 === void 0 ? void 0 : _targetProduct$metada16.unique_identification_number) || unique_identification_number || createUuidV4());
         normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
           unique_identification_number: productUid
         });
@@ -4396,7 +4446,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProductQuantity",
     value: function () {
       var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
-        var _targetProduct$metada10;
+        var _targetProduct$metada17;
         var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct;
         return _regeneratorRuntime().wrap(function _callee25$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
@@ -4420,8 +4470,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (unique_identification_number !== undefined) {
                 targetUid = String(unique_identification_number);
                 productIndex = tempOrder.products.findIndex(function (item) {
-                  var _item$metadata4;
-                  return String(((_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.unique_identification_number) || item.unique_identification_number || '') === targetUid;
+                  var _item$metadata5;
+                  return String(((_item$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.unique_identification_number) || item.unique_identification_number || '') === targetUid;
                 });
               }
               if (productIndex === -1) {
@@ -4437,7 +4487,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               normalizedProduct = normalizeOrderProduct(_objectSpread(_objectSpread({}, targetProduct), {}, {
                 num: getSafeProductNum(num),
                 metadata: _objectSpread(_objectSpread({}, targetProduct.metadata || {}), {}, {
-                  unique_identification_number: ((_targetProduct$metada10 = targetProduct.metadata) === null || _targetProduct$metada10 === void 0 ? void 0 : _targetProduct$metada10.unique_identification_number) || unique_identification_number
+                  unique_identification_number: ((_targetProduct$metada17 = targetProduct.metadata) === null || _targetProduct$metada17 === void 0 ? void 0 : _targetProduct$metada17.unique_identification_number) || unique_identification_number
                 })
               }));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
@@ -4579,15 +4629,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _iterator21 = _createForOfIteratorHelper(matchedProducts);
               _context30.prev = 11;
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
-                var _metadata8, _metadata9, _metadata10, _metadata11;
+                var _metadata11, _metadata12, _metadata13, _metadata14;
                 var product, productUid, productBookingUid, isAddTimeProduct;
                 return _regeneratorRuntime().wrap(function _loop3$(_context29) {
                   while (1) switch (_context29.prev = _context29.next) {
                     case 0:
                       product = _step21.value;
-                      productUid = (product === null || product === void 0 || (_metadata8 = product.metadata) === null || _metadata8 === void 0 ? void 0 : _metadata8.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
-                      productBookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_metadata9 = product.metadata) === null || _metadata9 === void 0 ? void 0 : _metadata9.booking_uid);
-                      isAddTimeProduct = (product === null || product === void 0 || (_metadata10 = product.metadata) === null || _metadata10 === void 0 ? void 0 : _metadata10.product_add_schedule_time) !== undefined && (product === null || product === void 0 || (_metadata11 = product.metadata) === null || _metadata11 === void 0 ? void 0 : _metadata11.product_add_schedule_time) !== null;
+                      productUid = (product === null || product === void 0 || (_metadata11 = product.metadata) === null || _metadata11 === void 0 ? void 0 : _metadata11.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+                      productBookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_metadata12 = product.metadata) === null || _metadata12 === void 0 ? void 0 : _metadata12.booking_uid);
+                      isAddTimeProduct = (product === null || product === void 0 || (_metadata13 = product.metadata) === null || _metadata13 === void 0 ? void 0 : _metadata13.product_add_schedule_time) !== undefined && (product === null || product === void 0 || (_metadata14 = product.metadata) === null || _metadata14 === void 0 ? void 0 : _metadata14.product_add_schedule_time) !== null;
                       if (!isAddTimeProduct) {
                         _context29.next = 6;
                         break;
@@ -4734,23 +4784,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildCurrentSubmitPayloadForLocalPrint",
     value: function buildCurrentSubmitPayloadForLocalPrint(params) {
-      var _params$cacheId, _this$otherParams3, _ref68, _params$businessCode, _this$otherParams4, _this$otherParams5;
+      var _params$cacheId, _this$otherParams3, _ref70, _params$businessCode, _this$otherParams4, _this$otherParams5;
       var tempOrder = this.ensureTempOrder();
       this.persistTempOrder();
       var payload = buildSubmitPayload({
         tempOrder: tempOrder,
         cacheId: (_params$cacheId = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId !== void 0 ? _params$cacheId : this.cacheId,
         platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.platform),
-        businessCode: (_ref68 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) !== null && _ref68 !== void 0 ? _ref68 : (_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.business_code,
+        businessCode: (_ref70 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) !== null && _ref70 !== void 0 ? _ref70 : (_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.business_code,
         channel: params === null || params === void 0 ? void 0 : params.channel,
         type: params === null || params === void 0 ? void 0 : params.type,
         summary: this.store.summary || createEmptySummary(),
         enhance: function enhance(nextPayload) {
-          var _ref69, _tempOrder$order_numb, _ref70, _tempOrder$shop_order, _ref71, _tempOrder$shop_full_;
+          var _ref71, _tempOrder$order_numb, _ref72, _tempOrder$shop_order, _ref73, _tempOrder$shop_full_;
           return _objectSpread(_objectSpread({}, nextPayload), {}, {
-            order_number: (_ref69 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref69 !== void 0 ? _ref69 : null,
-            shop_order_number: (_ref70 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref70 !== void 0 ? _ref70 : null,
-            shop_full_order_number: (_ref71 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref71 !== void 0 ? _ref71 : null,
+            order_number: (_ref71 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref71 !== void 0 ? _ref71 : null,
+            shop_order_number: (_ref72 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref72 !== void 0 ? _ref72 : null,
+            shop_full_order_number: (_ref73 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref73 !== void 0 ? _ref73 : null,
             small_ticket_data_flag: 1
           });
         }
@@ -4801,7 +4851,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "saveTempOrderAsDraft",
     value: function () {
       var _saveTempOrderAsDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
-        var _params$cacheId2, _this$otherParams6, _ref72, _params$businessCode2, _this$otherParams7, _this$otherParams8, _params$type, _this$otherParams9, _payload$products;
+        var _params$cacheId2, _this$otherParams6, _ref74, _params$businessCode2, _this$otherParams7, _this$otherParams8, _params$type, _this$otherParams9, _payload$products;
         var tempOrder, latestSummary, payload;
         return _regeneratorRuntime().wrap(function _callee31$(_context34) {
           while (1) switch (_context34.prev = _context34.next) {
@@ -4833,7 +4883,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 cacheId: (_params$cacheId2 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId2 !== void 0 ? _params$cacheId2 : this.cacheId,
                 platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.platform),
-                businessCode: (_ref72 = (_params$businessCode2 = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode2 !== void 0 ? _params$businessCode2 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.businessCode) !== null && _ref72 !== void 0 ? _ref72 : (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.business_code,
+                businessCode: (_ref74 = (_params$businessCode2 = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode2 !== void 0 ? _params$businessCode2 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.businessCode) !== null && _ref74 !== void 0 ? _ref74 : (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: (_params$type = params === null || params === void 0 ? void 0 : params.type) !== null && _params$type !== void 0 ? _params$type : (_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9.type,
                 summary: latestSummary,
@@ -4914,7 +4964,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "runSubmitTempOrder",
     value: function () {
       var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
-        var _params$cacheId3, _this$otherParams10, _ref73, _ref74, _submitSnapshot$busin, _this$otherParams11, _this$otherParams12, _submitSnapshot$type;
+        var _params$cacheId3, _this$otherParams10, _ref75, _ref76, _submitSnapshot$busin, _this$otherParams11, _this$otherParams12, _submitSnapshot$type;
         var tempOrder, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee34$(_context37) {
           while (1) switch (_context37.prev = _context37.next) {
@@ -4976,7 +5026,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
                 platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.platform),
-                businessCode: (_ref73 = (_ref74 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref74 !== void 0 ? _ref74 : (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.businessCode) !== null && _ref73 !== void 0 ? _ref73 : (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.business_code,
+                businessCode: (_ref75 = (_ref76 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref76 !== void 0 ? _ref76 : (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.businessCode) !== null && _ref75 !== void 0 ? _ref75 : (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: (_submitSnapshot$type = submitSnapshot.type) !== null && _submitSnapshot$type !== void 0 ? _submitSnapshot$type : params === null || params === void 0 ? void 0 : params.type,
                 summary: latestSummary,
@@ -6008,7 +6058,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step24;
       try {
         for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var _product$metadata11, _ref75, _ref76, _existed$origin, _rawProduct$metadata;
+          var _product$metadata11, _ref77, _ref78, _existed$origin, _rawProduct$metadata;
           var _step24$value = _slicedToArray(_step24.value, 2),
             index = _step24$value[0],
             product = _step24$value[1];
@@ -6016,7 +6066,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
-          var origin = (_ref75 = (_ref76 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref76 !== void 0 ? _ref76 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref75 !== void 0 ? _ref75 : rawProduct;
+          var origin = (_ref77 = (_ref78 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref78 !== void 0 ? _ref78 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref77 !== void 0 ? _ref77 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -6145,10 +6195,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref77, _optionItem$num, _ref78, _optionItem$add_price;
-      var rawNum = (_ref77 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref77 !== void 0 ? _ref77 : 1;
+      var _ref79, _optionItem$num, _ref80, _optionItem$add_price;
+      var rawNum = (_ref79 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref79 !== void 0 ? _ref79 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref78 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref78 !== void 0 ? _ref78 : 0;
+      var rawPrice = (_ref80 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref80 !== void 0 ? _ref80 : 0;
       var parsedPrice = Number(rawPrice);
       var normalized = _objectSpread(_objectSpread({}, optionItem), {}, {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
@@ -6289,10 +6339,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             _step29;
           try {
             for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
-              var _ref79, _bundle$num3;
+              var _ref81, _bundle$num3;
               var bundle = _step29.value;
               var isPersistedBundleProduct = isPersistedProduct || Boolean((bundle === null || bundle === void 0 ? void 0 : bundle.order_detail_id) || (bundle === null || bundle === void 0 ? void 0 : bundle.orderDetailId) || (bundle === null || bundle === void 0 ? void 0 : bundle.booking_id));
-              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref79 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref79 !== void 0 ? _ref79 : 1) || 1).toNumber();
+              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref81 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref81 !== void 0 ? _ref81 : 1) || 1).toNumber();
               var _iterator30 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
                 _step30;
               try {

package/dist/modules/Order/payment-utils.d.ts

@@ -10,6 +10,8 @@ export interface OrderPaymentIdentityMatch<T> {
     matchedBy: OrderPaymentIdentityType;
 }
 export declare function getOrderPaymentIdentityKeys(payment: unknown): string[];
+export declare function isPendingOrderPayment(payment: unknown): boolean;
+export declare function isIdentifiedPendingOrderPayment(payment: unknown): boolean;
 export declare function hasOrderPaymentIdentityOverlap(left: unknown, right: unknown): boolean;
 export declare function resolveOrderPaymentIdentity<T extends Record<string, any>>(payments: T[] | null | undefined, identity: string | number, mode?: 'payment_number' | 'compat'): OrderPaymentIdentityMatch<T> | null;
 export declare function ensureOrderPaymentNumber<T extends Record<string, any>>(payment: T, devicePrefix: string, createPaymentNumber: () => string): T & {
@@ -20,4 +22,5 @@ export declare function mergeOrderPaymentRecord<T extends Record<string, any>>(p
 export declare function mergeOrderPaymentSnapshot<T extends Record<string, any>>(current: T, incoming: T): T;
 export declare function mergeOrderPaymentListsByIdentity<T extends Record<string, any>>(existing: T[] | null | undefined, incoming: T[] | null | undefined, options?: {
     preserveUnmatchedExisting?: boolean;
+    preserveUnmatchedExistingWhen?: (payment: T) => boolean;
 }): T[];

package/dist/modules/Order/payment-utils.js

@@ -31,6 +31,13 @@ export function getOrderPaymentIdentityKeys(payment) {
     return value === null ? [] : ["".concat(type, ":").concat(value)];
   });
 }
+export function isPendingOrderPayment(payment) {
+  var record = payment;
+  return String((record === null || record === void 0 ? void 0 : record.status) || '').toLowerCase() === 'payment_pending';
+}
+export function isIdentifiedPendingOrderPayment(payment) {
+  return isPendingOrderPayment(payment) && getOrderPaymentIdentityKeys(payment).length > 0;
+}
 export function hasOrderPaymentIdentityOverlap(left, right) {
   var leftKeys = new Set(getOrderPaymentIdentityKeys(left));
   if (leftKeys.size === 0) return false;
@@ -123,10 +130,18 @@ export function mergeOrderPaymentRecord(payment, updates) {
 export function mergeOrderPaymentSnapshot(current, incoming) {
   var currentMetadata = current.metadata || {};
   var incomingMetadata = incoming.metadata || {};
+  var currentUniquePaymentNumber = normalizePaymentIdentityValue(currentMetadata.unique_payment_number);
+  var incomingUniquePaymentNumber = normalizePaymentIdentityValue(incomingMetadata.unique_payment_number);
+  var incomingOrderPaymentId = normalizePaymentIdentityValue(incoming.order_payment_id);
+  var incomingFallbackPrefix = incomingOrderPaymentId ? "os-fallback:payment:order-payment:".concat(incomingOrderPaymentId) : null;
+  var incomingUsesDerivedUniquePaymentNumber = Boolean(incomingUniquePaymentNumber && incomingFallbackPrefix && (incomingUniquePaymentNumber === incomingFallbackPrefix || incomingUniquePaymentNumber.startsWith("".concat(incomingFallbackPrefix, ":conflict:"))));
   var transactions = mergeOrderPaymentTransactions(currentMetadata.transactions, incomingMetadata.transactions);
   return _objectSpread(_objectSpread(_objectSpread({}, current), incoming), {}, {
+    order_payment_id: normalizePaymentIdentityValue(incoming.order_payment_id) !== null ? incoming.order_payment_id : current.order_payment_id,
     payment_number: incoming.payment_number || current.payment_number,
-    metadata: _objectSpread(_objectSpread(_objectSpread({}, currentMetadata), incomingMetadata), transactions.length > 0 ? {
+    metadata: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, currentMetadata), incomingMetadata), incomingUsesDerivedUniquePaymentNumber && currentUniquePaymentNumber ? {
+      unique_payment_number: currentUniquePaymentNumber
+    } : {}), transactions.length > 0 ? {
       transactions: transactions
     } : {})
   });
@@ -192,12 +207,19 @@ export function mergeOrderPaymentListsByIdentity(existing, incoming) {
   if (options.preserveUnmatchedExisting) {
     return compactOrderPaymentList([].concat(_toConsumableArray(existingList), _toConsumableArray(incomingList)));
   }
-  return compactOrderPaymentList(incomingList.map(function (incomingPayment) {
+  var mergedIncoming = incomingList.map(function (incomingPayment) {
     var matchingExisting = existingList.filter(function (existingPayment) {
       return hasOrderPaymentIdentityOverlap(existingPayment, incomingPayment);
     });
     return matchingExisting.reduce(function (merged, existingPayment) {
       return mergeOrderPaymentSnapshot(existingPayment, merged);
     }, incomingPayment);
-  }));
+  });
+  var preservedExisting = options.preserveUnmatchedExistingWhen ? existingList.filter(function (existingPayment) {
+    var _options$preserveUnma;
+    return !incomingList.some(function (incomingPayment) {
+      return hasOrderPaymentIdentityOverlap(existingPayment, incomingPayment);
+    }) && ((_options$preserveUnma = options.preserveUnmatchedExistingWhen) === null || _options$preserveUnma === void 0 ? void 0 : _options$preserveUnma.call(options, existingPayment));
+  }) : [];
+  return compactOrderPaymentList([].concat(_toConsumableArray(mergedIncoming), _toConsumableArray(preservedExisting)));
 }

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

@@ -209,6 +209,11 @@ export function normalizeOrderCollection(kind, items, options) {
     var persistentId = getOrderCollectionPersistentId(kind, item);
     var uid = getOrderCollectionUid(kind, item);
     if (!uid) {
+      var _item;
+      if (kind === 'payment' && !isBlankOrderCollectionIdentity((_item = item) === null || _item === void 0 ? void 0 : _item.payment_number)) {
+        // payment_number 已提供稳定身份，不占用真实交易流水字段作为内部 UID。
+        continue;
+      }
       uid = persistentId ? buildOrderCollectionFallbackUid(kind, persistentId) : allocateAnonymousUid(occupiedUids, createAnonymousUid);
       item = setOrderCollectionUid(kind, item, uid);
       result[index] = item;
@@ -216,7 +221,7 @@ export function normalizeOrderCollection(kind, items, options) {
       if (!persistentId) stats.anonymousRowCount += 1;
     }
     if (occupiedUids.has(uid)) {
-      var _item, _item2, _item3, _item4;
+      var _item2, _item3, _item4, _item5;
       var replacementUid = persistentId ? allocatePersistentConflictUid(kind, persistentId, occupiedUids) : allocateAnonymousUid(occupiedUids, createAnonymousUid);
       result[index] = setOrderCollectionUid(kind, item, replacementUid);
       uidRemaps.push({
@@ -225,7 +230,7 @@ export function normalizeOrderCollection(kind, items, options) {
         to: replacementUid,
         persistentId: persistentId,
         scope: 'linked-owner',
-        referenceOwnerUid: kind === 'product' ? String(((_item = item) === null || _item === void 0 ? void 0 : _item.booking_uid) || ((_item2 = item) === null || _item2 === void 0 || (_item2 = _item2.metadata) === null || _item2 === void 0 ? void 0 : _item2.booking_uid) || '') || null : kind === 'booking' ? String(((_item3 = item) === null || _item3 === void 0 ? void 0 : _item3.product_uid) || ((_item4 = item) === null || _item4 === void 0 || (_item4 = _item4.metadata) === null || _item4 === void 0 ? void 0 : _item4.product_uid) || '') || null : null
+        referenceOwnerUid: kind === 'product' ? String(((_item2 = item) === null || _item2 === void 0 ? void 0 : _item2.booking_uid) || ((_item3 = item) === null || _item3 === void 0 || (_item3 = _item3.metadata) === null || _item3 === void 0 ? void 0 : _item3.booking_uid) || '') || null : kind === 'booking' ? String(((_item4 = item) === null || _item4 === void 0 ? void 0 : _item4.product_uid) || ((_item5 = item) === null || _item5 === void 0 || (_item5 = _item5.metadata) === null || _item5 === void 0 ? void 0 : _item5.product_uid) || '') || null : null
       });
       uid = replacementUid;
       stats.uidConflictCount += 1;

package/dist/server/index.d.ts

@@ -121,6 +121,8 @@ declare class Server {
     private handleSyncSalesTask;
     private runCheckoutSync;
     private omitCheckoutSyncMode;
+    private buildRemoteCheckoutData;
+    private mergeCheckoutSyncPayments;
     private persistSyncedCheckoutOrder;
     /**
      * 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。