From 084baf89b1024fd2d53cda96d6c7bef3164e687f Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 9 Apr 2026 17:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=9F=B3=E6=9C=BA=20/=20=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=20=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/admin/ProductController.java    |  7 ++-----
 .../java/com/czg/product/service/ProductService.java   |  3 ++-
 .../product/service/impl/ProductServiceImpl.java       | 10 +++++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
index 3bacce632..61de19591 100644
--- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
+++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
@@ -15,7 +15,6 @@ import com.czg.product.param.*;
 import com.czg.product.service.ProdConsRelationService;
 import com.czg.product.service.ProductService;
 import com.czg.product.service.ShopSyncService;
-import com.czg.product.service.UProductService;
 import com.czg.product.vo.ProductStatisticsVo;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
@@ -30,7 +29,6 @@ import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 import java.util.Map;
 
 
@@ -84,9 +82,8 @@ public class ProductController {
      */
     @GetMapping("list")
     @OperationLog("商品-列表")
-    public CzgResult<List<ProductDTO>> getProductList(@RequestParam Long categoryId) {
-        List<ProductDTO> productList = productService.getProductCacheList(StpKit.USER.getShopId(), categoryId);
-        return CzgResult.success(productList);
+    public CzgResult<Map<String, Object>> getProductList(@RequestParam Long categoryId) {
+        return CzgResult.success(productService.getProductCacheList(StpKit.USER.getShopId(), categoryId));
     }
 
     /**
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java
index 010f9f28e..0a229bc13 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java
@@ -9,6 +9,7 @@ import com.mybatisflex.core.service.IService;
 import jakarta.servlet.http.HttpServletResponse;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 商品
@@ -42,7 +43,7 @@ public interface ProductService extends IService<Product> {
      * @param categoryId 商品分类ID
      * @return 商品列表数据
      */
-    List<ProductDTO> getProductCacheList(Long shopId, Long categoryId);
+    Map<String, Object> getProductCacheList(Long shopId, Long categoryId);
 
     /**
      * 清除某个商品分类的缓存
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
index 32d92a05d..f3f563e6f 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
@@ -181,7 +181,10 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                 lowMemberPriceIsPresent.ifPresent(record::setLowMemberPrice);
             }
             record.setSkuList(skuList);
-            record.setProdConsRelations(prodConsRelationMapper.selectListByQuery(query().eq(ProdConsRelation::getProductId, record.getId()).eq(ProdConsRelation::getShopId, record.getShopId())));
+            record.setProdConsRelations(prodConsRelationMapper.selectListByQuery(query()
+                    .eq(ProdConsRelation::getProductId, record.getId())
+                    .eq(ConsInfo::getStatus, SystemConstants.OneZero.ONE)
+                    .eq(ProdConsRelation::getShopId, record.getShopId())));
         });
         return records;
     }
@@ -334,7 +337,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     }
 
     @Override
-    public List<ProductDTO> getProductCacheList(Long shopId, Long categoryId) {
+    public Map<String, Object> getProductCacheList(Long shopId, Long categoryId) {
         String key = ADMIN_CLIENT_PRODUCT_LIST + "::" + shopId + "::" + categoryId;
         List<ProductDTO> list;
         if (!redisService.hasKey(key)) {
@@ -349,7 +352,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                 .sorted(Comparator.comparingInt(ProductDTO::getSort).reversed())
                 .sorted(Comparator.comparingLong(ProductDTO::getId).reversed())
                 .toList();
-        return list;
+        List<ConsInfo> consInfos = consInfoMapper.selectListByQuery(query().eq(ConsInfo::getShopId, shopId).eq(ConsInfo::getStatus, SystemConstants.OneZero.ONE));
+        return Map.of("productList", list, "cons", consInfos);
     }
 
     /**