@pisell/pisellos 2.2.307 → 2.2.309

package/dist/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

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

@@ -100,6 +100,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     }>;
     applyDiscount(options?: {
         reapplyBookingDiscountProductUids?: string[];
+        reapplyWeighedDiscountProductUids?: string[];
     }): void;
     /**
      * 注入促销评估器。

package/dist/modules/Order/index.js

@@ -34,13 +34,14 @@ import { BaseModule } from "../BaseModule";
 import { OrderHooks } from "./types";
 import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeOrderMetaList, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, buildPointCardSnapshotFromWalletPassList, mergeOrderProductDisplayFields, resolveIsFormSubject, isMarkdownBundle } from "./utils";
 import { isNormalProduct } from "../Product/utils";
+import { getWeighedProductPriceFingerprint, resolveWeighedSourcePrice, withOriginalBundleOptionPrices } from "./utils/weighedProduct";
 import dayjs from 'dayjs';
 import { buildSalesNoteText, decodeSalesNotesSnapshot, getSalesNotePolicy } from "./salesNotes";
 import { ensureOrderPaymentNumber, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "./payment-utils";
 import { resolvePaymentNumberDevicePrefix, resolvePaymentNumberDevicePrefixFromDeviceId } from "../../utils/payment-number";
 import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getOrderProductUid as getPromotionUid, PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY } from "../../solution/BaseSales/utils/cartPromotion";
 import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
-import { hasManualProductDiscountFlag, syncManualProductDiscountProductNum } from "./utils/manualProductDiscount";
+import { hasManualProductDiscountFlag, syncManualProductDiscountProductNum, buildManualProductDiscountItem, findManualProductDiscountItem, mergeManualProductDiscountIntoList } from "./utils/manualProductDiscount";
 import { expandHydratedProductsForDiscountCollection, restoreHydratedBundleDiscounts } from "./utils/bundleDiscountHydration";
 import { getOrderCollectionPersistentId, getOrderCollectionUid, normalizeOrderCollections, repairDuplicateProductLineIdentities as repairDuplicateOrderProductLineIdentities, setOrderCollectionUid } from "./utils/orderCollectionIdentity";
 import { consolidateDiscountFreeProductLines, ensureUniqueProductLineUids } from "./utils/discountProductLineIdentity";
@@ -936,7 +937,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         },
         orderTotalAmount: Number(((_this$store$summary2 = this.store.summary) === null || _this$store$summary2 === void 0 ? void 0 : _this$store$summary2.total_amount) || 0)
       }, {
-        reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids
+        reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids,
+        reapplyWeighedDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyWeighedDiscountProductUids
       });
       if (result !== null && result !== void 0 && result.productList) {
         var previousProductsByUid = indexOrderProductsByUid(tempOrder.products);
@@ -5125,8 +5127,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "applyOrderProductUpdateToTempOrder",
-    value: function applyOrderProductUpdateToTempOrder(tempOrder, params) {
-      var _targetProduct$metada2, _product_sku, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _metadata7, _metadata8, _metadata9, _metadata10, _nextProduct$metadata, _targetProduct$metada15, _tempOrder$products$p, _tempOrder$products$p2;
+    value: function applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids) {
+      var _targetProduct$metada2, _product_sku, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _metadata7, _metadata8, _metadata9, _metadata10, _nextProduct$metadata2, _targetProduct$metada20, _tempOrder$products$p, _tempOrder$products$p2;
       var product_id = params.product_id,
         product_variant_id = params.product_variant_id,
         updates = params.updates,
@@ -5192,7 +5194,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       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 callerChangesWeighing = getWeighedProductPriceFingerprint(targetProduct.product_sku) !== getWeighedProductPriceFingerprint(nextProduct.product_sku);
+      var callerChangesLineConfiguration = callerChangesVariant || callerChangesWeighing || 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 || (_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;
@@ -5208,33 +5211,50 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         };
         return hasChangedPrice(updates.selling_price, targetProduct.selling_price) || hasChangedPrice(updates.original_price, targetProduct.original_price);
       }();
+      var weighedSourcePrice = callerChangesWeighing ? resolveWeighedSourcePrice(nextProduct.product_sku) : undefined;
+      var hasResolvedWeighedPrice = weighedSourcePrice !== undefined;
+      if (hasResolvedWeighedPrice && !callerUpdatesSourcePrice) {
+        var _ref71, _targetProduct$metada3, _targetProduct$metada4, _ref72, _targetProduct$metada5, _targetProduct$metada6;
+        var nextMainOriginal = new Decimal(weighedSourcePrice).plus(sumOptionUnitPrice(getProductSkuOptions(nextProduct)));
+        var previousMainOriginal = new Decimal((_ref71 = (_targetProduct$metada3 = (_targetProduct$metada4 = targetProduct.metadata) === null || _targetProduct$metada4 === void 0 ? void 0 : _targetProduct$metada4.main_product_original_price) !== null && _targetProduct$metada3 !== void 0 ? _targetProduct$metada3 : targetProduct.original_price) !== null && _ref71 !== void 0 ? _ref71 : 0);
+        var previousMainSelling = new Decimal((_ref72 = (_targetProduct$metada5 = (_targetProduct$metada6 = targetProduct.metadata) === null || _targetProduct$metada6 === void 0 ? void 0 : _targetProduct$metada6.main_product_selling_price) !== null && _targetProduct$metada5 !== void 0 ? _targetProduct$metada5 : targetProduct.selling_price) !== null && _ref72 !== void 0 ? _ref72 : 0);
+        // A manual final price remains fixed; other legacy discounts keep their amount
+        // until Rules reapplies the currently selected wallet discount below.
+        var nextMainSelling = isManualProductDiscountProduct(nextProduct) ? previousMainSelling : nextMainOriginal.minus(previousMainOriginal.minus(previousMainSelling));
+        nextProduct.metadata = _objectSpread(_objectSpread({}, nextProduct.metadata), {}, {
+          source_product_price: weighedSourcePrice,
+          main_product_original_price: callerUpdatesMainOriginalPrice ? nextProduct.metadata.main_product_original_price : nextMainOriginal.toFixed(2),
+          main_product_selling_price: callerUpdatesMainSellingPrice ? nextProduct.metadata.main_product_selling_price : Decimal.max(0, nextMainSelling).toFixed(2),
+          price_schema_version: 2
+        });
+      }
       if (isPersistedOrderLine && !callerChangesLineConfiguration && !callerUpdatesManualPrice && !callerAllowsBookingReprice) {
-        var _targetProduct$metada3, _targetProduct$metada4, _targetProduct$metada5, _targetProduct$metada6, _targetProduct$metada7;
+        var _targetProduct$metada7, _targetProduct$metada8, _targetProduct$metada9, _targetProduct$metada10, _targetProduct$metada11;
         nextProduct.selling_price = targetProduct.selling_price;
         nextProduct.original_price = targetProduct.original_price;
         nextProduct.payment_price = targetProduct.payment_price;
         nextProduct.metadata = _objectSpread(_objectSpread({}, nextProduct.metadata || {}), {}, {
-          source_product_price: (_targetProduct$metada3 = targetProduct.metadata) === null || _targetProduct$metada3 === void 0 ? void 0 : _targetProduct$metada3.source_product_price,
-          main_product_selling_price: (_targetProduct$metada4 = targetProduct.metadata) === null || _targetProduct$metada4 === void 0 ? void 0 : _targetProduct$metada4.main_product_selling_price,
-          main_product_original_price: (_targetProduct$metada5 = targetProduct.metadata) === null || _targetProduct$metada5 === void 0 ? void 0 : _targetProduct$metada5.main_product_original_price,
-          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
+          source_product_price: (_targetProduct$metada7 = targetProduct.metadata) === null || _targetProduct$metada7 === void 0 ? void 0 : _targetProduct$metada7.source_product_price,
+          main_product_selling_price: (_targetProduct$metada8 = targetProduct.metadata) === null || _targetProduct$metada8 === void 0 ? void 0 : _targetProduct$metada8.main_product_selling_price,
+          main_product_original_price: (_targetProduct$metada9 = targetProduct.metadata) === null || _targetProduct$metada9 === void 0 ? void 0 : _targetProduct$metada9.main_product_original_price,
+          price_schema_version: (_targetProduct$metada10 = (_targetProduct$metada11 = targetProduct.metadata) === null || _targetProduct$metada11 === void 0 ? void 0 : _targetProduct$metada11.price_schema_version) !== null && _targetProduct$metada10 !== void 0 ? _targetProduct$metada10 : 2
         });
         nextProduct.product_bundle = this.preservePersistedBundlePriceFields(targetProduct.product_bundle, nextProduct.product_bundle);
       } else if (callerChangesLineConfiguration && callerUpdatesSourcePrice && (!callerUpdatesMainSellingPrice || !callerUpdatesMainOriginalPrice)) {
-        var _targetProduct$metada8, _targetProduct$metada9;
+        var _targetProduct$metada12, _targetProduct$metada13, _targetProduct$metada14;
         // 新配置只传了 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)));
+        var _previousMainOriginal = new Decimal(Number((_targetProduct$metada12 = targetProduct.metadata) === null || _targetProduct$metada12 === void 0 ? void 0 : _targetProduct$metada12.main_product_original_price) || 0);
+        var _previousMainSelling = new Decimal(Number((_targetProduct$metada13 = (_targetProduct$metada14 = targetProduct.metadata) === null || _targetProduct$metada14 === void 0 ? void 0 : _targetProduct$metada14.main_product_selling_price) !== null && _targetProduct$metada13 !== void 0 ? _targetProduct$metada13 : _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),
+          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) : hasResolvedWeighedPrice && isManualProductDiscountProduct(nextProduct) ? _previousMainSelling.toFixed(2) : _nextMainOriginal.minus(preservedDiscount).toDecimalPlaces(2).toFixed(2),
           price_schema_version: 2
         });
-      } else if (callerChangesVariant && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+      } else if (callerChangesVariant && !hasResolvedWeighedPrice && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
         // variant 已变化但 caller 没有显式报价时，旧 v2 metadata 不能继续充当权威价格源。
         // 清理后由 normalize 优先读取 metadata.origin.variant 中新 variant 的目录价；
         // 顶层 original/selling 的旧差额仍会作为 legacy discount 迁移到新价格。
@@ -5244,24 +5264,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         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 _ref71, _targetProduct$metada10, _targetProduct$metada11, _ref72, _targetProduct$metada12, _targetProduct$metada13, _targetProduct$metada14;
+      } else if (callerChangesLineConfiguration && !hasResolvedWeighedPrice && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+        var _ref73, _targetProduct$metada15, _targetProduct$metada16, _ref74, _targetProduct$metada17, _targetProduct$metada18, _targetProduct$metada19;
         // 仅 option / bundle 变化时，保留历史 source 和主商品折扣金额，
         // 但必须让 original 与 selling 一起随新的 option 金额移动。
         var previousOptionSum = sumOptionUnitPrice(getProductSkuOptions(targetProduct));
         var nextOptionSum = sumOptionUnitPrice(getProductSkuOptions(nextProduct));
-        var _previousMainOriginal = new Decimal(Number((_ref71 = (_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 && _ref71 !== void 0 ? _ref71 : 0) || 0);
-        var _previousMainSelling = new Decimal(Number((_ref72 = (_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 && _ref72 !== void 0 ? _ref72 : _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);
+        var _previousMainOriginal2 = new Decimal(Number((_ref73 = (_targetProduct$metada15 = (_targetProduct$metada16 = targetProduct.metadata) === null || _targetProduct$metada16 === void 0 ? void 0 : _targetProduct$metada16.main_product_original_price) !== null && _targetProduct$metada15 !== void 0 ? _targetProduct$metada15 : targetProduct.original_price) !== null && _ref73 !== void 0 ? _ref73 : 0) || 0);
+        var _previousMainSelling2 = new Decimal(Number((_ref74 = (_targetProduct$metada17 = (_targetProduct$metada18 = targetProduct.metadata) === null || _targetProduct$metada18 === void 0 ? void 0 : _targetProduct$metada18.main_product_selling_price) !== null && _targetProduct$metada17 !== void 0 ? _targetProduct$metada17 : targetProduct.selling_price) !== null && _ref74 !== void 0 ? _ref74 : _previousMainOriginal2.toNumber()) || 0);
+        var _preservedDiscount = _previousMainOriginal2.minus(_previousMainSelling2);
+        var previousSource = ((_targetProduct$metada19 = targetProduct.metadata) === null || _targetProduct$metada19 === void 0 ? void 0 : _targetProduct$metada19.source_product_price) != null ? new Decimal(Number(targetProduct.metadata.source_product_price) || 0) : _previousMainOriginal2.minus(previousOptionSum);
+        var _nextMainOriginal2 = 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),
+          main_product_original_price: _nextMainOriginal2.toDecimalPlaces(2).toFixed(2),
+          main_product_selling_price: _nextMainOriginal2.minus(_preservedDiscount).toDecimalPlaces(2).toFixed(2),
           price_schema_version: 2
         });
-      } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+      } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta && !hasResolvedWeighedPrice) {
         var _existedMeta = nextProduct.metadata || {};
         nextProduct.metadata = _objectSpread({}, _existedMeta);
         delete nextProduct.metadata.source_product_price;
@@ -5269,11 +5289,40 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         delete nextProduct.metadata.main_product_original_price;
         delete nextProduct.metadata.price_schema_version;
       }
+      if (callerChangesLineConfiguration && resolveWeighedSourcePrice(nextProduct.product_sku) !== undefined && nextProduct.metadata.main_product_original_price != null && nextProduct.metadata.main_product_selling_price != null && isManualProductDiscountProduct(nextProduct)) {
+        var _nextProduct$metadata;
+        var originalPrice = composeLinePrice({
+          mainPrice: nextProduct.metadata.main_product_original_price,
+          bundle: withOriginalBundleOptionPrices(nextProduct.product_bundle),
+          useOriginalBundle: true
+        });
+        var sellingPrice = composeLinePrice({
+          mainPrice: nextProduct.metadata.main_product_selling_price,
+          bundle: nextProduct.product_bundle
+        });
+        var previousManualDiscount = findManualProductDiscountItem(nextProduct.discount_list);
+        nextProduct.original_price = originalPrice;
+        nextProduct.metadata = _objectSpread(_objectSpread({}, nextProduct.metadata), {}, {
+          origin: _objectSpread(_objectSpread({}, nextProduct.metadata.origin), {}, {
+            _extend: _objectSpread(_objectSpread({}, (_nextProduct$metadata = nextProduct.metadata.origin) === null || _nextProduct$metadata === void 0 ? void 0 : _nextProduct$metadata._extend), {}, {
+              origin_total: Number(originalPrice)
+            })
+          })
+        });
+        nextProduct.discount_list = mergeManualProductDiscountIntoList(nextProduct.discount_list, buildManualProductDiscountItem({
+          originTotal: Number(originalPrice),
+          sellingTotal: Number(sellingPrice),
+          quantity: nextProduct.num,
+          message: previousManualDiscount === null || previousManualDiscount === void 0 ? void 0 : previousManualDiscount.discount.message,
+          discountway: previousManualDiscount === null || previousManualDiscount === void 0 ? void 0 : previousManualDiscount.discount.discountway,
+          discount_per: previousManualDiscount === null || previousManualDiscount === void 0 ? void 0 : previousManualDiscount.discount.discount_per
+        }));
+      }
       // normalizeOrderProduct 幂等：v2 metadata 存在 → 保留 main_product_* 折扣重算 composite；
       // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
       var normalizedProduct = this.normalizeVirtualSettlementProductIfEnabled(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$metada15 = targetProduct.metadata) === null || _targetProduct$metada15 === void 0 ? void 0 : _targetProduct$metada15.booking_uid);
+      var preservedBookingUid = nextProduct.booking_uid || ((_nextProduct$metadata2 = nextProduct.metadata) === null || _nextProduct$metadata2 === void 0 ? void 0 : _nextProduct$metadata2.booking_uid) || targetProduct.booking_uid || ((_targetProduct$metada20 = targetProduct.metadata) === null || _targetProduct$metada20 === void 0 ? void 0 : _targetProduct$metada20.booking_uid);
       if (!booking && preservedBookingUid) {
         normalizedProduct.booking_uid = preservedBookingUid;
         normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
@@ -5281,8 +5330,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
       }
       if (booking) {
-        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());
+        var _normalizedProduct$me, _targetProduct$metada21;
+        var productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada21 = targetProduct.metadata) === null || _targetProduct$metada21 === void 0 ? void 0 : _targetProduct$metada21.unique_identification_number) || unique_identification_number || createUuidV4());
         normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
           unique_identification_number: productUid
         });
@@ -5302,6 +5351,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
         tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
       }
+      if (callerChangesWeighing && !isManualProductDiscountProduct(normalizedProduct)) {
+        var _normalizedProduct$me2;
+        var uid = (_normalizedProduct$me2 = normalizedProduct.metadata) === null || _normalizedProduct$me2 === void 0 ? void 0 : _normalizedProduct$me2.unique_identification_number;
+        if (uid) reapplyWeighedDiscountProductUids === null || reapplyWeighedDiscountProductUids === void 0 || reapplyWeighedDiscountProductUids.push(String(uid));
+      }
       tempOrder.products[productIndex] = normalizedProduct;
       this.syncTempOrderHolderFromBookings(tempOrder);
       this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], (_tempOrder$products$p = tempOrder.products[productIndex].metadata) === null || _tempOrder$products$p === void 0 ? void 0 : _tempOrder$products$p.unique_identification_number);
@@ -5311,32 +5365,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProduct",
     value: function () {
       var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
-        var tempOrder, updatedProductUid, promotionPayload;
+        var tempOrder, reapplyWeighedDiscountProductUids, updatedProductUid, promotionPayload;
         return _regeneratorRuntime().wrap(function _callee25$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
-              updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
-              _context27.next = 4;
+              reapplyWeighedDiscountProductUids = [];
+              updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
+              _context27.next = 5;
               return this.evaluatePromotion();
-            case 4:
+            case 5:
               promotionPayload = _context27.sent;
               this.applyDiscount({
+                reapplyWeighedDiscountProductUids: reapplyWeighedDiscountProductUids,
                 reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : undefined
               });
               this.sanitizeTempOrderProducts(tempOrder);
-              _context27.next = 9;
+              _context27.next = 10;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 9:
+            case 10:
               this.persistTempOrder();
               this.emitPromotionApplied(promotionPayload);
               this.logInfo('updateOrderProduct success', {
                 params: params
               });
               return _context27.abrupt("return", tempOrder.products);
-            case 13:
+            case 14:
             case "end":
               return _context27.stop();
           }
@@ -5352,7 +5408,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(paramsList) {
         var _this32 = this;
-        var tempOrder, reapplyBookingDiscountProductUids;
+        var tempOrder, reapplyWeighedDiscountProductUids, reapplyBookingDiscountProductUids;
         return _regeneratorRuntime().wrap(function _callee26$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
@@ -5363,24 +5419,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context28.abrupt("return", tempOrder.products);
             case 3:
+              reapplyWeighedDiscountProductUids = [];
               reapplyBookingDiscountProductUids = paramsList.reduce(function (acc, params) {
-                var updatedProductUid = _this32.applyOrderProductUpdateToTempOrder(tempOrder, params);
+                var updatedProductUid = _this32.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
                 // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
                 if (params.allow_booking_discount_reapply && updatedProductUid) {
                   acc.push(String(updatedProductUid));
                 }
                 return acc;
               }, []);
-              _context28.next = 6;
+              _context28.next = 7;
               return this.finalizeAfterProductsMutation(tempOrder, {
+                reapplyWeighedDiscountProductUids: reapplyWeighedDiscountProductUids,
                 reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
               });
-            case 6:
+            case 7:
               this.logInfo('updateOrderProduct success', {
                 paramsList: paramsList
               });
               return _context28.abrupt("return", tempOrder.products);
-            case 8:
+            case 9:
             case "end":
               return _context28.stop();
           }
@@ -5395,7 +5453,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProductQuantity",
     value: function () {
       var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
-        var _targetProduct$metada17;
+        var _targetProduct$metada22;
         var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct, settlementSnapshot, currencyProductId, asset, requiredAmount, balance, isVirtualSettlement, promotionPayload;
         return _regeneratorRuntime().wrap(function _callee27$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
@@ -5437,7 +5495,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               normalizedProduct = this.normalizeVirtualSettlementProductIfEnabled(normalizeOrderProduct(_objectSpread(_objectSpread({}, targetProduct), {}, {
                 num: getSafeProductNum(num),
                 metadata: _objectSpread(_objectSpread({}, targetProduct.metadata || {}), {}, {
-                  unique_identification_number: ((_targetProduct$metada17 = targetProduct.metadata) === null || _targetProduct$metada17 === void 0 ? void 0 : _targetProduct$metada17.unique_identification_number) || unique_identification_number
+                  unique_identification_number: ((_targetProduct$metada22 = targetProduct.metadata) === null || _targetProduct$metada22 === void 0 ? void 0 : _targetProduct$metada22.unique_identification_number) || unique_identification_number
                 })
               })));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
@@ -5558,7 +5616,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               promotionPayload = _context30.sent;
               this.applyDiscount({
-                reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids
+                reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids,
+                reapplyWeighedDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyWeighedDiscountProductUids
               });
               this.sanitizeTempOrderProducts(tempOrder);
               _context30.next = 8;
@@ -5870,23 +5929,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildCurrentSubmitPayloadForLocalPrint",
     value: function buildCurrentSubmitPayloadForLocalPrint(params) {
-      var _params$cacheId, _this$otherParams5, _ref73, _params$businessCode, _this$otherParams6, _this$otherParams7;
+      var _params$cacheId, _this$otherParams5, _ref75, _params$businessCode, _this$otherParams6, _this$otherParams7;
       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$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.platform),
-        businessCode: (_ref73 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref73 !== void 0 ? _ref73 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
+        businessCode: (_ref75 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref75 !== void 0 ? _ref75 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.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 _ref74, _tempOrder$order_numb, _ref75, _tempOrder$shop_order2, _ref76, _tempOrder$shop_full_;
+          var _ref76, _tempOrder$order_numb, _ref77, _tempOrder$shop_order2, _ref78, _tempOrder$shop_full_;
           return _objectSpread(_objectSpread({}, nextPayload), {}, {
-            order_number: (_ref74 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref74 !== void 0 ? _ref74 : null,
-            shop_order_number: (_ref75 = (_tempOrder$shop_order2 = tempOrder.shop_order_number) !== null && _tempOrder$shop_order2 !== void 0 ? _tempOrder$shop_order2 : nextPayload.shop_order_number) !== null && _ref75 !== void 0 ? _ref75 : null,
-            shop_full_order_number: (_ref76 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref76 !== void 0 ? _ref76 : null,
+            order_number: (_ref76 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref76 !== void 0 ? _ref76 : null,
+            shop_order_number: (_ref77 = (_tempOrder$shop_order2 = tempOrder.shop_order_number) !== null && _tempOrder$shop_order2 !== void 0 ? _tempOrder$shop_order2 : nextPayload.shop_order_number) !== null && _ref77 !== void 0 ? _ref77 : null,
+            shop_full_order_number: (_ref78 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref78 !== void 0 ? _ref78 : null,
             small_ticket_data_flag: 1
           });
         }
@@ -6050,7 +6109,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "runSubmitTempOrder",
     value: function () {
       var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
-        var _params$cacheId3, _this$otherParams12, _ref77, _ref78, _submitSnapshot$busin, _this$otherParams13, _this$otherParams14, _submitSnapshot$type;
+        var _params$cacheId3, _this$otherParams12, _ref79, _ref80, _submitSnapshot$busin, _this$otherParams13, _this$otherParams14, _submitSnapshot$type;
         var tempOrder, isOnlineStorePlatform, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, shouldOverridePaymentStatus, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, isLocalPendingSubmit, salesNotesState, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee37$(_context40) {
           while (1) switch (_context40.prev = _context40.next) {
@@ -6117,7 +6176,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
                 platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.platform),
-                businessCode: (_ref77 = (_ref78 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref78 !== void 0 ? _ref78 : (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.businessCode) !== null && _ref77 !== void 0 ? _ref77 : (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.business_code,
+                businessCode: (_ref79 = (_ref80 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref80 !== void 0 ? _ref80 : (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.businessCode) !== null && _ref79 !== void 0 ? _ref79 : (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.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,
@@ -7222,7 +7281,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step24;
       try {
         for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var _product$metadata12, _ref79, _ref80, _existed$origin, _rawProduct$metadata;
+          var _product$metadata12, _ref81, _ref82, _existed$origin, _rawProduct$metadata;
           var _step24$value = _slicedToArray(_step24.value, 2),
             index = _step24$value[0],
             product = _step24$value[1];
@@ -7230,7 +7289,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 = (_ref79 = (_ref80 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref80 !== void 0 ? _ref80 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref79 !== void 0 ? _ref79 : rawProduct;
+          var origin = (_ref81 = (_ref82 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref82 !== void 0 ? _ref82 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref81 !== void 0 ? _ref81 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -7359,10 +7418,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref81, _optionItem$num, _ref82, _optionItem$add_price;
-      var rawNum = (_ref81 = (_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 && _ref81 !== void 0 ? _ref81 : 1;
+      var _ref83, _optionItem$num, _ref84, _optionItem$add_price;
+      var rawNum = (_ref83 = (_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 && _ref83 !== void 0 ? _ref83 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref82 = (_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 && _ref82 !== void 0 ? _ref82 : 0;
+      var rawPrice = (_ref84 = (_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 && _ref84 !== void 0 ? _ref84 : 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,

package/dist/modules/Order/utils/weighedProduct.d.ts

@@ -0,0 +1,12 @@
+/** Only pricing/measurement fields participate; display and option data do not. */
+export declare function getWeighedProductPriceFingerprint(sku?: Record<string, any>): string;
+/**
+ * A weighed line's source is the amount for its net weight, never its catalog unit price.
+ * Persisted SKU measurements and the full catalog snapshot take priority over runtime
+ * _extend.weighing, which can survive repricing with an obsolete total_amount.
+ */
+export declare function resolveWeighedSourcePrice(sku?: Record<string, any>, weighing?: Record<string, any>): string | undefined;
+/** Original bundle totals must use the nested options before manual distribution. */
+export declare function withOriginalBundleOptionPrices(bundles?: Array<Record<string, any>>): {
+    option: any;
+}[] | undefined;

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

