违约结算单金额计算

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementOwnerServiceImpl.java

@@ -346,33 +346,10 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
             figure = totalFreight.multiply(reduceRule.getBeforeRatio()).multiply(param.getWeight())
                     .divide(param.getTransportWeight(),2, BigDecimal.ROUND_HALF_UP);
         }else{
+            BigDecimal totalFreight = param.getTransportWeight().multiply(param.getValidFreightPrice());
+            figure = totalFreight.multiply(reduceRule.getAfterRatio()).multiply(param.getWeight())
+                    .divide(param.getTransportWeight(),2, BigDecimal.ROUND_HALF_UP);
 
-            List<OrderChild> orderChilds = orderChildDao.listOrderChildByOrderNoAndStatus(param.getOrderNo(), statusList);
-
-            if(CollectionUtils.isEmpty(orderChilds)){
-                BigDecimal totalFreight = param.getTransportWeight().multiply(param.getValidFreightPrice());
-                figure = totalFreight.multiply(reduceRule.getAfterRatio()).multiply(param.getWeight())
-                        .divide(param.getTransportWeight(),2, BigDecimal.ROUND_HALF_UP);
-            }else{
-
-                BigDecimal deliveredWeight = BigDecimal.ZERO;//已拉运的重量
-                BigDecimal deliveredFreight = BigDecimal.ZERO;//已拉运的费用
-                for(OrderChild orderChild : orderChilds){
-                    if(orderChild.getLoadNet() != null){
-                        deliveredWeight = deliveredWeight.add(orderChild.getWeight()) ;
-                        deliveredFreight = deliveredFreight.add(orderChild.getOrderFreightPrice().multiply(orderChild.getWeight()));
-                    }else{
-                        deliveredWeight = deliveredWeight.add(orderChild.getLoadNet()) ;
-                        deliveredFreight = deliveredFreight.add(orderChild.getOrderFreightPrice().multiply(orderChild.getLoadNet()));
-                    }
-
-                }
-                BigDecimal noTransitWeight = param.getTransportWeight().subtract(deliveredWeight);//未拉运的重量
-                BigDecimal noTransitFreight = noTransitWeight.multiply(param.getValidFreightPrice());//未拉运的费用
-                BigDecimal totalFreight = deliveredFreight.add(noTransitFreight);
-                figure = totalFreight.multiply(reduceRule.getAfterRatio()).multiply(param.getWeight())
-                        .divide(param.getTransportWeight(),2, BigDecimal.ROUND_HALF_UP);
-            }
         }
 
         //组装参数 生成违约记录 违约计费  违约结算单