feat(jituan): 俱乐部商品类型/考核标签上架配置与抢单池过滤

products/views.py

@@ -88,25 +88,20 @@ class ShangpinHuoquView(APIView):
         try:
             logger.info("收到商品数据获取请求")
 
-            # 1. 查询商品类型（只查询正常状态的类型，并排序）
-            # 正常运营：只显示 shenhezhuangtai=2 的商品类型
-            leixing_queryset = ShangpinLeixing.query.filter(
-                shenhezhuangtai=1  # 只取正常状态
-            ).order_by('-paixu', 'id')  # 先按paixu降序，再按id升序
+            from jituan.services.club_context import resolve_effective_club_id
+            from jituan.services.club_shangpin_leixing import build_club_leixing_list_for_api
 
-            # 注意：审核期间使用下面这行代码（先注释掉）
-            '''leixing_queryset = ShangpinLeixing.query.filter(
-                 shenhezhuangtai=2  # 审核期间：只取审核专用状态
-             ).order_by('-paixu', 'id')'''
-
-            shangpinleixing_data = []
-            for leixing in leixing_queryset:
-                shangpinleixing_data.append({
-                    "id": leixing.id,
-                    "jieshao": leixing.jieshao,
-                    "tupian_url": leixing.tupian_url,
-                    "paixu": leixing.paixu
-                })
+            club_id = resolve_effective_club_id(request, getattr(request, 'user', None))
+            leixing_rows = build_club_leixing_list_for_api(club_id)
+            shangpinleixing_data = [
+                {
+                    'id': row['id'],
+                    'jieshao': row['jieshao'],
+                    'tupian_url': row['tupian_url'],
+                    'paixu': row['paixu'],
+                }
+                for row in leixing_rows
+            ]
 
             # 2. 查询商品专区（只查询可见类型下的专区，并排序）
             # 先获取可见的类型ID列表