|
@@ -240,12 +240,12 @@ public class TradeOrderManageService {
|
|
|
//查询贸易合同商品信息
|
|
//查询贸易合同商品信息
|
|
|
Map<Long, KwoTradeOrderGoods> tradeOrderIdGoodsMap = Maps.newHashMap() ;
|
|
Map<Long, KwoTradeOrderGoods> tradeOrderIdGoodsMap = Maps.newHashMap() ;
|
|
|
List<KwoTradeOrderGoods> tradeOrderGoods = tradeOrderGoodsRepository.queryByOrderIds(tradeOrderIds);
|
|
List<KwoTradeOrderGoods> tradeOrderGoods = tradeOrderGoodsRepository.queryByOrderIds(tradeOrderIds);
|
|
|
- List<Long> goodsIds = Lists.newArrayList();
|
|
|
|
|
|
|
+ List<Long> goodsIdList = Lists.newArrayList();
|
|
|
if (CollectionUtils.isNotEmpty(tradeOrderGoods)){
|
|
if (CollectionUtils.isNotEmpty(tradeOrderGoods)){
|
|
|
tradeOrderIdGoodsMap = tradeOrderGoods.stream()
|
|
tradeOrderIdGoodsMap = tradeOrderGoods.stream()
|
|
|
.collect(Collectors.toMap(KwoTradeOrderGoods::getTOrderId, Function.identity(), (k, v) -> k));
|
|
.collect(Collectors.toMap(KwoTradeOrderGoods::getTOrderId, Function.identity(), (k, v) -> k));
|
|
|
//获取商品id
|
|
//获取商品id
|
|
|
- goodsIds = tradeOrderGoods.stream()
|
|
|
|
|
|
|
+ goodsIdList = tradeOrderGoods.stream()
|
|
|
.map(KwoTradeOrderGoods::getGoodsId)
|
|
.map(KwoTradeOrderGoods::getGoodsId)
|
|
|
.distinct()
|
|
.distinct()
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
@@ -253,8 +253,8 @@ public class TradeOrderManageService {
|
|
|
|
|
|
|
|
//查询商品信息
|
|
//查询商品信息
|
|
|
Map<Long, KwpGoods> goodsIdAndGoodsMap = Maps.newHashMap() ;
|
|
Map<Long, KwpGoods> goodsIdAndGoodsMap = Maps.newHashMap() ;
|
|
|
- if (CollectionUtils.isNotEmpty(goodsIds)){
|
|
|
|
|
- goodsIdAndGoodsMap = goodsInfoService.getGoodsByIds(goodsIds);
|
|
|
|
|
|
|
+ if (CollectionUtils.isNotEmpty(goodsIdList)){
|
|
|
|
|
+ goodsIdAndGoodsMap = goodsInfoService.getGoodsByIds(goodsIdList);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//查询贸易订单公司信息
|
|
//查询贸易订单公司信息
|