去掉三边之和规则

This commit is contained in:
wuweihua
2026-10-23 17:49:52 +08:00
parent 2bb562372e
commit 4bee108661
@@ -200,15 +200,16 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
PrcOrderBill existed = orderBillMapper.selectPrcOrderBillByOrderNo(request.getOrderNo()); PrcOrderBill existed = orderBillMapper.selectPrcOrderBillByOrderNo(request.getOrderNo());
BigDecimal systemWeight = request.getWeight(); BigDecimal systemWeight = request.getWeight();
BigDecimal calcWeight = resolveCalcWeight(existed, systemWeight); BigDecimal calcWeight = resolveCalcWeight(existed, systemWeight);
// Three-side sum rule disabled: upstream already applies it.
// Manual charge_weight wins; otherwise apply active biz rules (e.g. three-side). // Manual charge_weight wins; otherwise apply active biz rules (e.g. three-side).
if (!isManualChargeWeight(existed)) // if (!isManualChargeWeight(existed))
{ // {
BigDecimal ruled = bizRuleService.resolveWeightByRule(request, systemWeight); // BigDecimal ruled = bizRuleService.resolveWeightByRule(request, systemWeight);
if (ruled != null) // if (ruled != null)
{ // {
calcWeight = ruled; // calcWeight = ruled;
} // }
} // }
request.setWeight(calcWeight); request.setWeight(calcWeight);
TmsPriceQuoteResult result = tmsPriceQuoteService.calculate(request); TmsPriceQuoteResult result = tmsPriceQuoteService.calculate(request);
persistBill(request, systemWeight, bizDate, result); persistBill(request, systemWeight, bizDate, result);