|
|
@@ -3711,11 +3711,11 @@ public class KwtLogisticsConsignmentService {
|
|
|
LogisticsOrderDetailResp.LoadingInfoVO loadingInfoVO = new LogisticsOrderDetailResp.LoadingInfoVO();
|
|
|
KwtLogisticsOrderAddress loadAdd = logOrderIdAndUnitTypeKeyAndAddressMap.getOrDefault(logisticsOrder.getId() + "-" + AddressTypeEnum.SHIPMENT.getCode(),
|
|
|
new KwtLogisticsOrderAddress());
|
|
|
- loadingInfoVO.setLoadAddress(loadAdd.getCityName() + loadAdd.getDetailAddress());
|
|
|
+ loadingInfoVO.setLoadAddress("(" + loadAdd.getName() + ")" + loadAdd.getCityName() + loadAdd.getDetailAddress());
|
|
|
KwtLogisticsOrderAddress unloadAdd =
|
|
|
logOrderIdAndUnitTypeKeyAndAddressMap.getOrDefault(logisticsOrder.getId() + "-" + AddressTypeEnum.TAKE.getCode(),
|
|
|
new KwtLogisticsOrderAddress());
|
|
|
- loadingInfoVO.setUnloadAddress(unloadAdd.getCityName() + unloadAdd.getDetailAddress());
|
|
|
+ loadingInfoVO.setUnloadAddress("(" + unloadAdd.getName() + ")" + unloadAdd.getCityName() + unloadAdd.getDetailAddress());
|
|
|
loadingInfoVO.setUnloadContacts(unloadAdd.getContacts());
|
|
|
loadingInfoVO.setUnloadPhone(unloadAdd.getPhone());
|
|
|
loadingInfoVO.setReferenceDistance(logisticsOrder.getDistance());
|