Commit 70f3e3eda0c8b56a43805e56563001ae3afbbb54
Merge remote-tracking branch 'origin/master'
# Conflicts: # shop/src/main/java/com/canrd/shop/service/impl/ProductServiceImpl.java
Showing
1 changed file
with
12 additions
and
14 deletions
shop/src/main/java/com/canrd/shop/service/impl/ProductServiceImpl.java
| @@ -143,20 +143,18 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, ProductDO> im | @@ -143,20 +143,18 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, ProductDO> im | ||
| 143 | TreeMap<String, Integer> cateId2Relevance = new TreeMap<>(relatedCateId2Relevance); | 143 | TreeMap<String, Integer> cateId2Relevance = new TreeMap<>(relatedCateId2Relevance); |
| 144 | StringJoiner orderByJoiner = new StringJoiner(" when "," order by case pc.id when "," else 0 end "); | 144 | StringJoiner orderByJoiner = new StringJoiner(" when "," order by case pc.id when "," else 0 end "); |
| 145 | cateId2Relevance.forEach((k,v)->orderByJoiner.add("'"+k+"'"+" then "+v)); | 145 | cateId2Relevance.forEach((k,v)->orderByJoiner.add("'"+k+"'"+" then "+v)); |
| 146 | - if(CollUtil.isNotEmpty(cateId2Relevance)){ | ||
| 147 | - QueryWrapper<ProductDO> objectQueryWrapper = new QueryWrapper<ProductDO>() | ||
| 148 | - .in("pc.id", cateId2Relevance.keySet()) | ||
| 149 | - .select("distinct p.id","pc.id") | ||
| 150 | - .last(orderByJoiner.toString()); | ||
| 151 | - List<ProductDO> relatedProducts = this | ||
| 152 | - .list(objectQueryWrapper); | ||
| 153 | - List<String> relatedProductIds = relatedProducts.stream() | ||
| 154 | - .map(ProductDO::getId) | ||
| 155 | - .distinct() | ||
| 156 | - .limit(10) | ||
| 157 | - .collect(Collectors.toList()); | ||
| 158 | - productVO.setRelatedProductIds(relatedProductIds); | ||
| 159 | - } | 146 | + QueryWrapper<ProductDO> objectQueryWrapper = new QueryWrapper<ProductDO>() |
| 147 | + .in("pc.id", cateId2Relevance.keySet()) | ||
| 148 | + .select("distinct p.id","pc.id") | ||
| 149 | + .last(orderByJoiner.toString()); | ||
| 150 | + List<ProductDO> relatedProducts = this | ||
| 151 | + .list(objectQueryWrapper); | ||
| 152 | + List<String> relatedProductIds = relatedProducts.stream() | ||
| 153 | + .map(ProductDO::getId) | ||
| 154 | + .distinct() | ||
| 155 | + .limit(10) | ||
| 156 | + .collect(Collectors.toList()); | ||
| 157 | + productVO.setRelatedProductIds(relatedProductIds); | ||
| 160 | 158 | ||
| 161 | productVO.setPriceShow(productPriceShow); | 159 | productVO.setPriceShow(productPriceShow); |
| 162 | 160 |