Merge remote-tracking branch 'origin/develop' into develop

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 2dcf31b750066b32f38373ce15c495f1f64d8f82
+  newTag: b0da06e9f65d0bdae84b590737a16cbdff5fea38

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

@@ -151,9 +151,25 @@ public class ProductServiceImpl implements ProductSkuService {
     }
     List<ProductSpecDO> productSpecList =
         productDao.listPageProductSpec((pageNo - 1) * pageSize, pageSize, productSkuId, keyword);
+    List<Integer> specIds =
+        productSpecList.stream().map(ProductSpecDO::getId).collect(Collectors.toList());
+    List<ProductSpecPriceDO> productSpecPrice = productDao.getProductSpecPriceList(specIds);
+    Map<Integer, List<ProductSpecPriceDO>> priceMap =
+        productSpecPrice.stream()
+            .collect(Collectors.groupingBy(ProductSpecPriceDO::getProductSpecId));
     List<ProductSpecDTO> list =
         productSpecList.stream()
-            .map(ProductSpecDO::buildProductSpecDTO)
+            .map(
+                d -> {
+                  ProductSpecDTO productSpecDTO = d.buildProductSpecDTO();
+                  if (!org.springframework.util.CollectionUtils.isEmpty(priceMap.get(d.getId()))) {
+                    productSpecDTO.setPriceList(
+                        priceMap.get(d.getId()).stream()
+                            .map(ProductSpecPriceDO::buildProductSpecPriceDTO)
+                            .collect(Collectors.toList()));
+                  }
+                  return productSpecDTO;
+                })
             .collect(Collectors.toList());
     return ResultBody.success(PageResult.buildPage(pageNo, pageSize, count, list));
   }

src/main/resources/mapper/GoodsInfoDao.xml

@@ -581,9 +581,8 @@
     </select>
     <select id="countGoodsInfoByCategoryId" resultType="java.lang.Integer">
         SELECT COUNT(*)
-        FROM categories c
-                 LEFT JOIN goods_info gi ON gi.category_by_one = c.id OR gi.category_by_two = c.id
-        WHERE c.is_deleted = 0
-          AND c.id = #{id}
+        FROM goods_info gi
+        WHERE gi.category_by_one = #{id}
+           OR gi.category_by_two = #{id};
     </select>
 </mapper>

src/main/resources/mapper/ProductDao.xml

@@ -493,7 +493,7 @@
         SELECT
         id,
         product_spec_id productSpecId,
-        tag_info_id tagInfoId,
+        cooperation_tag cooperationTag,
         price
         FROM
         product_spec_price