运费计算公式修改

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -64,6 +64,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
 
                 .set(OrderChild::getUnloadTime, item.getUnloadTime())
                 .set(OrderChild::getPoundStatus, item.getPoundStatus())
+                .set(OrderChild::getWeight, item.getWeight())
                 .set(OrderChild::getFreight, item.getFreight())
                 .set(OrderChild::getStatus, item.getStatus())
         );

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

@@ -156,25 +156,17 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
      * 运单拉运吨数计算
      */
     public BigDecimal orderChildWeightCalc(OrderChild orderChild){
-        if (orderChild.getUnloadNet() != null) {
             return orderChild.getUnloadNet().compareTo(orderChild.getLoadNet()) < 0? orderChild.getUnloadNet() : orderChild.getLoadNet();
-        }
-        if (orderChild.getLoadNet() != null) {return orderChild.getLoadNet();}
-
-        return orderChild.getTruckLoad();
     }
 
     /**
      * 运费计算
      */
     public BigDecimal orderChildFreightCalc(OrderChild orderChild){
-        BigDecimal totalFreight = orderChild.getFreightPrice().multiply(orderChild.getWeight());
-        if (orderChild.getUnloadNet() != null){
-            totalFreight = orderChild.getFreightPrice().multiply(orderChild.getUnloadNet().compareTo(orderChild.getLoadNet()) < 0? orderChild.getUnloadNet() : orderChild.getLoadNet());
-            BigDecimal dif = orderChild.getUnloadNet().subtract(orderChild.getWeight());
-            if (dif.compareTo(BigDecimal.ZERO) < 0){
-                totalFreight = totalFreight.add(orderChild.getLossPrice().multiply(dif));
-            }
+        BigDecimal totalFreight = orderChild.getFreightPrice().multiply(orderChild.getUnloadNet().compareTo(orderChild.getLoadNet()) < 0? orderChild.getUnloadNet() : orderChild.getLoadNet());
+        BigDecimal dif = orderChild.getUnloadNet().subtract(orderChild.getLoadNet());
+        if (dif.compareTo(BigDecimal.ZERO) < 0){
+            totalFreight = totalFreight.add(orderChild.getLossPrice().multiply(dif));
         }
 
         return totalFreight.setScale(0, RoundingMode.HALF_UP);