167b014da2fcf265768R16">16
+redis==2.10.5
15 17
 shortuuid==0.4.2
16 18
 uWSGI==2.0.11.1
19
+wechatpy==1.2.5

+ 14 - 4
utils/errno_utils.py

@@ -15,6 +15,7 @@ class StatusCodeField(ConstIntField):
15 15
 
16 16
 
17 17
 class UserStatusCode(BaseStatusCode):
18
+    """ 摄影师/用户相关错误码 400x & 401x """
18 19
     LENSMAN_NOT_FOUND = StatusCodeField(4000, u'Lensman Not Found', description=u'摄影师不存在')
19 20
     LENSMAN_PASSWORD_ERROR = StatusCodeField(4001, u'Lensman Password Error', description=u'摄影师密码错误')
20 21
     USERNAME_HAS_REGISTERED = StatusCodeField(4010, u'Username Has Registered', description=u'用户名已注册')
@@ -23,27 +24,36 @@ class UserStatusCode(BaseStatusCode):
23 24
 
24 25
 
25 26
 class PhotoStatusCode(BaseStatusCode):
27
+    """ 照片相关错误码 403x """
26 28
     PARAMS_ERROR = StatusCodeField(4039, u'Params Error', description=u'参数错误')
27 29
 
28 30
 
29 31
 class GroupStatusCode(BaseStatusCode):
32
+    """ 群组相关错误码 402x """
30 33
     GROUP_NOT_FOUND = StatusCodeField(4020, u'Group Not Found', description=u'群组不存在')
31 34
     GROUP_HAS_LOCKED = StatusCodeField(4021, u'Group Has Locked', description=u'群组已锁定')
32 35
     NOT_GROUP_ADMIN = StatusCodeField(4022, u'Not Group Admin', description=u'非群组管理员')
33 36
     NO_UPDATE_PERMISSION = StatusCodeField(40220, u'No Update Permission', description=u'没有更新权限')
34 37
     NO_LOCK_PERMISSION = StatusCodeField(40221, u'No Lock Permission', description=u'没有锁定权限')
35
-    NO_UNLOCK_PERMISSION = StatusCodeField(40221, u'No Unlock Permission', description=u'没有解锁权限')
36
-    NO_REMOVE_PERMISSION = StatusCodeField(40222, u'No Remove Permission', description=u'没有移除权限')
37
-    NO_PASS_PERMISSION = StatusCodeField(40223, u'No Pass Permission', description=u'没有通过权限')
38
-    NO_REFUSE_PERMISSION = StatusCodeField(40224, u'No Refuse Permission', description=u'没有拒绝权限')
38
+    NO_UNLOCK_PERMISSION = StatusCodeField(40222, u'No Unlock Permission', description=u'没有解锁权限')
39
+    NO_REMOVE_PERMISSION = StatusCodeField(40223, u'No Remove Permission', description=u'没有移除权限')
40
+    NO_PASS_PERMISSION = StatusCodeField(40224, u'No Pass Permission', description=u'没有通过权限')
41
+    NO_REFUSE_PERMISSION = StatusCodeField(40225, u'No Refuse Permission', description=u'没有拒绝权限')
39 42
     DUPLICATE_JOIN_REQUEST = StatusCodeField(4027, u'Duplicate Join Request', description=u'重复加群申请')
40 43
     JOIN_REQUEST_NOT_FOUND = StatusCodeField(4028, u'Join Request Not Found', description=u'加群申请不存在')
41 44
     GROUP_USER_NOT_FOUND = StatusCodeField(4029, u'Group User Not Found', description=u'该用户不在群组')
42 45
 
43 46
 
44 47
 class GroupPhotoStatusCode(BaseStatusCode):
48
+    """ 飞图相关错误码 403x """
45 49
     GROUP_PHOTO_NOT_FOUND = StatusCodeField(4030, u'Group Photo Not Found', description=u'飞图不存在')
46 50
 
47 51
 
52
+class OrderStatusCode(BaseStatusCode):
53
+    """ 订单/支付相关错误码 404x """
54
+    WX_UNIFIED_ORDER_FAIL = StatusCodeField(4040, u'WX Unified Order Fail', description=u'微信统一下单失败')
55
+
56
+
48 57
 class MessageStatusCode(BaseStatusCode):
58
+    """ 消息相关错误码 409x """
49 59
     MESSAGE_NOT_FOUND = StatusCodeField(4091, u'Message Not Found', description=u'消息不存在')

+ 0 - 0
utils/redis/__init__.py


+ 0 - 0
utils/redis/keys.py


:art: Update get_course_list · fdedda2eb0 - Gogs: Go Git Service

:art: Update get_course_list

huangqimin001 4 ans auparavant
Parent
Commettre
fdedda2eb0
1 fichiers modifiés avec 8 ajouts et 6 suppressions
  1. 8 6
      api/course_views.py

+ 8 - 6
api/course_views.py

@@ -78,15 +78,17 @@ def get_course_list(request):
78 78
     try:
79 79
         admin = BranchCampusAdministratorInfo.objects.get(admin_id=admin_id, user_status=BranchCampusAdministratorInfo.ACTIVATED)
80 80
     except BranchCampusAdministratorInfo.DoesNotExist:
81
-        return response()
81
+        admin = None
82 82
 
83
-    course = CourseInfo.objects.filter(authorities__contains=admin.campus_id, status=True)
84
-    count = course.count()
85
-    course, left = pagination(course, page, num)
86
-    course = [c.admindata(admin_id) for c in course]
83
+    courses = CourseInfo.objects.filter(status=True)
84
+    if admin:
85
+        courses = courses.filter(authorities__contains=admin.campus_id)
86
+    count = courses.count()
87
+    courses, left = pagination(courses, page, num)
88
+    courses = [course.admindata(admin_id) for course in courses]
87 89
 
88 90
     return response(data={
89
-        'logs': course,
91
+        'logs': courses,
90 92
         'count': count,
91 93
         'left': left,
92 94
     })