1

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/RemoteContractService.java

@@ -109,6 +109,7 @@ public interface RemoteContractService {
     KwcContractLogisticsDto queryContractByContractId(Long contractId);
 
     List<TradeContractUnitDto> queryContractUnitByContractId(Long contractId);
+    List<TradeContractUnitDto> queryLogContractUnitByContractId(Long contractId);
 
     /**
      * 查询自动派车的物流合同信息List

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.google.common.collect.Sets;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.contract.api.model.dto.req.ContractAuditPara;
-import com.sckw.contract.api.model.dto.req.TradeEntListQueryFeignDto;
 import com.sckw.contract.api.model.dto.res.*;
 import com.sckw.contract.api.model.vo.*;
 import com.sckw.contract.dao.*;
@@ -357,6 +356,24 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         }).collect(Collectors.toList());
     }
 
+    @Override
+    public List<TradeContractUnitDto> queryLogContractUnitByContractId(Long contractId) {
+        List<KwcContractLogisticsUnit> kwcContractLogisticsUnits = kwcContractLogisticsUnitRepository.queryByContractId(contractId);
+        if(CollUtil.isEmpty(kwcContractLogisticsUnits)){
+            return new ArrayList<>();
+        }
+        return kwcContractLogisticsUnits.stream().map(unit -> {
+            TradeContractUnitDto tradeContractUnitDto = new TradeContractUnitDto();
+            tradeContractUnitDto.setUnitType(String.valueOf(unit.getUnitType()));
+            tradeContractUnitDto.setEntId(unit.getEntId());
+            tradeContractUnitDto.setFirmName(unit.getFirmName());
+            tradeContractUnitDto.setContactsId(unit.getContractId());
+            tradeContractUnitDto.setContacts(unit.getContacts());
+            tradeContractUnitDto.setPhone(unit.getPhone());
+            return tradeContractUnitDto;
+        }).collect(Collectors.toList());
+    }
+
 
     private ContractCommonInfoResDto fillContractLogistics(KwcContractLogistics kwcContractLogistics) {
         ContractCommonInfoResDto contractCommonInfoResDto = new ContractCommonInfoResDto();

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

@@ -2,6 +2,7 @@ package com.sckw.transport.service;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,6 +16,7 @@ import com.google.common.collect.Sets;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.contract.api.model.dto.res.ContractCommonInfoResDto;
 import com.sckw.contract.api.model.vo.KwcContractLogisticsDto;
+import com.sckw.contract.api.model.vo.TradeContractUnitDto;
 import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
@@ -2638,17 +2640,25 @@ public class KwtLogisticsConsignmentService {
         addLogisticOrderDTO.setTradeOrderId(null);
         addLogisticOrderDTO.setTradeOrderNo("");
 
-        addLogisticOrderDTO.setNonConsignCompany("");
-        addLogisticOrderDTO.setNonConsignCompanyId(null);
-        addLogisticOrderDTO.setNonConsignContactPhone("");
-        addLogisticOrderDTO.setNonConsignContacts("");
-        addLogisticOrderDTO.setNonConsignContactsId(null);
-        //todo
-        addLogisticOrderDTO.setConsignCompany("");
-        addLogisticOrderDTO.setConsignCompanyId(null);
-        addLogisticOrderDTO.setConsignContactPhone("");
-        addLogisticOrderDTO.setConsignContacts("");
-        addLogisticOrderDTO.setConsignContactsId(null);
+        Long contractId = logisticsContractList.get(0).getContractId();
+        List<TradeContractUnitDto> tradeContractUnitDtos = contractService.queryLogContractUnitByContractId(contractId);
+        for (TradeContractUnitDto tradeContractUnitDto : tradeContractUnitDtos) {
+            if(StrUtil.equals(tradeContractUnitDto.getUnitType(),"3")){
+                addLogisticOrderDTO.setConsignCompany(tradeContractUnitDto.getFirmName());
+                addLogisticOrderDTO.setConsignCompanyId(tradeContractUnitDto.getEntId());
+                addLogisticOrderDTO.setConsignContactPhone(tradeContractUnitDto.getPhone());
+                addLogisticOrderDTO.setConsignContacts(tradeContractUnitDto.getContacts());
+                addLogisticOrderDTO.setConsignContactsId(tradeContractUnitDto.getContactsId());
+            }else  if(StrUtil.equals(tradeContractUnitDto.getUnitType(),"4")){
+
+                addLogisticOrderDTO.setNonConsignCompany(tradeContractUnitDto.getFirmName());
+                addLogisticOrderDTO.setNonConsignCompanyId(tradeContractUnitDto.getEntId());
+                addLogisticOrderDTO.setNonConsignContactPhone(tradeContractUnitDto.getPhone());
+                addLogisticOrderDTO.setNonConsignContacts(tradeContractUnitDto.getContacts());
+                addLogisticOrderDTO.setNonConsignContactsId(tradeContractUnitDto.getContactsId());
+            }
+        }
+
 
         KwpGoods kwpGoods = null;
         if (Objects.nonNull(goodsId)) {