update 修改运单装卸地址查询接口

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -20,6 +20,7 @@ import com.sckw.report.service.param.WaybillOrderQuery;
 import com.sckw.report.service.vo.CarWaybillVo;
 import com.sckw.report.service.vo.WaybillsCountVo;
 import com.sckw.system.api.RemoteSystemService;
+import com.sckw.system.api.model.dto.res.AreaTreeFrontResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.transport.api.dubbo.TransportDubboService;
 import com.sckw.transport.api.model.dto.vo.KwtLogisticsOrderVO;
@@ -512,9 +513,10 @@ public class KwTransportService {
             field = "unloadCityCode";
         }
         List<Integer> list  = mongoTemplate.findDistinct(query, field ,SckwWaybillOrder.class, Integer.class);
+        List<AreaTreeFrontResDto> areaTreeFrontResDtos = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list)) {
-            // RPC 请求数据 获取多级结构信息
+            areaTreeFrontResDtos = remoteSystemService.queryAreaTreeFrontByCodeList(list);
         }
-        return HttpResult.ok(list);
+        return HttpResult.ok(areaTreeFrontResDtos);
     }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -105,8 +105,8 @@ public class WaybillManagementService {
             wayBillDetailDTO.setEndTime(DateUtil.getDateTime(info.getEndTime()));
             wayBillDetailDTO.setCreateBy(info.getCreateByName());
             wayBillDetailDTO.setGoodsName(info.getGoodsName());
-            wayBillDetailDTO.setLoadDetailAddress(info.getLoadDetailAddress());
-            wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadDetailAddress());
+            wayBillDetailDTO.setLoadDetailAddress(info.getLoadCityName().concat(info.getLoadDetailAddress()));
+            wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadCityName().concat(info.getUnloadDetailAddress()));
             // 计价方式
             KwtLogisticsOrder kwtLogisticsOrder = kwtLogisticsOrderMapper.selectById(info.getLOrderId());
             if(!ObjectUtils.isEmpty(kwtLogisticsOrder)) {