提交 fedec30a authored 作者: 李瑞鑫's avatar 李瑞鑫

Merge branch 'v22.7_order_delay_20240827' into test

......@@ -44,9 +44,11 @@ public class OrderWeightServiceImpl implements OrderWeightService {
List<OrderGoods> orderGoodsList = orderGoodsDao.listByField(OrderGoods::getOrderNo, orderNo);
if(CollectionUtils.isEmpty(orderGoodsList)){
BigDecimal canExtractWeight = Objects.nonNull(orderInfo.getPlatformCarryWeight())?
BigDecimal canExtractWeight = Objects.nonNull(orderInfo.getPlatformCarryWeight())
&& orderInfo.getPlatformCarryWeight().compareTo(BigDecimal.ZERO) >0?
orderInfo.getPlatformCarryWeight():BigDecimal.ZERO.add(
Objects.nonNull(orderInfo.getOwnCarryWeight())?
Objects.nonNull(orderInfo.getOwnCarryWeight())
&& orderInfo.getOwnCarryWeight().compareTo(BigDecimal.ZERO) >0?
orderInfo.getOwnCarryWeight():BigDecimal.ZERO);
return OrderExtractWeightVO.builder().transportWeight(orderInfo.getTransportWeight())
.truckDemand(orderInfo.getTruckDemand())
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论