Selaa lähdekoodia

订单详情金额计费修改为使用total装卸货计算

lengfaqiang 2 vuotta sitten
vanhempi
commit
71c2fc922e

+ 2 - 2
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/TransportCommonService.java

@@ -306,8 +306,8 @@ public class TransportCommonService {
             /**亏吨量/吨->装货量-卸货量
              扣亏量/吨->亏吨量-合理损耗值
              扣亏量/吨->亏吨量-合理损耗值(装货量*合理损耗)*/
-            BigDecimal loadAmount = logisticsOrder.getLoadAmount() == null ? new BigDecimal("0.00") : logisticsOrder.getLoadAmount();
-            BigDecimal unloadAmount = logisticsOrder.getUnloadAmount() == null ? new BigDecimal("0.00") : logisticsOrder.getUnloadAmount();
+            BigDecimal loadAmount = logisticsOrder.getTotalLoadAmount() == null ? new BigDecimal("0.00") : logisticsOrder.getTotalLoadAmount();
+            BigDecimal unloadAmount = logisticsOrder.getTotalUnloadAmount() == null ? new BigDecimal("0.00") : logisticsOrder.getTotalUnloadAmount();
             //运价
             BigDecimal price = logisticsOrder.getPrice() == null ? new BigDecimal("0.00") : logisticsOrder.getPrice();
             //亏吨量