MiniProgram

src/main/java/com/mmc/pms/service/Impl/MiniProgramProductMallServiceImpl.java

@@ -19,6 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @Author small @Date 2023/5/16 15:08 @Version 1.0
@@ -171,54 +172,35 @@ public class MiniProgramProductMallServiceImpl implements MiniProgramProductMall
     return ResultBody.success(PageResult.buildPage(pageNo, param.getPageSize(), count, pageList));
   }
 
+
   private List<GoodsSpecDTO> getIndustrySpecInfo(Integer goodsInfoId) {
     // 获取商品对应绑定的行业sku信息
-    List<MallIndustrySkuInfoDO> mallIndustrySkuInfoList =
-        goodsInfoDao.getMallIndustrySkuInfo(goodsInfoId);
-    List<GoodsSpecDTO> list =
-        mallIndustrySkuInfoList.stream()
-            .map(MallIndustrySkuInfoDO::buildGoodsSpecDTO)
-            .collect(Collectors.toList());
+    List<MallIndustrySkuInfoDO> mallIndustrySkuInfoList = goodsInfoDao.getMallIndustrySkuInfo(goodsInfoId);
+    List<GoodsSpecDTO> list = mallIndustrySkuInfoList.stream().map(MallIndustrySkuInfoDO::buildGoodsSpecDTO).collect(Collectors.toList());
     // 根据商品id查出该商品下绑定的规格信息
-    List<MallIndustrySkuInfoSpecDO> mallIndustrySkuInfoSpec =
-        goodsInfoDao.getIndustrySkuInfoSpec(goodsInfoId);
-    list =
-        list.stream()
-            .peek(
-                d -> {
-                  List<MallIndustrySpecDTO> industrySpec = new ArrayList<>();
-                  for (MallIndustrySkuInfoSpecDO e : mallIndustrySkuInfoSpec) {
-                    if (d.getId().equals(e.getMallIndustrySkuInfoId())) {
-                      IndustrySpecDO industrySpecDO = e.getIndustrySpecDO();
-                      // 获取商品清单信息
-                      List<IndustryProductInventoryDO> industryProdInventory =
-                          goodsInfoDao.getIndustryProductInventory(e.getIndustrySpecId());
-                      List<ProductInventoryVO> productInventoryList = new ArrayList<>();
-                      // 获取行业规格绑定的产品规格信息
-                      List<InventorySpecDO> inventorySpecDOList =
-                          goodsInfoDao.listInventorySpec(
-                              industryProdInventory.stream()
-                                  .map(IndustryProductInventoryDO::getId)
-                                  .collect(Collectors.toList()));
-                      Map<Integer, List<InventorySpecDO>> inventoryMap =
-                          inventorySpecDOList.stream()
-                              .collect(
-                                  Collectors.groupingBy(
-                                      InventorySpecDO::getIndustryProductInventoryId));
-                      getIndustrySpecOnProdSpecInfo(
-                          industryProdInventory, productInventoryList, inventoryMap);
-                      MallIndustrySpecDTO industrySpecDTO =
-                          industrySpecDO.buildMallIndustrySpecDTO();
-                      industrySpecDTO.setId(e.getId());
-                      industrySpecDTO.setIndustrySpecId(e.getIndustrySpecId());
-                      industrySpecDTO.setIndustrySkuId(d.getSkuId());
-                      industrySpecDTO.setProductInventoryList(productInventoryList);
-                      industrySpec.add(industrySpecDTO);
-                    }
-                  }
-                  d.setIndustrySpecList(industrySpec);
-                })
-            .collect(Collectors.toList());
+    List<MallIndustrySkuInfoSpecDO> mallIndustrySkuInfoSpec = goodsInfoDao.getIndustrySkuInfoSpec(goodsInfoId);
+    list = list.stream().peek(d -> {
+      List<MallIndustrySpecDTO> industrySpec = new ArrayList<>();
+      for (MallIndustrySkuInfoSpecDO e : mallIndustrySkuInfoSpec) {
+        if (d.getId().equals(e.getMallIndustrySkuInfoId())) {
+          IndustrySpecDO industrySpecDO = e.getIndustrySpecDO();
+          // 获取商品清单信息
+          List<IndustryProductInventoryDO> industryProdInventory = goodsInfoDao.getIndustryProductInventory(e.getIndustrySpecId());
+          List<ProductInventoryVO> productInventoryList = new ArrayList<>();
+          // 获取行业规格绑定的产品规格信息
+          List<InventorySpecDO> inventorySpecDOList = goodsInfoDao.listInventorySpec(industryProdInventory.stream().map(IndustryProductInventoryDO::getId).collect(Collectors.toList()));
+          Map<Integer, List<InventorySpecDO>> inventoryMap = inventorySpecDOList.stream().collect(Collectors.groupingBy(InventorySpecDO::getIndustryProductInventoryId));
+          getIndustrySpecOnProdSpecInfo(industryProdInventory, productInventoryList, inventoryMap);
+          MallIndustrySpecDTO industrySpecDTO = industrySpecDO.buildMallIndustrySpecDTO();
+          industrySpecDTO.setId(e.getId());
+          industrySpecDTO.setIndustrySpecId(e.getIndustrySpecId());
+          industrySpecDTO.setIndustrySkuId(d.getSkuId());
+          industrySpecDTO.setProductInventoryList(productInventoryList);
+          industrySpec.add(industrySpecDTO);
+        }
+      }
+      d.setIndustrySpecList(industrySpec);
+    }).collect(Collectors.toList());
     return list;
   }
 

src/main/resources/mapper/MiniProgramProductMallDao.xml

@@ -321,7 +321,7 @@
                product_sku_id   productSkuId,
                is_selected      selected
         FROM industry_product_inventory
-        WHERE industry_spec_id = #{id}
+        WHERE industry_spec_id = #{industrySpecId}
           AND is_deleted = 0
     </select>