销售订单地址名称和明细修改

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -1600,8 +1600,6 @@ public class KwoTradeOrderService {
         TradeOrderListSelectDTO dto = buildSelectParam(params);
         PageHelper.startPage(params.getPage(), params.getPageSize());
         List<OrderListResDTO> list = kwoTradeOrderMapper.tradeOrderSelect(dto, dto.getGoodIds(), LoginUserHolder.getAuthUserIdList(), null);
-
-
         return buildResult(list, params.getPageSize());
 
     }
@@ -1660,13 +1658,14 @@ public class KwoTradeOrderService {
             //卸货地址
             List<KwoTradeOrderAddress> unloadAddresses = kwoTradeOrderAddressService.findByAddress(e.getTOrderId(), AddressTypeEnum.TAKE.getCode());
             //装货地点名称
-            List<String> loadName = loadAddresses.stream().map(KwoTradeOrderAddress::getCityName).toList();
+            List<String> loadName = loadAddresses.stream().map(KwoTradeOrderAddress::getName).toList();
             //装货地点
-            List<String> loadAddress = loadAddresses.stream().map(KwoTradeOrderAddress::getDetailAddress).toList();
+            List<String> loadAddress = loadAddresses.stream().map(item -> item.getCityName() + " " + item.getDetailAddress()).toList();
             //卸货地点点名称
-            List<String> unloadName = unloadAddresses.stream().map(KwoTradeOrderAddress::getCityName).toList();
+            List<String> unloadName = unloadAddresses.stream().map(KwoTradeOrderAddress::getName).toList();
             //卸货地点
-            List<String> unloadAddress = unloadAddresses.stream().map(KwoTradeOrderAddress::getDetailAddress).toList();
+            List<String> unloadAddress = unloadAddresses.stream().map(item -> item.getCityName() + " " + item.getDetailAddress()).toList();
+
             BigDecimal actualAmount = Objects.isNull(e.getActualAmount()) ? BigDecimal.ZERO : e.getActualAmount();
             BigDecimal unitPrice = Objects.isNull(e.getUnitPrice()) ? BigDecimal.ZERO : e.getUnitPrice();
             KwpGoods goods = goodsMap.get(e.getGoodsId());