api/mch_views.py

@@ -379,6 +379,7 @@ def consumer_info_api(request):

                 @logit(res=True)
              

                 @transaction.atomic
              

                 def consumer_snlist_api(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

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

                 
              

                     # 校验用户是否存在
              
@@ -388,7 +389,7 @@ def consumer_snlist_api(request):

                         return response(UserStatusCode.USER_NOT_FOUND)
              

                 
              

                     # 用户信息提交列表
              

                -    logs = ConsumeInfoSubmitLogInfo.objects.filter(user_id=user_id, status=True).distinct()
              

                +    logs = ConsumeInfoSubmitLogInfo.objects.filter(user_id=user_id, brand_id=brand_id, status=True).distinct()
              

                     seen = set()
              

                     seen_add = seen.add
              

                     logs = [log.data for log in logs if not (log.serialNo in seen or seen_add(log.serialNo))]
              

miniapp/views.py

@@ -13,7 +13,7 @@ from TimeConvert import TimeConvert as tc

                 
              

                 from account.models import UserInfo
              

                 from statistic.models import RegisterStatisticInfo
              

                -from utils.error.errno_utils import ProductBrandStatusCode, UserStatusCode
              

                +from utils.error.errno_utils import UserStatusCode
              

                 from utils.redis.connect import r
              

                 from utils.redis.rprofile import set_profile_info
              

                 
              

page/screen_views.py

@@ -58,7 +58,7 @@ def screen_admin_login(request):

                     token = request.GET.get('token', '')
              

                 
              

                     try:
              

                -        admin = ScreenAdminInfo.objects.get(unionid=unionid, user_status=ScreenAdminInfo.ACTIVATED)
              

                +        admin = ScreenAdminInfo.objects.get(brand_id=brand_id, unionid=unionid, user_status=ScreenAdminInfo.ACTIVATED)
              

                     except ScreenAdminInfo.DoesNotExist:
              

                         return json_render(request, 'page/screen_admin_login_fail.html', unjsondumpsdict={
              

                         })
              
@@ -82,7 +82,7 @@ def screen_admin_loginrst(request):

                     unionid, _ = r.getdelete(admin_login_key)
              

                 
              

                     try:
              

                -        admin = ScreenAdminInfo.objects.get(unionid=unionid, user_status=ScreenAdminInfo.ACTIVATED)
              

                +        admin = ScreenAdminInfo.objects.get(brand_id=brand_id, unionid=unionid, user_status=ScreenAdminInfo.ACTIVATED)
              

                     except ScreenAdminInfo.DoesNotExist:
              

                         return response(PermissionStatusCode.PERMISSION_DENIED)