|
|
@@ -267,6 +267,7 @@ public class RemoteContractServiceImpl implements RemoteContractService {
|
|
|
|
|
|
@Override
|
|
|
public TradeContractResDto queryTradeContract(Long tradeContractId, Long goodsId) {
|
|
|
+ log.info("查询贸易合同信息,tradeContractId:{}", tradeContractId);
|
|
|
KwcContractTrade kwcContractTrade = kwcContractTradeMapper.selectById(tradeContractId);
|
|
|
if (Objects.nonNull(kwcContractTrade)) {
|
|
|
TradeContractResDto tradeContractResDto = BeanUtils.toBean(kwcContractTrade, TradeContractResDto.class);
|
|
|
@@ -280,10 +281,13 @@ public class RemoteContractServiceImpl implements RemoteContractService {
|
|
|
.eq(KwcContractTradeGoods::getGoodsId, goodsId)
|
|
|
.eq(KwcContractTradeGoods::getDelFlag, 0)
|
|
|
);
|
|
|
+ log.info("查询贸易合同关联商品信息,结果:{}", JSON.toJSONString(kwcContractTradeGoods));
|
|
|
Optional.ofNullable(kwcContractTradeGoods).ifPresent(d -> tradeContractResDto.setGoodsInfoDto(BeanUtils.toBean(d, GoodsInfoDto.class)));
|
|
|
|
|
|
List<KwcContractTradeUnit> kwcContractTradeUnits = kwcContractTradeUnitMapper.selectList(new LambdaQueryWrapper<KwcContractTradeUnit>().eq(KwcContractTradeUnit::getContractId, tradeContractId)
|
|
|
.eq(KwcContractTradeUnit::getDelFlag, 0));
|
|
|
+ log.info("查询贸易合同关联企业信息,结果:{}", JSON.toJSONString(kwcContractTradeUnits));
|
|
|
+
|
|
|
Optional.ofNullable(kwcContractTradeUnits).ifPresent(d -> tradeContractResDto.setUnitList(d.stream().map(t -> BeanUtils.toBean(t, TradeContractUnitDto.class)).toList()));
|
|
|
|
|
|
return tradeContractResDto;
|