|
@@ -3200,7 +3200,10 @@ public class KwtLogisticsConsignmentService {
|
|
|
OrderDetailVo orderDetailVo = tradeIdAndOrderDetailVoMap.getOrDefault(kwtLogisticsOrder.getTOrderId(), new OrderDetailVo());
|
|
OrderDetailVo orderDetailVo = tradeIdAndOrderDetailVoMap.getOrDefault(kwtLogisticsOrder.getTOrderId(), new OrderDetailVo());
|
|
|
logisticsOrderResp.setAmount((Objects.nonNull(orderDetailVo.getAmount()) ?
|
|
logisticsOrderResp.setAmount((Objects.nonNull(orderDetailVo.getAmount()) ?
|
|
|
orderDetailVo.getAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00") + kwtLogisticsOrder.getUnit());
|
|
orderDetailVo.getAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00") + kwtLogisticsOrder.getUnit());
|
|
|
-
|
|
|
|
|
|
|
+ if (Objects.equals(kwtLogisticsOrder.getOrderType(),1)){
|
|
|
|
|
+ logisticsOrderResp.setAmount((Objects.nonNull(kwtLogisticsOrder.getAmount()) ?
|
|
|
|
|
+ kwtLogisticsOrder.getAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00") + kwtLogisticsOrder.getUnit());
|
|
|
|
|
+ }
|
|
|
BigDecimal expectedTransportPrice =
|
|
BigDecimal expectedTransportPrice =
|
|
|
Objects.nonNull(kwtLogisticsOrder.getPrice()) && Objects.nonNull(orderDetailVo.getAmount()) ?
|
|
Objects.nonNull(kwtLogisticsOrder.getPrice()) && Objects.nonNull(orderDetailVo.getAmount()) ?
|
|
|
kwtLogisticsOrder.getPrice().multiply(orderDetailVo.getAmount()) : BigDecimal.ZERO;
|
|
kwtLogisticsOrder.getPrice().multiply(orderDetailVo.getAmount()) : BigDecimal.ZERO;
|