@@ -0,0 +1,94 @@
+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 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); }
+import Decimal from 'decimal.js';
+var UNIT_GRAMS = {
+  kg: '1000',
+  KILOGRAMS: '1000',
+  g: '1',
+  GRAMS: '1',
+  lb: '453.59237',
+  POUNDS: '453.59237',
+  oz: '28.349523125',
+  OUNCES: '28.349523125'
+};
+function nonNegative(value) {
+  if (value === null || value === undefined || value === '') return undefined;
+  try {
+    var result = new Decimal(value);
+    return result.isFinite() && result.gte(0) ? result : undefined;
+  } catch (_unused) {
+    return undefined;
+  }
+}
+function numericKey(value) {
+  var _nonNegative;
+  return (_nonNegative = nonNegative(value)) === null || _nonNegative === void 0 ? void 0 : _nonNegative.toString();
+}
+function unitKey(value) {
+  return UNIT_GRAMS[String(value)] || (value == null ? undefined : String(value));
+}
+function snapshotKey(snapshot) {
+  var _snapshot$unit_value;
+  return [numericKey(snapshot === null || snapshot === void 0 ? void 0 : snapshot.price), unitKey(snapshot === null || snapshot === void 0 ? void 0 : snapshot.unit), numericKey((_snapshot$unit_value = snapshot === null || snapshot === void 0 ? void 0 : snapshot.unit_value) !== null && _snapshot$unit_value !== void 0 ? _snapshot$unit_value : 1)];
+}
+
+/** Only pricing/measurement fields participate; display and option data do not. */
+export function getWeighedProductPriceFingerprint(sku) {
+  var _sku$unit_weight;
+  if (Number(sku === null || sku === void 0 ? void 0 : sku.open_sold_weight) !== 1) return 'unweighed';
+  return JSON.stringify([1, numericKey(sku === null || sku === void 0 ? void 0 : sku.net_weight), unitKey(sku === null || sku === void 0 ? void 0 : sku.unit), numericKey(sku === null || sku === void 0 ? void 0 : sku.unit_price), numericKey((_sku$unit_weight = sku === null || sku === void 0 ? void 0 : sku.unit_weight) !== null && _sku$unit_weight !== void 0 ? _sku$unit_weight : 1), snapshotKey(sku === null || sku === void 0 ? void 0 : sku.unit_data_snapshot)]);
+}
+
+/**
+ * A weighed line's source is the amount for its net weight, never its catalog unit price.
+ * Persisted SKU measurements and the full catalog snapshot take priority over runtime
+ * _extend.weighing, which can survive repricing with an obsolete total_amount.
+ */
+export function resolveWeighedSourcePrice(sku, weighing) {
+  var _snapshot$unit_value2, _weighing$unit_weight, _sku$unit_weight2, _measurement$unit_wei;
+  if ((sku === null || sku === void 0 ? void 0 : sku.open_sold_weight) != null && Number(sku.open_sold_weight) !== 1) return undefined;
+  if (Number(sku === null || sku === void 0 ? void 0 : sku.open_sold_weight) !== 1 && !weighing) return undefined;
+  var hasSkuMeasurement = (sku === null || sku === void 0 ? void 0 : sku.net_weight) !== undefined && (sku === null || sku === void 0 ? void 0 : sku.net_weight) !== null;
+  var measurement = hasSkuMeasurement ? sku : weighing;
+  var netWeight = nonNegative(measurement === null || measurement === void 0 ? void 0 : measurement.net_weight);
+  if (netWeight === undefined) return undefined;
+  var snapshot = hasSkuMeasurement ? sku === null || sku === void 0 ? void 0 : sku.unit_data_snapshot : weighing === null || weighing === void 0 ? void 0 : weighing.scalePriceProduct;
+  var snapshotPrice = nonNegative(snapshot === null || snapshot === void 0 ? void 0 : snapshot.price);
+  var snapshotUnits = nonNegative((_snapshot$unit_value2 = snapshot === null || snapshot === void 0 ? void 0 : snapshot.unit_value) !== null && _snapshot$unit_value2 !== void 0 ? _snapshot$unit_value2 : 1);
+  var sourceGrams = UNIT_GRAMS[String(snapshot === null || snapshot === void 0 ? void 0 : snapshot.unit)];
+  var targetGrams = UNIT_GRAMS[String(measurement === null || measurement === void 0 ? void 0 : measurement.unit)];
+  if (snapshotPrice && snapshotUnits !== null && snapshotUnits !== void 0 && snapshotUnits.gt(0) && sourceGrams && targetGrams) {
+    return snapshotPrice.mul(netWeight).mul(targetGrams).div(sourceGrams).div(snapshotUnits).toFixed(2);
+  }
+
+  // Legacy callers may only retain the native scale's amount. Do not let an old
+  // amount overwrite a changed SKU measurement, unit price, or pricing snapshot.
+  var runtimeAmount = nonNegative(weighing === null || weighing === void 0 ? void 0 : weighing.total_amount);
+  var runtimeMatchesSku = !hasSkuMeasurement || numericKey(weighing === null || weighing === void 0 ? void 0 : weighing.net_weight) === numericKey(sku === null || sku === void 0 ? void 0 : sku.net_weight) && unitKey(weighing === null || weighing === void 0 ? void 0 : weighing.unit) === unitKey(sku === null || sku === void 0 ? void 0 : sku.unit) && numericKey(weighing === null || weighing === void 0 ? void 0 : weighing.unit_price) === numericKey(sku === null || sku === void 0 ? void 0 : sku.unit_price) && numericKey((_weighing$unit_weight = weighing === null || weighing === void 0 ? void 0 : weighing.unit_weight) !== null && _weighing$unit_weight !== void 0 ? _weighing$unit_weight : 1) === numericKey((_sku$unit_weight2 = sku === null || sku === void 0 ? void 0 : sku.unit_weight) !== null && _sku$unit_weight2 !== void 0 ? _sku$unit_weight2 : 1) && JSON.stringify(snapshotKey(weighing === null || weighing === void 0 ? void 0 : weighing.scalePriceProduct)) === JSON.stringify(snapshotKey(sku === null || sku === void 0 ? void 0 : sku.unit_data_snapshot));
+  if (runtimeAmount && runtimeMatchesSku) return runtimeAmount.toFixed(2);
+
+  // Older persisted orders have only a rounded per-scale-unit price.
+  var unitPrice = nonNegative(measurement === null || measurement === void 0 ? void 0 : measurement.unit_price);
+  var unitWeight = nonNegative((_measurement$unit_wei = measurement === null || measurement === void 0 ? void 0 : measurement.unit_weight) !== null && _measurement$unit_wei !== void 0 ? _measurement$unit_wei : 1);
+  if (!unitPrice || !(unitWeight !== null && unitWeight !== void 0 && unitWeight.gt(0))) return undefined;
+  return netWeight.div(unitWeight).mul(unitPrice).toFixed(2);
+}
+
+/** Original bundle totals must use the nested options before manual distribution. */
+export function withOriginalBundleOptionPrices(bundles) {
+  return bundles === null || bundles === void 0 ? void 0 : bundles.map(function (bundle) {
+    var _bundle$option;
+    return _objectSpread(_objectSpread({}, bundle), {}, {
+      option: (_bundle$option = bundle.option) === null || _bundle$option === void 0 ? void 0 : _bundle$option.map(function (option) {
+        var _ref, _option$original_pric;
+        return _objectSpread(_objectSpread({}, option), {}, {
+          add_price: (_ref = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref !== void 0 ? _ref : option.price
+        });
+      })
+    });
+  });
+}

package/dist/modules/Order/utils.js

@@ -20,6 +20,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { withOriginalBundleOptionPrices } from "./utils/weighedProduct";
+import { hasManualProductDiscountFlag } from "./utils/manualProductDiscount";
 import { getProductHolderConfig } from "../Holder/utils";
 import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
 import { createUuidV4 } from "./utils/orderCollectionIdentity";
@@ -698,7 +700,7 @@ export function createDefaultOrderRulesHooks() {
       };
     },
     setProduct: function setProduct(product, values) {
-      var _ref23, _values$quantity, _ref24, _metadataAny$source_p, _values$discount_list, _values$quantity2;
+      var _ref23, _values$quantity, _ref24, _metadataAny$source_p, _product$product_sku, _values$discount_list, _values$quantity2;
       var nextNum = Number((_ref23 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref23 !== void 0 ? _ref23 : 1) || 1;
       var metadataAny = product.metadata || {};
       var existedSource = (_ref24 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref24 !== void 0 ? _ref24 : '0';
@@ -724,7 +726,7 @@ export function createDefaultOrderRulesHooks() {
       });
       var composedOriginalPrice = composeLinePrice({
         mainPrice: nextMainOriginalPrice,
-        bundle: nextBundle,
+        bundle: Number((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) === 1 && hasManualProductDiscountFlag(metadataAny) ? withOriginalBundleOptionPrices(nextBundle) : nextBundle,
         useOriginalBundle: true
       });
       var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
@@ -1428,11 +1430,11 @@ export function mapPaymentItemsToOrderPayments(paymentItems) {
  */
 export function formatV1Product(products) {
   return products.map(function (product) {
-    var _product$product_sku, _product$note;
+    var _product$product_sku2, _product$note;
     return {
       bundle: product.product_bundle,
       key: product.product_id,
-      option: ((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.option) || [],
+      option: ((_product$product_sku2 = product.product_sku) === null || _product$product_sku2 === void 0 ? void 0 : _product$product_sku2.option) || [],
       product_id: product.product_id,
       product_variant_id: product.product_variant_id,
       num: product.product_quantity,