fix 字段翻译问题

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/OrderDetailRes.java

@@ -84,6 +84,7 @@ public class OrderDetailRes implements Serializable {
      * 提货方式label
      */
     private String pickupTypeLabel;
+    private String payWayLabel;
 
     /**
      * 交付类型（签发交付、签收交付）

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/OrderListResVO.java

@@ -10,7 +10,6 @@ import lombok.experimental.Accessors;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @desc: 订单列表响应参数
@@ -169,33 +168,27 @@ public class OrderListResVO {
      */
     private String projectName;
 
-    /**
-     * 装货地址信息
-     */
-    private List<LoadAddressResVO> loadAddresses;
-    /**
-     * 卸货地址信息
-     */
-    private List<UnloadAddressResVO> unloadAddresses;
     /**
      * 装货地点名称
      */
-    private List<String> loadName;
+    private String loadName;
 
     /**
      * 装货地点
      */
-    private List<String> loadAddress;
+    private String loadAddress;
 
     /**
      * 卸货地点点名称
      */
-    private List<String> unloadName;
+    private String unloadName;
 
     /**
      * 卸货地点
      */
-    private List<String> unloadAddress;
+    private String unloadAddress;
+    private String unloadContact;
+    private String unloadContactPhone;
 
     /**
      * 计划开始时间

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

@@ -683,7 +683,7 @@ public class KwoTradeOrderService {
         Map<String, String> orderUnitMap, orderAddressMap, addressMap;
         if (CollUtil.isNotEmpty(dict)) {
             tradeMap = dict.get(DictTypeEnum.TRADE_TYPE.getType());
-            pickupMap = dict.get(DictTypeEnum.PICKUP_TYPE.getType());
+            pickupMap = dict.get(DictTypeEnum.CONSIGNMENT_WAY.getType());
             deleveryMap = dict.get(DictTypeEnum.DELIVERY_TYPE.getType());
             sourceMap = dict.get(DictTypeEnum.TORDER_SOURCE.getType());
             statusMap = dict.get(DictTypeEnum.TORDER_STATUS.getType());
@@ -1571,13 +1571,13 @@ public class KwoTradeOrderService {
         Map<Long, UserCacheResDto> userMap = remoteSystemService.queryUserCacheMapByIds(createByIds);
         Map<Long, KwpGoods> goodsMap = goodsInfoService.getGoodsByIds(goodIdList);
         Map<Long, ContractCommonInfoResDto> contractMap = remoteContractService.queryContractBaseInfo(contracIdList);
-        Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.TORDER_STATUS.getType(), DictTypeEnum.TRADE_TYPE.getType(), DictTypeEnum.DELIVERY_TYPE.getType(), DictTypeEnum.PICKUP_TYPE.getType(), DictTypeEnum.TORDER_SOURCE.getType()));
+        Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.TORDER_STATUS.getType(), DictTypeEnum.TRADE_TYPE.getType(), DictTypeEnum.SETTLEMENT_WAY.getType(), DictTypeEnum.CONSIGNMENT_WAY.getType(), DictTypeEnum.TORDER_SOURCE.getType()));
         Map<String, SysDictResDto> unitType = remoteSystemService.queryDictMapByType(DictTypeEnum.UNIT_TYPE.getType());
         Map<String, String> tradeMap, deliveryMap, pickupMap, sourceMap;
         if (CollUtil.isNotEmpty(dict)) {
             tradeMap = CollUtil.isNotEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ? dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
-            deliveryMap = CollUtil.isNotEmpty(dict.get(DictTypeEnum.DELIVERY_TYPE.getType())) ? dict.get(DictTypeEnum.DELIVERY_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
-            pickupMap = CollUtil.isNotEmpty(dict.get(DictTypeEnum.PICKUP_TYPE.getType())) ? dict.get(DictTypeEnum.PICKUP_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            deliveryMap = CollUtil.isNotEmpty(dict.get(DictTypeEnum.SETTLEMENT_WAY.getType())) ? dict.get(DictTypeEnum.SETTLEMENT_WAY.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            pickupMap = CollUtil.isNotEmpty(dict.get(DictTypeEnum.CONSIGNMENT_WAY.getType())) ? dict.get(DictTypeEnum.CONSIGNMENT_WAY.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             sourceMap = CollUtil.isNotEmpty(dict.get(DictTypeEnum.TORDER_SOURCE.getType())) ? dict.get(DictTypeEnum.TORDER_SOURCE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
@@ -1591,14 +1591,9 @@ public class KwoTradeOrderService {
             List<KwoTradeOrderAddress> loadAddresses = kwoTradeOrderAddressService.findByAddress(e.getTOrderId(), AddressTypeEnum.SHIPMENT.getCode());
             //卸货地址
             List<KwoTradeOrderAddress> unloadAddresses = kwoTradeOrderAddressService.findByAddress(e.getTOrderId(), AddressTypeEnum.TAKE.getCode());
-            //装货地点名称
-            List<String> loadName = loadAddresses.stream().map(KwoTradeOrderAddress::getName).toList();
-            //装货地点
-            List<String> loadAddress = loadAddresses.stream().map(item -> item.getCityName() + " " + item.getDetailAddress()).toList();
+            Optional<KwoTradeOrderAddress> loadAddress = loadAddresses.stream().findFirst();
             //卸货地点点名称
-            List<String> unloadName = unloadAddresses.stream().map(KwoTradeOrderAddress::getName).toList();
-            //卸货地点
-            List<String> unloadAddress = unloadAddresses.stream().map(item -> item.getCityName() + " " + item.getDetailAddress()).toList();
+            Optional<KwoTradeOrderAddress> unloadAddress = unloadAddresses.stream().findFirst();
 
             BigDecimal actualAmount = Objects.isNull(e.getActualAmount()) ? BigDecimal.ZERO : e.getActualAmount();
             BigDecimal unitPrice = Objects.isNull(e.getUnitPrice()) ? BigDecimal.ZERO : e.getUnitPrice();
@@ -1631,8 +1626,18 @@ public class KwoTradeOrderService {
                     .setEntrustAmount(setScale(e.getEntrustAmount()))
                     .setActualAmount(setScale(e.getActualAmount()))
                     .setCreateByName(Objects.isNull(userCache) ? null : userCache.getName())
-                    .setLoadName(loadName).setLoadAddress(loadAddress)
-                    .setUnloadName(unloadName).setUnloadAddress(unloadAddress);
+            ;
+            loadAddress.ifPresent(d -> {
+                vo.setLoadName(d.getName());
+                vo.setLoadAddress(d.getCityName() + " " + d.getDetailAddress());
+
+            });
+            unloadAddress.ifPresent(d -> {
+                vo.setUnloadName(d.getName());
+                vo.setUnloadAddress(d.getCityName() + " " + d.getDetailAddress());
+                vo.setUnloadContact(d.getContacts());
+                vo.setUnloadContactPhone(d.getPhone());
+            });
             result.add(vo);
         });
         return PageHelperUtil.getPageResult(new PageInfo<>(result), list, pageSize);