@@ -6,7 +6,7 @@ from django_response import response  | 
            ||
| 6 | 6 | 
                from json_render import json_render  | 
            
| 7 | 7 | 
                 | 
            
| 8 | 8 | 
                from guideline.models import ScreenAdminInfo  | 
            
| 9 | 
                -from utils.error.errno_utils import PermissionStatusCode  | 
            |
| 9 | 
                +from utils.error.errno_utils import PermissionStatusCode, ScreenStatusCode  | 
            |
| 10 | 10 | 
                from utils.redis.connect import r  | 
            
| 11 | 11 | 
                from utils.redis.rkeys import SCREEN_ADMIN_LOGIN  | 
            
| 12 | 12 | 
                 | 
            
                @@ -67,7 +67,12 @@ def screen_admin_loginrst(request):  | 
            ||
| 67 | 67 | 
                     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
               | 
            
| 68 | 68 | 
                     token = request.POST.get('token', '')
               | 
            
| 69 | 69 | 
                 | 
            
| 70 | 
                - unionid, _ = r.getdelete(SCREEN_ADMIN_LOGIN % (brand_id, token))  | 
            |
| 70 | 
                + admin_login_key = SCREEN_ADMIN_LOGIN % (brand_id, token)  | 
            |
| 71 | 
                +  | 
            |
| 72 | 
                + if not r.exists(admin_login_key):  | 
            |
| 73 | 
                + return response(ScreenStatusCode.QRCODE_NOT_SCAN)  | 
            |
| 74 | 
                +  | 
            |
| 75 | 
                + unionid, _ = r.getdelete(admin_login_key)  | 
            |
| 71 | 76 | 
                 | 
            
| 72 | 77 | 
                try:  | 
            
| 73 | 78 | 
                admin = ScreenAdminInfo.objects.get(unionid=unionid, user_status=ScreenAdminInfo.ACTIVATED)  | 
            
                @@ -156,6 +156,11 @@ class GroupPhotoStatusCode(BaseStatusCode):  | 
            ||
| 156 | 156 | 
                COMMENT_CONTENT_EMPTY = StatusCodeField(402230, 'Comment Content Empty', description=u'评论内容为空')  | 
            
| 157 | 157 | 
                 | 
            
| 158 | 158 | 
                 | 
            
| 159 | 
                +class ScreenStatusCode(BaseStatusCode):  | 
            |
| 160 | 
                + """ 群组/团相关错误码 4030xx """  | 
            |
| 161 | 
                + QRCODE_NOT_SCAN = StatusCodeField(403001, 'QRCode Not Scan', description=u'二维码未扫描')  | 
            |
| 162 | 
                +  | 
            |
| 163 | 
                +  | 
            |
| 159 | 164 | 
                class OrderStatusCode(BaseStatusCode):  | 
            
| 160 | 165 | 
                """ 订单/支付相关错误码 4040xx """  | 
            
| 161 | 166 | 
                WX_UNIFIED_ORDER_FAIL = StatusCodeField(404000, 'WX Unified Order Fail', description=u'微信统一下单失败')  |