huodongdong 7 年之前
父节点
当前提交
54ebcd3e0c

+ 5 - 4
rankin-product-service/src/main/java/cn/rankin/productservice/service/PackageService.java

@@ -64,13 +64,12 @@ public class PackageService {
             return packageProductVoList;
         }
 
-        Map<String, BigDecimal> productPriceMap = new HashMap<>();
+        Map<String, PackageProductRelation> relationMap = new HashMap<>();
         List<String> productIdList = new ArrayList<>();
         relationList.forEach(relation -> {
             String productId = relation.getPid();
-            BigDecimal price = relation.getCpPrice();
             productIdList.add(productId);
-            productPriceMap.put(productId, price);
+            relationMap.put(productId, relation);
         });
 
         List<Product> productList = productRepository.findByPids(productIdList);
@@ -86,7 +85,9 @@ public class PackageService {
             }
             PackageProductVo packageProductVo = new PackageProductVo();
             BeanUtils.copyProperties(product, packageProductVo);
-            packageProductVo.setCpPrice(productPriceMap.get(productId));
+            PackageProductRelation relation = relationMap.get(productId);
+            packageProductVo.setCpPrice(relation.getCpPrice());
+            packageProductVo.setMerchantPrice(relation.getMerchantPrice());
             packageProductVoList.add(packageProductVo);
         }