huodongdong 7 years ago
parent
commit
aa15ceede3

+ 8 - 2
rankin-product-service/src/main/java/cn/rankin/productservice/service/MerchantProductService.java

@@ -175,8 +175,14 @@ public class MerchantProductService {
             List<PackageProductVo> productVos = packageService.getPackageProducts(productId);
             merchantProduct.setProducts(productVos);
 
-            List<Goods> specials = goodsRepository.findByPkgIdAndMerchantId(productId, merchantId);
-            merchantProduct.setSpecials(specials);
+            List<Goods> packaeGoodsList = goodsRepository.findByPkgIdAndMerchantId(productId, merchantId);
+            List<Goods> supportGoodsList = new ArrayList<>();
+            for (Goods goods : packaeGoodsList) {
+                if (goods.getType().equals(ProductTypeEnum.SUPPORT)) {
+                    supportGoodsList.add(goods);
+                }
+            }
+            merchantProduct.setSpecials(supportGoodsList);
         }
 
         return APIResult.ok(merchantProduct);