api/admin_views.py

@@ -146,6 +146,7 @@ def live_goods_list(request):

                     admin_id = request.POST.get('admin_id', '')
              

                     page = request.POST.get('page', 1)
              

                     num = request.POST.get('num', 20)
              

                +    room_id = request.POST.get('room_id', '')
              

                 
              

                     try:
              

                         administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
              
@@ -153,6 +154,12 @@ def live_goods_list(request):

                         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              

                 
              

                     goods_list = liveGoodsInfo.objects.filter(status=True).order_by('-created_at')
              

                +
              

                +    if room_id:
              

                +        room_goods = RoomGoodsInfo.objects.filter(room_id=room_id, status=True)
              

                +        goods_ids = [goods.goods_id for goods in room_goods]
              

                +        goods_list = goods_list.exclude(goods_id__in=goods_ids)
              

                +
              

                     count = goods_list.count()
              

                     goods_list = Paginator(goods_list, num).get_page(page)
              

                     goods_list = [goods.admindata for goods in goods_list]
              
@@ -483,7 +490,7 @@ def room_goods_list(request):

                     admin_id = request.POST.get('admin_id', '')
              

                     page = request.POST.get('page', 1)
              

                     num = request.POST.get('num', 20)
              

                -
              

                +    
              

                     try:
              

                         administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
              

                     except AdministratorInfo.DoesNotExist:
              
@@ -498,4 +505,4 @@ def room_goods_list(request):

                     return response(200, 'Room Goods Success', u'直播间商品库获取成功', data={
              

                         'goods_list': goods_list,
              

                         'count': count,
              

                -    })
              

                +    })