大屏逻辑

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -3635,7 +3635,7 @@ public class KwtLogisticsConsignmentService {
                     BigDecimal.ZERO;
             performanceInfoVO.setLoadAmount(loadAmount.setScale(2, RoundingMode.HALF_UP).toPlainString() + "吨");
             performanceInfoVO.setUnloadAmount(unloadAmount.setScale(2, RoundingMode.HALF_UP).toPlainString() + "吨");
-            BigDecimal surplusAmount = orderAmount1.subtract(orderAmount.add(unloadAmount)).compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO : tradeAmount.subtract(orderAmount.add(unloadAmount));
+            BigDecimal surplusAmount = orderAmount1.subtract(orderAmount.add(unloadAmount)).compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO : orderAmount1.subtract(orderAmount.add(unloadAmount));
             performanceInfoVO.setSurplusAmount(surplusAmount.setScale(2, RoundingMode.HALF_UP).toPlainString() + "吨");
         }else {
             log.info("物流单类型不为1,普通物流");
@@ -3735,7 +3735,14 @@ public class KwtLogisticsConsignmentService {
             priceUnit = kwpGoods.getPriceUnit();
         }
         goodsInfoVO.setUnitPrice((Objects.nonNull(logisticsOrder.getPrice()) ? logisticsOrder.getPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00") + "元");
-        goodsInfoVO.setOrderAmount((Objects.nonNull(orderDetailVo.getAmount()) ? orderDetailVo.getAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00") + logisticsOrder.getUnit());
+        if (Objects.equals(logisticsOrder.getOrderType(), 1)){
+            log.info("物流单类型为1,原矿转运，设置订单总量");
+            goodsInfoVO.setOrderAmount((Objects.nonNull(logisticsOrder.getAmount()) ? logisticsOrder.getAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00") + "吨");
+        }else {
+            log.info("物流单类型不为1,普通物流，设置订单总量");
+            goodsInfoVO.setOrderAmount((Objects.nonNull(orderDetailVo.getAmount()) ? orderDetailVo.getAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00") + logisticsOrder.getUnit());
+        }
+
         BigDecimal carriageCost = Objects.nonNull(orderDetailVo.getAmount()) && Objects.nonNull(logisticsOrder.getPrice()) ?
                 orderDetailVo.getAmount().multiply(logisticsOrder.getPrice()) : BigDecimal.ZERO;
         goodsInfoVO.setCarriageCost(carriageCost.setScale(2, RoundingMode.HALF_UP).toPlainString() + priceUnit);