|
|
@@ -1658,14 +1658,14 @@ public class KwoTradeOrderService {
|
|
|
}
|
|
|
List<UnloadAddressDTO> unloadAddresses = e.getUnloadAddresses();
|
|
|
if (CollUtil.isNotEmpty(unloadAddresses)) {
|
|
|
- List<LoadAddressResVO> unloadList = new ArrayList<>();
|
|
|
+ List<UnloadAddressResVO> unloadList = new ArrayList<>();
|
|
|
unloadAddresses.forEach(u -> {
|
|
|
- LoadAddressResVO unload = new LoadAddressResVO();
|
|
|
- unload.setLoadAddressId(u.getUnloadAddressId()).setLoadName(u.getUnloadName())
|
|
|
- .setLoadDetailAddressInfo(u.getUnloadCityName() + u.getUnloadDetailAddress());
|
|
|
+ UnloadAddressResVO unload = new UnloadAddressResVO();
|
|
|
+ unload.setUnloadAddressId(u.getUnloadAddressId()).setUnloadName(u.getUnloadName())
|
|
|
+ .setUnloadDetailAddressInfo(u.getUnloadCityName() + u.getUnloadDetailAddress());
|
|
|
unloadList.add(unload);
|
|
|
});
|
|
|
- vo.setLoadAddresses(unloadList);
|
|
|
+ vo.setUnloadAddresses(unloadList);
|
|
|
}
|
|
|
BigDecimal actualAmount = Objects.isNull(e.getActualAmount()) ? BigDecimal.ZERO : e.getActualAmount();
|
|
|
BigDecimal unitPrice = Objects.isNull(e.getUnitPrice()) ? BigDecimal.ZERO : e.getUnitPrice();
|