@pisell/pisellos 2.2.308 → 2.2.309

package/dist/modules/Rules/index.js

@@ -365,7 +365,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }) && productList.find(function (n) {
         return !n.booking_id;
       });
-      var reapplyBookingDiscountProductUids = new Set(((options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids) || []).filter(function (uid) {
+      var reapplyWeighedDiscountProductUids = new Set(((options === null || options === void 0 ? void 0 : options.reapplyWeighedDiscountProductUids) || []).map(String));
+      var reapplyBookingDiscountProductUids = new Set([].concat(_toConsumableArray((options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids) || []), _toConsumableArray(reapplyWeighedDiscountProductUids)).filter(function (uid) {
         return uid !== undefined && uid !== null && uid !== '';
       }).map(String));
       var getOriginProductUid = function getOriginProductUid(originProduct) {
@@ -1110,7 +1111,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }));
 
         // 已持久化且已有钱包券/折扣卡的商品行跳过，保留后端历史折扣结果。
-        if (isPersistedProduct && hasExistingWalletDiscount) {
+        var isReweighedProduct = reapplyWeighedDiscountProductUids.has(getOriginProductUid(originProduct) || '');
+        if (isPersistedProduct && hasExistingWalletDiscount && !isReweighedProduct) {
           if (flatItem.type === 'main') {
             processedProductsMap.set(product._id, [originProduct]);
           }

package/dist/modules/Rules/types.d.ts

@@ -31,6 +31,8 @@ export interface RulesCalcDiscountOptions {
     scan?: boolean;
     /** Change time 重报价目标行：允许已选编辑态折扣卡重新应用到这些 booking 商品。 */
     reapplyBookingDiscountProductUids?: string[];
+    /** Reweighed order lines only: reapply selected wallet discounts against their new amount. */
+    reapplyWeighedDiscountProductUids?: string[];
 }
 export interface RulesModuleAPI {
     setRulesList: (rulesList: Rules[]) => Promise<void>;

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

@@ -11,6 +11,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import { resolveWeighedSourcePrice, withOriginalBundleOptionPrices } from "../../../modules/Order/utils/weighedProduct";
 import { composeLinePrice, getBundleSellingMagnitude, normalizeProductSkuOptions, sumOptionUnitPrice } from "../../../modules/Order/utils";
 import { buildManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, shouldBuildManualProductDiscount } from "../../../modules/Order/utils/manualProductDiscount";
 function toNumber(value) {
@@ -101,11 +102,12 @@ function appendDataVariantIds(base) {
   return Array.isArray(base) || result.length ? result : undefined;
 }
 function normalizeOptionItems(optionItems) {
+  var useOriginalPrice = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (!Array.isArray(optionItems)) return [];
   return optionItems.map(function (optionItem) {
-    var _optionItem$option_gr, _ref, _optionItem$price, _optionItem$num;
+    var _optionItem$option_gr, _ref, _ref2, _ref3, _optionItem$num;
     var optionGroupItemId = toNumber((_optionItem$option_gr = optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id) !== null && _optionItem$option_gr !== void 0 ? _optionItem$option_gr : optionItem === null || optionItem === void 0 ? void 0 : optionItem.id);
-    var price = (_ref = (_optionItem$price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _optionItem$price !== void 0 ? _optionItem$price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref !== void 0 ? _ref : 0;
+    var price = (_ref = (_ref2 = (_ref3 = useOriginalPrice ? optionItem === null || optionItem === void 0 ? void 0 : optionItem.original_price : undefined) !== null && _ref3 !== void 0 ? _ref3 : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref2 !== void 0 ? _ref2 : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref !== void 0 ? _ref : 0;
     return _objectSpread(_objectSpread({}, optionItem), {}, {
       option_group_item_id: optionGroupItemId,
       option_group_id: toNumber(optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_id),
@@ -117,10 +119,13 @@ function normalizeOptionItems(optionItems) {
 }
 function normalizeBundleItems(bundleItems) {
   var preferPriceField = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var preferBundleSellingPrice = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   if (!Array.isArray(bundleItems)) return [];
   return bundleItems.map(function (bundleItem) {
-    var _ref2, _ref3, _ref4, _bundleItem$price, _ref5, _ref6, _ref7, _bundleItem$bundle_se, _bundleItem$num, _bundleItem$price2, _bundleItem$quantity, _bundleItem$price3, _ref8, _ref9, _bundleItem$original_, _normalizedItem$price;
-    var unitSelling = preferPriceField ? (_ref2 = (_ref3 = (_ref4 = (_bundleItem$price = bundleItem.price) !== null && _bundleItem$price !== void 0 ? _bundleItem$price : bundleItem.bundle_selling_price) !== null && _ref4 !== void 0 ? _ref4 : bundleItem.custom_price) !== null && _ref3 !== void 0 ? _ref3 : bundleItem.product_price) !== null && _ref2 !== void 0 ? _ref2 : '0' : (_ref5 = (_ref6 = (_ref7 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref7 !== void 0 ? _ref7 : bundleItem.custom_price) !== null && _ref6 !== void 0 ? _ref6 : bundleItem.product_price) !== null && _ref5 !== void 0 ? _ref5 : '0';
+    var _ref4, _ref5, _ref6, _bundleItem$price, _ref7, _ref8, _ref9, _bundleItem$bundle_se, _bundleItem$num, _bundleItem$price2, _bundleItem$quantity, _bundleItem$price3, _ref10, _ref11, _bundleItem$original_, _normalizedItem$price;
+    // Weighed manual prices distribute the bundle base and nested options separately.
+    // Its explicit selling amount already includes those options.
+    var unitSelling = preferPriceField && !preferBundleSellingPrice ? (_ref4 = (_ref5 = (_ref6 = (_bundleItem$price = bundleItem.price) !== null && _bundleItem$price !== void 0 ? _bundleItem$price : bundleItem.bundle_selling_price) !== null && _ref6 !== void 0 ? _ref6 : bundleItem.custom_price) !== null && _ref5 !== void 0 ? _ref5 : bundleItem.product_price) !== null && _ref4 !== void 0 ? _ref4 : '0' : (_ref7 = (_ref8 = (_ref9 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref9 !== void 0 ? _ref9 : bundleItem.custom_price) !== null && _ref8 !== void 0 ? _ref8 : bundleItem.product_price) !== null && _ref7 !== void 0 ? _ref7 : '0';
     var unitStr = toPriceString(unitSelling, '0.00');
     var num = toSafePositiveInt((_bundleItem$num = bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.num) !== null && _bundleItem$num !== void 0 ? _bundleItem$num : bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.quantity, 1);
     var magnitudeSource = _objectSpread(_objectSpread({}, bundleItem), {}, {
@@ -135,7 +140,7 @@ function normalizeBundleItems(bundleItems) {
       // price 保留毛价（markdown 仍为正），由 price_type 决定符号。
       price: (_bundleItem$price3 = bundleItem.price) !== null && _bundleItem$price3 !== void 0 ? _bundleItem$price3 : unitStr,
       bundle_selling_price: unitStr,
-      original_price: (_ref8 = (_ref9 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref9 !== void 0 ? _ref9 : bundleItem.price) !== null && _ref8 !== void 0 ? _ref8 : unitStr,
+      original_price: (_ref10 = (_ref11 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref11 !== void 0 ? _ref11 : bundleItem.price) !== null && _ref10 !== void 0 ? _ref10 : unitStr,
       option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option),
       discount_list: preferPriceField ? [] : bundleItem.discount_list
     });
@@ -163,49 +168,55 @@ function findVariantById(origin, variantId) {
  * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
  */
 export function transformBaseProductToOrderProduct(params) {
-  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _payload$metadata, _sourceProduct$metada, _callbackOrigin$metad, _origin$metadata, _payload$metadata2, _payload$_extend, _sourceProduct$metada2, _sourceProduct$_exten, _callbackOrigin$metad2, _callbackOrigin$_exte, _payload$_dataVariant, _sourceProduct$_dataV, _callbackOrigin$_data, _origin$_dataVariant, _ref15, _findVariantById, _origin$production_co, _ref16, _ref17, _ref18, _ref19, _ref20, _matchedVariant$price, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend2, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend3, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend4, _payload$_extend5, _extend3, _payload$_extend6, _payload$_extend7, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
+  var _ref12, _ref13, _ref14, _payload$product_id, _ref15, _ref16, _payload$product_vari, _payload$_origin, _payload$_origin2, _payload$metadata, _sourceProduct$metada, _callbackOrigin$metad, _origin$metadata, _payload$metadata2, _payload$_extend, _sourceProduct$metada2, _sourceProduct$_exten, _callbackOrigin$metad2, _callbackOrigin$_exte, _payload$_dataVariant, _sourceProduct$_dataV, _callbackOrigin$_data, _origin$_dataVariant, _ref17, _findVariantById, _origin$production_co, _ref18, _ref19, _ref20, _ref21, _ref22, _matchedVariant$price, _payload$product_sku, _payload$_extend$weig, _payload$_extend2, _origin$_extend, _ref23, _ref24, _payload$price, _ref25, _payload$line_total, _payload$_extend3, _ref26, _ref27, _payload$product_sku$, _payload$product_sku2, _payload$bundle, _payload$quantity, _payload$_extend4, _extend, _extend2, _ref28, _ref29, _origin$base_price, _ref30, _ref31, _payload$line_total2, _payload$_extend5, _payload$_extend6, _extend3, _payload$_extend7, _payload$_extend8, _ref32, _ref33, _payload$tax_fee, _ref34, _ref35, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
   if (!payload || _typeof(payload) !== 'object') return null;
   var sourceProduct = params.sourceProduct || params.sourceItem || {};
-  var productId = toProductId((_ref10 = (_ref11 = (_ref12 = (_payload$product_id = payload.product_id) !== null && _payload$product_id !== void 0 ? _payload$product_id : payload.id) !== null && _ref12 !== void 0 ? _ref12 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_id) !== null && _ref11 !== void 0 ? _ref11 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id) !== null && _ref10 !== void 0 ? _ref10 : fallbackProductId);
+  var productId = toProductId((_ref12 = (_ref13 = (_ref14 = (_payload$product_id = payload.product_id) !== null && _payload$product_id !== void 0 ? _payload$product_id : payload.id) !== null && _ref14 !== void 0 ? _ref14 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_id) !== null && _ref13 !== void 0 ? _ref13 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id) !== null && _ref12 !== void 0 ? _ref12 : fallbackProductId);
   if (productId === null) return null;
-  var productVariantId = toNumber((_ref13 = (_ref14 = (_payload$product_vari = payload.product_variant_id) !== null && _payload$product_vari !== void 0 ? _payload$product_vari : payload.variant_id) !== null && _ref14 !== void 0 ? _ref14 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_variant_id) !== null && _ref13 !== void 0 ? _ref13 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.variant_id, 0);
+  var productVariantId = toNumber((_ref15 = (_ref16 = (_payload$product_vari = payload.product_variant_id) !== null && _payload$product_vari !== void 0 ? _payload$product_vari : payload.variant_id) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_variant_id) !== null && _ref15 !== void 0 ? _ref15 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.variant_id, 0);
   var callbackOrigin = payload.origin || ((_payload$_origin = payload._origin) === null || _payload$_origin === void 0 ? void 0 : _payload$_origin.sourceProduct) || ((_payload$_origin2 = payload._origin) === null || _payload$_origin2 === void 0 ? void 0 : _payload$_origin2.sourceItem) || payload._origin || {};
   var origin = _objectSpread(_objectSpread({}, sourceProduct || {}), callbackOrigin || {});
   var authoritativeDataVariantIds = cloneFirstDataVariantIds((_payload$metadata = payload.metadata) === null || _payload$metadata === void 0 ? void 0 : _payload$metadata.data_variant_ids, sourceProduct === null || sourceProduct === void 0 || (_sourceProduct$metada = sourceProduct.metadata) === null || _sourceProduct$metada === void 0 ? void 0 : _sourceProduct$metada.data_variant_ids, callbackOrigin === null || callbackOrigin === void 0 || (_callbackOrigin$metad = callbackOrigin.metadata) === null || _callbackOrigin$metad === void 0 ? void 0 : _callbackOrigin$metad.data_variant_ids, origin === null || origin === void 0 || (_origin$metadata = origin.metadata) === null || _origin$metadata === void 0 ? void 0 : _origin$metadata.data_variant_ids);
   var selectedSettlementSnapshot = firstNonBlank(payload.selected_settlement_snapshot, (_payload$metadata2 = payload.metadata) === null || _payload$metadata2 === void 0 ? void 0 : _payload$metadata2.selected_settlement_snapshot, (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 || (_payload$_extend = _payload$_extend.metadata) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.selected_settlement_snapshot, sourceProduct === null || sourceProduct === void 0 || (_sourceProduct$metada2 = sourceProduct.metadata) === null || _sourceProduct$metada2 === void 0 ? void 0 : _sourceProduct$metada2.selected_settlement_snapshot, sourceProduct === null || sourceProduct === void 0 || (_sourceProduct$_exten = sourceProduct._extend) === null || _sourceProduct$_exten === void 0 || (_sourceProduct$_exten = _sourceProduct$_exten.metadata) === null || _sourceProduct$_exten === void 0 ? void 0 : _sourceProduct$_exten.selected_settlement_snapshot, callbackOrigin === null || callbackOrigin === void 0 || (_callbackOrigin$metad2 = callbackOrigin.metadata) === null || _callbackOrigin$metad2 === void 0 ? void 0 : _callbackOrigin$metad2.selected_settlement_snapshot, callbackOrigin === null || callbackOrigin === void 0 || (_callbackOrigin$_exte = callbackOrigin._extend) === null || _callbackOrigin$_exte === void 0 || (_callbackOrigin$_exte = _callbackOrigin$_exte.metadata) === null || _callbackOrigin$_exte === void 0 ? void 0 : _callbackOrigin$_exte.selected_settlement_snapshot);
   var locallyAppliedVariantIds = authoritativeDataVariantIds === undefined ? cloneFirstDataVariantIds((_payload$_dataVariant = payload._dataVariant) === null || _payload$_dataVariant === void 0 ? void 0 : _payload$_dataVariant.appliedVariantIds, sourceProduct === null || sourceProduct === void 0 || (_sourceProduct$_dataV = sourceProduct._dataVariant) === null || _sourceProduct$_dataV === void 0 ? void 0 : _sourceProduct$_dataV.appliedVariantIds, callbackOrigin === null || callbackOrigin === void 0 || (_callbackOrigin$_data = callbackOrigin._dataVariant) === null || _callbackOrigin$_data === void 0 ? void 0 : _callbackOrigin$_data.appliedVariantIds, origin === null || origin === void 0 || (_origin$_dataVariant = origin._dataVariant) === null || _origin$_dataVariant === void 0 ? void 0 : _origin$_dataVariant.appliedVariantIds) : undefined;
   var dataVariantIds = appendDataVariantIds(authoritativeDataVariantIds, locallyAppliedVariantIds, selectedSettlementSnapshot === null || selectedSettlementSnapshot === void 0 ? void 0 : selectedSettlementSnapshot.data_variant_id);
-  var matchedVariant = (_ref15 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref15 !== void 0 ? _ref15 : findVariantById(origin, productVariantId);
+  var matchedVariant = (_ref17 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref17 !== void 0 ? _ref17 : findVariantById(origin, productVariantId);
   var productionCode = normalizeProductionCode(Object.prototype.hasOwnProperty.call(payload, 'production_code') ? payload.production_code : productVariantId > 0 ? matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.production_code : (_origin$production_co = origin === null || origin === void 0 ? void 0 : origin.production_code) !== null && _origin$production_co !== void 0 ? _origin$production_co : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.production_code);
   var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   // 手动改价后 payload.price 是分摊后的主商品售价，不能再作为券前 source。
-  // 此时优先从商品/variant 快照读取目录价；售价仍由 line_total - bundle 推导。
-  var catalogSourcePrice = (_ref16 = (_ref17 = (_ref18 = (_ref19 = (_ref20 = (_matchedVariant$price = matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _matchedVariant$price !== void 0 ? _matchedVariant$price : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref20 !== void 0 ? _ref20 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref17 !== void 0 ? _ref17 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price;
-  var sourceProductPrice = toPriceString(hasPriceOverride ? (_ref21 = catalogSourcePrice !== null && catalogSourcePrice !== void 0 ? catalogSourcePrice : payload.price) !== null && _ref21 !== void 0 ? _ref21 : payload.selling_price : (_ref22 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref22 !== void 0 ? _ref22 : catalogSourcePrice, '0.00');
-  var explicitLineTotal = (_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend2 = payload._extend) === null || _payload$_extend2 === void 0 ? void 0 : _payload$_extend2.total;
+  // 称重商品使用改价前净重金额；其它商品从商品/variant 快照读取目录价。
+  // 售价仍由 line_total - bundle 推导。
+  var catalogSourcePrice = (_ref18 = (_ref19 = (_ref20 = (_ref21 = (_ref22 = (_matchedVariant$price = matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _matchedVariant$price !== void 0 ? _matchedVariant$price : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref22 !== void 0 ? _ref22 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref21 !== void 0 ? _ref21 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref20 !== void 0 ? _ref20 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref19 !== void 0 ? _ref19 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price;
+  var weighedSourcePrice = resolveWeighedSourcePrice((_payload$product_sku = payload.product_sku) !== null && _payload$product_sku !== void 0 ? _payload$product_sku : origin.product_sku, (_payload$_extend$weig = (_payload$_extend2 = payload._extend) === null || _payload$_extend2 === void 0 ? void 0 : _payload$_extend2.weighing) !== null && _payload$_extend$weig !== void 0 ? _payload$_extend$weig : (_origin$_extend = origin._extend) === null || _origin$_extend === void 0 ? void 0 : _origin$_extend.weighing);
+  var sourceProductPrice = toPriceString(weighedSourcePrice !== null && weighedSourcePrice !== void 0 ? weighedSourcePrice : hasPriceOverride ? (_ref23 = catalogSourcePrice !== null && catalogSourcePrice !== void 0 ? catalogSourcePrice : payload.price) !== null && _ref23 !== void 0 ? _ref23 : payload.selling_price : (_ref24 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref24 !== void 0 ? _ref24 : catalogSourcePrice, '0.00');
+  var explicitLineTotal = (_ref25 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref25 !== void 0 ? _ref25 : (_payload$_extend3 = payload._extend) === null || _payload$_extend3 === void 0 ? void 0 : _payload$_extend3.total;
   var hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   var lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
-  var productOptionItem = normalizeProductSkuOptions(normalizeOptionItems((_ref24 = (_ref25 = (_payload$product_sku$ = (_payload$product_sku = payload.product_sku) === null || _payload$product_sku === void 0 ? void 0 : _payload$product_sku.option) !== null && _payload$product_sku$ !== void 0 ? _payload$product_sku$ : payload.option) !== null && _ref25 !== void 0 ? _ref25 : payload.options) !== null && _ref24 !== void 0 ? _ref24 : payload.product_option_item));
-  var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle, hasPriceOverride);
+  var productOptionItem = normalizeProductSkuOptions(normalizeOptionItems((_ref26 = (_ref27 = (_payload$product_sku$ = (_payload$product_sku2 = payload.product_sku) === null || _payload$product_sku2 === void 0 ? void 0 : _payload$product_sku2.option) !== null && _payload$product_sku$ !== void 0 ? _payload$product_sku$ : payload.option) !== null && _ref27 !== void 0 ? _ref27 : payload.options) !== null && _ref26 !== void 0 ? _ref26 : payload.product_option_item, hasPriceOverride || weighedSourcePrice !== undefined));
+  var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle, hasPriceOverride, hasPriceOverride && weighedSourcePrice !== undefined);
   // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；
   // 行级唯一值只接受显式协议字段，缺省交给 OrderModule 生成。
   var uniqueIdentificationNumber = payload.unique_identification_number;
   var resolvedQuantity = toSafePositiveInt((_payload$quantity = payload.quantity) !== null && _payload$quantity !== void 0 ? _payload$quantity : payload.num, 1);
-  var originTotal = resolveManualDiscountOriginTotal({
+  var originTotal = weighedSourcePrice !== undefined ? Number(composeLinePrice({
+    mainPrice: Number(weighedSourcePrice) + sumOptionUnitPrice(productOptionItem).toNumber(),
+    bundle: hasPriceOverride ? withOriginalBundleOptionPrices(productBundle) : productBundle,
+    useOriginalBundle: true
+  })) : resolveManualDiscountOriginTotal({
     originTotal: payload.origin_total,
-    extendOriginTotal: (_payload$_extend3 = payload._extend) === null || _payload$_extend3 === void 0 ? void 0 : _payload$_extend3.origin_total,
+    extendOriginTotal: (_payload$_extend4 = payload._extend) === null || _payload$_extend4 === void 0 ? void 0 : _payload$_extend4.origin_total,
     originExtendOriginTotal: origin === null || origin === void 0 || (_extend = origin._extend) === null || _extend === void 0 ? void 0 : _extend.origin_total,
     sourceExtendOriginTotal: sourceProduct === null || sourceProduct === void 0 || (_extend2 = sourceProduct._extend) === null || _extend2 === void 0 ? void 0 : _extend2.origin_total,
-    catalogUnitPrice: (_ref26 = (_ref27 = (_origin$base_price = origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _origin$base_price !== void 0 ? _origin$base_price : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref27 !== void 0 ? _ref27 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price) !== null && _ref26 !== void 0 ? _ref26 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price,
+    catalogUnitPrice: (_ref28 = (_ref29 = (_origin$base_price = origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _origin$base_price !== void 0 ? _origin$base_price : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref29 !== void 0 ? _ref29 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price) !== null && _ref28 !== void 0 ? _ref28 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price,
     quantity: resolvedQuantity
   });
-  var sellingTotal = Number((_ref28 = (_ref29 = (_payload$line_total2 = payload.line_total) !== null && _payload$line_total2 !== void 0 ? _payload$line_total2 : payload.total) !== null && _ref29 !== void 0 ? _ref29 : (_payload$_extend4 = payload._extend) === null || _payload$_extend4 === void 0 ? void 0 : _payload$_extend4.total) !== null && _ref28 !== void 0 ? _ref28 : lineCompositeTotal);
+  var sellingTotal = Number((_ref30 = (_ref31 = (_payload$line_total2 = payload.line_total) !== null && _payload$line_total2 !== void 0 ? _payload$line_total2 : payload.total) !== null && _ref31 !== void 0 ? _ref31 : (_payload$_extend5 = payload._extend) === null || _payload$_extend5 === void 0 ? void 0 : _payload$_extend5.total) !== null && _ref30 !== void 0 ? _ref30 : lineCompositeTotal);
   var discountReason = resolveManualDiscountReasonFromSources({
     discountReason: payload.discount_reason,
-    extendDiscountReason: (_payload$_extend5 = payload._extend) === null || _payload$_extend5 === void 0 ? void 0 : _payload$_extend5.discount_reason,
+    extendDiscountReason: (_payload$_extend6 = payload._extend) === null || _payload$_extend6 === void 0 ? void 0 : _payload$_extend6.discount_reason,
     originExtendDiscountReason: origin === null || origin === void 0 || (_extend3 = origin._extend) === null || _extend3 === void 0 ? void 0 : _extend3.discount_reason
   });
   var lineOriginalPrice = hasPriceOverride && Number.isFinite(originTotal) ? toPriceString(originTotal) : lineCompositeTotal;
@@ -218,8 +229,8 @@ export function transformBaseProductToOrderProduct(params) {
     sellingTotal: Number.isFinite(sellingTotal) ? sellingTotal : Number(lineCompositeTotal),
     quantity: resolvedQuantity,
     message: discountReason,
-    discountway: (_payload$_extend6 = payload._extend) === null || _payload$_extend6 === void 0 ? void 0 : _payload$_extend6.discountway,
-    discount_per: (_payload$_extend7 = payload._extend) === null || _payload$_extend7 === void 0 ? void 0 : _payload$_extend7.discount_per
+    discountway: (_payload$_extend7 = payload._extend) === null || _payload$_extend7 === void 0 ? void 0 : _payload$_extend7.discountway,
+    discount_per: (_payload$_extend8 = payload._extend) === null || _payload$_extend8 === void 0 ? void 0 : _payload$_extend8.discount_per
   })) : payload.discount_list || [];
 
   // v2：source 不含 option；main_product_* 含 option（与 normalizeOrderProduct 一致）
@@ -281,13 +292,17 @@ export function transformBaseProductToOrderProduct(params) {
     // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价
     selling_price: lineCompositeTotal,
     original_price: lineOriginalPrice,
-    tax_fee: toPriceString((_ref30 = (_ref31 = (_payload$tax_fee = payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.tax_fee) !== null && _ref31 !== void 0 ? _ref31 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref30 !== void 0 ? _ref30 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
-    is_charge_tax: toNumber((_ref32 = (_ref33 = (_payload$is_charge_ta = payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref33 !== void 0 ? _ref33 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref32 !== void 0 ? _ref32 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.is_charge_tax, 0),
+    tax_fee: toPriceString((_ref32 = (_ref33 = (_payload$tax_fee = payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.tax_fee) !== null && _ref33 !== void 0 ? _ref33 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref32 !== void 0 ? _ref32 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
+    is_charge_tax: toNumber((_ref34 = (_ref35 = (_payload$is_charge_ta = payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref35 !== void 0 ? _ref35 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref34 !== void 0 ? _ref34 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.is_charge_tax, 0),
     metadata: metadata,
     note: payload.note != null ? String(payload.note) : '',
     product_title: productTitle,
     product_cover: firstNonBlank(matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.cover, sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.cover),
-    _origin: _objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
+    _origin: _objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), weighedSourcePrice !== undefined && hasPriceOverride ? {
+      _extend: _objectSpread(_objectSpread({}, sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct._extend), {}, {
+        origin_total: originTotal
+      })
+    } : {}), {}, {
       callbackData: payload
     })
   });

package/dist/solution/BaseSales/utils.js

@@ -4,9 +4,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { withOriginalBundleOptionPrices } from "../../modules/Order/utils/weighedProduct";
 import Decimal from 'decimal.js';
 import { composeLinePrice, createUuidV4, ensureProductSku, normalizeProductSkuOptions, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
-import { ensureManualProductDiscountList } from "../../modules/Order/utils/manualProductDiscount";
+import { ensureManualProductDiscountList, hasManualProductDiscountFlag } from "../../modules/Order/utils/manualProductDiscount";
 
 /**
  * 构建金额全为 0 的空 summary。
@@ -241,7 +242,7 @@ export function normalizeOrderProduct(product) {
   });
   var composedOriginalPrice = composeLinePrice({
     mainPrice: mainOriginalStr,
-    bundle: normalizedBundle,
+    bundle: Number(productSku.open_sold_weight) === 1 && hasManualProductDiscountFlag(metadata) ? withOriginalBundleOptionPrices(normalizedBundle) : normalizedBundle,
     useOriginalBundle: true
   });
   var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({

package/dist/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.d.ts

@@ -339,7 +339,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/ScanOrder/utils.js

@@ -11,10 +11,11 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import { withOriginalBundleOptionPrices } from "../../modules/Order/utils/weighedProduct";
 import dayjs from 'dayjs';
 import Decimal from 'decimal.js';
 import { composeLinePrice, createUuidV4, ensureProductSku, getBundleSellingMagnitude, getProductSkuOptions, normalizeProductSkuOptions, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
-import { ensureManualProductDiscountList } from "../../modules/Order/utils/manualProductDiscount";
+import { ensureManualProductDiscountList, hasManualProductDiscountFlag } from "../../modules/Order/utils/manualProductDiscount";
 
 /**
  * 构建金额全为 0 的空 summary。
@@ -643,7 +644,7 @@ export function normalizeOrderProduct(product) {
   });
   var composedOriginalPrice = composeLinePrice({
     mainPrice: mainOriginalStr,
-    bundle: normalizedBundle,
+    bundle: Number(productSku.open_sold_weight) === 1 && hasManualProductDiscountFlag(metadata) ? withOriginalBundleOptionPrices(normalizedBundle) : normalizedBundle,
     useOriginalBundle: true
   });
   var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({

package/lib/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/lib/modules/Order/index.js

@@ -8,6 +8,7 @@ var _BaseModule = require("../BaseModule");
 var _types = require("./types");
 var _utils = require("./utils");
 var _utils2 = require("../Product/utils");
+var _weighedProduct = require("./utils/weighedProduct");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _salesNotes = require("./salesNotes");
 var _paymentUtils = require("./payment-utils");
@@ -667,7 +668,8 @@ class OrderModule extends _BaseModule.BaseModule {
       isFormSubject: product => (0, _utils.resolveIsFormSubject)(tempOrder, product),
       orderTotalAmount: Number(this.store.summary?.total_amount || 0)
     }, {
-      reapplyBookingDiscountProductUids: options?.reapplyBookingDiscountProductUids
+      reapplyBookingDiscountProductUids: options?.reapplyBookingDiscountProductUids,
+      reapplyWeighedDiscountProductUids: options?.reapplyWeighedDiscountProductUids
     });
     if (result?.productList) {
       const previousProductsByUid = (0, _utils.indexOrderProductsByUid)(tempOrder.products);
@@ -3599,7 +3601,7 @@ class OrderModule extends _BaseModule.BaseModule {
       };
     });
   }
-  applyOrderProductUpdateToTempOrder(tempOrder, params) {
+  applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids) {
     const {
       product_id,
       product_variant_id,
@@ -3672,7 +3674,8 @@ class OrderModule extends _BaseModule.BaseModule {
     const previousLineFingerprint = (0, _utils3.buildProductLineFingerprint)((0, _utils.getProductSkuOptions)(targetProduct), targetProduct.product_bundle);
     const nextLineFingerprint = (0, _utils3.buildProductLineFingerprint)((0, _utils.getProductSkuOptions)(nextProduct), nextProduct.product_bundle);
     const callerChangesVariant = Number(product_variant_id || 0) !== Number(targetProduct.product_variant_id || 0);
-    const callerChangesLineConfiguration = callerChangesVariant || previousLineFingerprint !== nextLineFingerprint;
+    const callerChangesWeighing = (0, _weighedProduct.getWeighedProductPriceFingerprint)(targetProduct.product_sku) !== (0, _weighedProduct.getWeighedProductPriceFingerprint)(nextProduct.product_sku);
+    const callerChangesLineConfiguration = callerChangesVariant || callerChangesWeighing || previousLineFingerprint !== nextLineFingerprint;
     const isPersistedOrderLine = targetProduct.order_detail_id !== undefined && targetProduct.order_detail_id !== null;
     const callerChangesDiscountList = Array.isArray(updates?.discount_list) && updates.discount_list.length > 0 && !isSameDiscountList(updates.discount_list, targetProduct.discount_list);
     const callerUpdatesManualPrice = updates?.metadata?.price_override !== undefined || updates?.metadata?.is_manual_discount !== undefined || updates?.metadata?.product_discount_reason !== undefined || callerChangesDiscountList;
@@ -3688,6 +3691,23 @@ class OrderModule extends _BaseModule.BaseModule {
       };
       return hasChangedPrice(updates.selling_price, targetProduct.selling_price) || hasChangedPrice(updates.original_price, targetProduct.original_price);
     })();
+    const weighedSourcePrice = callerChangesWeighing ? (0, _weighedProduct.resolveWeighedSourcePrice)(nextProduct.product_sku) : undefined;
+    const hasResolvedWeighedPrice = weighedSourcePrice !== undefined;
+    if (hasResolvedWeighedPrice && !callerUpdatesSourcePrice) {
+      const nextMainOriginal = new _decimal.default(weighedSourcePrice).plus((0, _utils.sumOptionUnitPrice)((0, _utils.getProductSkuOptions)(nextProduct)));
+      const previousMainOriginal = new _decimal.default(targetProduct.metadata?.main_product_original_price ?? targetProduct.original_price ?? 0);
+      const previousMainSelling = new _decimal.default(targetProduct.metadata?.main_product_selling_price ?? targetProduct.selling_price ?? 0);
+      // A manual final price remains fixed; other legacy discounts keep their amount
+      // until Rules reapplies the currently selected wallet discount below.
+      const nextMainSelling = isManualProductDiscountProduct(nextProduct) ? previousMainSelling : nextMainOriginal.minus(previousMainOriginal.minus(previousMainSelling));
+      nextProduct.metadata = {
+        ...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.default.max(0, nextMainSelling).toFixed(2),
+        price_schema_version: 2
+      };
+    }
     if (isPersistedOrderLine && !callerChangesLineConfiguration && !callerUpdatesManualPrice && !callerAllowsBookingReprice) {
       nextProduct.selling_price = targetProduct.selling_price;
       nextProduct.original_price = targetProduct.original_price;
@@ -3704,17 +3724,17 @@ class OrderModule extends _BaseModule.BaseModule {
       // 新配置只传了 source 时，不能把未传的 main_product_* 从旧行继承下来。
       // 以新 source + 新 option 重建券前价；券后价未显式提供时保留旧主商品折扣额。
       const previousMainOriginal = new _decimal.default(Number(targetProduct.metadata?.main_product_original_price) || 0);
-      const previousMainSelling = new _decimal.default(Number(targetProduct.metadata?.main_product_selling_price) || previousMainOriginal.toNumber());
+      const previousMainSelling = new _decimal.default(Number(targetProduct.metadata?.main_product_selling_price ?? previousMainOriginal.toNumber()));
       const preservedDiscount = previousMainOriginal.minus(previousMainSelling);
       const nextMainOriginal = new _decimal.default(Number(updates.metadata.source_product_price) || 0).plus((0, _utils.sumOptionUnitPrice)((0, _utils.getProductSkuOptions)(nextProduct)));
       nextProduct.metadata = {
         ...(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_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 迁移到新价格。
@@ -3726,7 +3746,7 @@ class OrderModule extends _BaseModule.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) {
+    } else if (callerChangesLineConfiguration && !hasResolvedWeighedPrice && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
       // 仅 option / bundle 变化时，保留历史 source 和主商品折扣金额，
       // 但必须让 original 与 selling 一起随新的 option 金额移动。
       const previousOptionSum = (0, _utils.sumOptionUnitPrice)((0, _utils.getProductSkuOptions)(targetProduct));
@@ -3743,7 +3763,7 @@ class OrderModule extends _BaseModule.BaseModule {
         main_product_selling_price: nextMainOriginal.minus(preservedDiscount).toDecimalPlaces(2).toFixed(2),
         price_schema_version: 2
       };
-    } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+    } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta && !hasResolvedWeighedPrice) {
       const existedMeta = nextProduct.metadata || {};
       nextProduct.metadata = {
         ...existedMeta
@@ -3753,6 +3773,37 @@ class OrderModule extends _BaseModule.BaseModule {
       delete nextProduct.metadata.main_product_original_price;
       delete nextProduct.metadata.price_schema_version;
     }
+    if (callerChangesLineConfiguration && (0, _weighedProduct.resolveWeighedSourcePrice)(nextProduct.product_sku) !== undefined && nextProduct.metadata.main_product_original_price != null && nextProduct.metadata.main_product_selling_price != null && isManualProductDiscountProduct(nextProduct)) {
+      const originalPrice = (0, _utils.composeLinePrice)({
+        mainPrice: nextProduct.metadata.main_product_original_price,
+        bundle: (0, _weighedProduct.withOriginalBundleOptionPrices)(nextProduct.product_bundle),
+        useOriginalBundle: true
+      });
+      const sellingPrice = (0, _utils.composeLinePrice)({
+        mainPrice: nextProduct.metadata.main_product_selling_price,
+        bundle: nextProduct.product_bundle
+      });
+      const previousManualDiscount = (0, _manualProductDiscount.findManualProductDiscountItem)(nextProduct.discount_list);
+      nextProduct.original_price = originalPrice;
+      nextProduct.metadata = {
+        ...nextProduct.metadata,
+        origin: {
+          ...nextProduct.metadata.origin,
+          _extend: {
+            ...nextProduct.metadata.origin?._extend,
+            origin_total: Number(originalPrice)
+          }
+        }
+      };
+      nextProduct.discount_list = (0, _manualProductDiscount.mergeManualProductDiscountIntoList)(nextProduct.discount_list, (0, _manualProductDiscount.buildManualProductDiscountItem)({
+        originTotal: Number(originalPrice),
+        sellingTotal: Number(sellingPrice),
+        quantity: nextProduct.num,
+        message: previousManualDiscount?.discount.message,
+        discountway: previousManualDiscount?.discount.discountway,
+        discount_per: previousManualDiscount?.discount.discount_per
+      }));
+    }
     // normalizeOrderProduct 幂等：v2 metadata 存在 → 保留 main_product_* 折扣重算 composite；
     // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
     let normalizedProduct = this.normalizeVirtualSettlementProductIfEnabled((0, _utils.mergeOrderProductDisplayFields)(nextProduct, (0, _utils3.normalizeOrderProduct)(nextProduct)));
@@ -3790,6 +3841,10 @@ class OrderModule extends _BaseModule.BaseModule {
       };
       tempOrder.bookings = [...(tempOrder.bookings || []), linked.booking];
     }
+    if (callerChangesWeighing && !isManualProductDiscountProduct(normalizedProduct)) {
+      const uid = normalizedProduct.metadata?.unique_identification_number;
+      if (uid) reapplyWeighedDiscountProductUids?.push(String(uid));
+    }
     tempOrder.products[productIndex] = normalizedProduct;
     this.syncTempOrderHolderFromBookings(tempOrder);
     this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], tempOrder.products[productIndex].metadata?.unique_identification_number);
@@ -3797,9 +3852,11 @@ class OrderModule extends _BaseModule.BaseModule {
   }
   async updateOrderProduct(params) {
     const tempOrder = this.ensureTempOrder();
-    const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
+    const reapplyWeighedDiscountProductUids = [];
+    const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
     const promotionPayload = await this.evaluatePromotion();
     this.applyDiscount({
+      reapplyWeighedDiscountProductUids,
       reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : undefined
     });
     this.sanitizeTempOrderProducts(tempOrder);
@@ -3818,8 +3875,9 @@ class OrderModule extends _BaseModule.BaseModule {
     if (!paramsList.length) {
       return tempOrder.products;
     }
+    const reapplyWeighedDiscountProductUids = [];
     const reapplyBookingDiscountProductUids = paramsList.reduce((acc, params) => {
-      const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
+      const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
       // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
       if (params.allow_booking_discount_reapply && updatedProductUid) {
         acc.push(String(updatedProductUid));
@@ -3827,6 +3885,7 @@ class OrderModule extends _BaseModule.BaseModule {
       return acc;
     }, []);
     await this.finalizeAfterProductsMutation(tempOrder, {
+      reapplyWeighedDiscountProductUids,
       reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
     });
     this.logInfo('updateOrderProduct success', {
@@ -3958,7 +4017,8 @@ class OrderModule extends _BaseModule.BaseModule {
     this.syncTempOrderHolderFromBookings(tempOrder);
     const promotionPayload = await this.evaluatePromotion();
     this.applyDiscount({
-      reapplyBookingDiscountProductUids: options?.reapplyBookingDiscountProductUids
+      reapplyBookingDiscountProductUids: options?.reapplyBookingDiscountProductUids,
+      reapplyWeighedDiscountProductUids: options?.reapplyWeighedDiscountProductUids
     });
     this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({

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

@@ -0,0 +1,89 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getWeighedProductPriceFingerprint = getWeighedProductPriceFingerprint;
+exports.resolveWeighedSourcePrice = resolveWeighedSourcePrice;
+exports.withOriginalBundleOptionPrices = withOriginalBundleOptionPrices;
+var _decimal = _interopRequireDefault(require("decimal.js"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const 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 {
+    const result = new _decimal.default(value);
+    return result.isFinite() && result.gte(0) ? result : undefined;
+  } catch {
+    return undefined;
+  }
+}
+function numericKey(value) {
+  return nonNegative(value)?.toString();
+}
+function unitKey(value) {
+  return UNIT_GRAMS[String(value)] || (value == null ? undefined : String(value));
+}
+function snapshotKey(snapshot) {
+  return [numericKey(snapshot?.price), unitKey(snapshot?.unit), numericKey(snapshot?.unit_value ?? 1)];
+}
+
+/** Only pricing/measurement fields participate; display and option data do not. */
+function getWeighedProductPriceFingerprint(sku) {
+  if (Number(sku?.open_sold_weight) !== 1) return 'unweighed';
+  return JSON.stringify([1, numericKey(sku?.net_weight), unitKey(sku?.unit), numericKey(sku?.unit_price), numericKey(sku?.unit_weight ?? 1), snapshotKey(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.
+ */
+function resolveWeighedSourcePrice(sku, weighing) {
+  if (sku?.open_sold_weight != null && Number(sku.open_sold_weight) !== 1) return undefined;
+  if (Number(sku?.open_sold_weight) !== 1 && !weighing) return undefined;
+  const hasSkuMeasurement = sku?.net_weight !== undefined && sku?.net_weight !== null;
+  const measurement = hasSkuMeasurement ? sku : weighing;
+  const netWeight = nonNegative(measurement?.net_weight);
+  if (netWeight === undefined) return undefined;
+  const snapshot = hasSkuMeasurement ? sku?.unit_data_snapshot : weighing?.scalePriceProduct;
+  const snapshotPrice = nonNegative(snapshot?.price);
+  const snapshotUnits = nonNegative(snapshot?.unit_value ?? 1);
+  const sourceGrams = UNIT_GRAMS[String(snapshot?.unit)];
+  const targetGrams = UNIT_GRAMS[String(measurement?.unit)];
+  if (snapshotPrice && 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.
+  const runtimeAmount = nonNegative(weighing?.total_amount);
+  const runtimeMatchesSku = !hasSkuMeasurement || numericKey(weighing?.net_weight) === numericKey(sku?.net_weight) && unitKey(weighing?.unit) === unitKey(sku?.unit) && numericKey(weighing?.unit_price) === numericKey(sku?.unit_price) && numericKey(weighing?.unit_weight ?? 1) === numericKey(sku?.unit_weight ?? 1) && JSON.stringify(snapshotKey(weighing?.scalePriceProduct)) === JSON.stringify(snapshotKey(sku?.unit_data_snapshot));
+  if (runtimeAmount && runtimeMatchesSku) return runtimeAmount.toFixed(2);
+
+  // Older persisted orders have only a rounded per-scale-unit price.
+  const unitPrice = nonNegative(measurement?.unit_price);
+  const unitWeight = nonNegative(measurement?.unit_weight ?? 1);
+  if (!unitPrice || !unitWeight?.gt(0)) return undefined;
+  return netWeight.div(unitWeight).mul(unitPrice).toFixed(2);
+}
+
+/** Original bundle totals must use the nested options before manual distribution. */
+function withOriginalBundleOptionPrices(bundles) {
+  return bundles?.map(bundle => ({
+    ...bundle,
+    option: bundle.option?.map(option => ({
+      ...option,
+      add_price: option.original_price ?? option.add_price ?? option.price
+    }))
+  }));
+}

package/lib/modules/Order/utils.js

@@ -126,11 +126,12 @@ Object.defineProperty(exports, "syncManualProductDiscountProductNum", {
 });
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
+var _weighedProduct = require("./utils/weighedProduct");
+var _manualProductDiscount = require("./utils/manualProductDiscount");
 var _utils = require("../Holder/utils");
 var _utils2 = require("../../solution/ScanOrder/utils");
 var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
 var _salesNotes = require("./salesNotes");
-var _manualProductDiscount = require("./utils/manualProductDiscount");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const POINT_CARD_SNAPSHOT_TAG = 'point_card';
 function isPlainObject(value) {
@@ -773,7 +774,7 @@ function createDefaultOrderRulesHooks() {
       });
       const composedOriginalPrice = composeLinePrice({
         mainPrice: nextMainOriginalPrice,
-        bundle: nextBundle,
+        bundle: Number(product.product_sku?.open_sold_weight) === 1 && (0, _manualProductDiscount.hasManualProductDiscountFlag)(metadataAny) ? (0, _weighedProduct.withOriginalBundleOptionPrices)(nextBundle) : nextBundle,
         useOriginalBundle: true
       });
       const finalOriginalPrice = resolveManualOverrideLineOriginalPrice({