Skip to content

J
jiedao-api-boot-master
Commit fec004c1 authored by zhangfeng's avatar zhangfeng
Browse files
Options

Merge remote-tracking branch 'origin/release' into release

parents 52253457 2a6fed5c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java
View file @ fec004c1
...@@ -5051,8 +5051,8 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements ...@@ -5051,8 +5051,8 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
orderQueryService.getOrderList(orderIds); orderQueryService.getOrderList(orderIds);
Map<Long, OrderDO> orderMap = orderList.stream() Map<Long, OrderDO> orderMap = orderList.stream()
.collect(Collectors.toMap(OrderDO::getOrderId, v -> v)); .collect(Collectors.toMap(OrderDO::getOrderId, v -> v));
Boolean freightMarkUp = vo.getFreightFee().compareTo(BigDecimal.ZERO) > 0; Boolean freightMarkUp = Objects.nonNull(vo.getFreightFee()) && vo.getFreightFee().compareTo(BigDecimal.ZERO) > 0;
Boolean clearanceMarkUp = vo.getClearanceFee().compareTo(BigDecimal.ZERO) > 0; Boolean clearanceMarkUp = Objects.nonNull(vo.getClearanceFee()) && vo.getClearanceFee().compareTo(BigDecimal.ZERO) > 0;
List<String> payOrderNoList = new ArrayList<>(); List<String> payOrderNoList = new ArrayList<>();
List<ReceivableDO> newReceivableList = new ArrayList<>(); List<ReceivableDO> newReceivableList = new ArrayList<>();
if (CollectionUtil.isNotEmpty(receivableList)) { if (CollectionUtil.isNotEmpty(receivableList)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment