|
|
@@ -747,12 +747,12 @@ public class WaybillOrderService {
|
|
|
|
|
|
//装货地址
|
|
|
KwtLogisticsOrderAddress shipmentAddress = logOrderIdAndAddressMap.getOrDefault(wbOrder.getLOrderId() + "-" + AddressTypeEnum.SHIPMENT.getCode(), new KwtLogisticsOrderAddress());
|
|
|
- wbOrderResp.setLoadAddress(shipmentAddress.getDetailAddress());
|
|
|
+ wbOrderResp.setLoadAddress(shipmentAddress.getCityName()+shipmentAddress.getDetailAddress());
|
|
|
wbOrderResp.setLoadLng(shipmentAddress.getLng());
|
|
|
wbOrderResp.setLoadLat(shipmentAddress.getLat());
|
|
|
//卸货地址
|
|
|
KwtLogisticsOrderAddress takeAddress = logOrderIdAndAddressMap.getOrDefault(wbOrder.getLOrderId() + "-" + AddressTypeEnum.TAKE.getCode(), new KwtLogisticsOrderAddress());
|
|
|
- wbOrderResp.setUnloadAddress(takeAddress.getDetailAddress());
|
|
|
+ wbOrderResp.setUnloadAddress(takeAddress.getCityName()+takeAddress.getDetailAddress());
|
|
|
wbOrderResp.setUnloadLng(takeAddress.getLng());
|
|
|
wbOrderResp.setUnloadLat(takeAddress.getLat());
|
|
|
//装卸地之间距离
|