提交 05b181b5 authored 作者: huyufan's avatar huyufan

Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into v5.7_break_contract_reverse_20231020
...@@ -358,7 +358,7 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe ...@@ -358,7 +358,7 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe
BigDecimal deliveredWeight = BigDecimal.ZERO;//已拉运的重量 BigDecimal deliveredWeight = BigDecimal.ZERO;//已拉运的重量
BigDecimal deliveredFreight = BigDecimal.ZERO;//已拉运的费用 BigDecimal deliveredFreight = BigDecimal.ZERO;//已拉运的费用
for(OrderChild orderChild : orderChilds){ for(OrderChild orderChild : orderChilds){
if(orderChild.getLoadNet() != null){ if(orderChild.getLoadNet() == null){
deliveredWeight = deliveredWeight.add(orderChild.getWeight()) ; deliveredWeight = deliveredWeight.add(orderChild.getWeight()) ;
deliveredFreight = deliveredFreight.add(orderChild.getOrderFreightPrice().multiply(orderChild.getWeight())); deliveredFreight = deliveredFreight.add(orderChild.getOrderFreightPrice().multiply(orderChild.getWeight()));
}else{ }else{
...@@ -461,7 +461,7 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe ...@@ -461,7 +461,7 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe
BigDecimal deliveredFreight = BigDecimal.ZERO;//已拉运的费用 BigDecimal deliveredFreight = BigDecimal.ZERO;//已拉运的费用
BigDecimal seconds = BigDecimal.ZERO;//总毫秒数 BigDecimal seconds = BigDecimal.ZERO;//总毫秒数
for(OrderChild orderChild : orderChilds){ for(OrderChild orderChild : orderChilds){
if(orderChild.getLoadNet() != null){ if(orderChild.getLoadNet() == null){
deliveredWeight = deliveredWeight.add(orderChild.getWeight()) ; deliveredWeight = deliveredWeight.add(orderChild.getWeight()) ;
deliveredFreight = deliveredFreight.add(orderChild.getOrderFreightPrice().multiply(orderChild.getWeight())); deliveredFreight = deliveredFreight.add(orderChild.getOrderFreightPrice().multiply(orderChild.getWeight()));
}else{ }else{
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论