num lines-num-old"> 642
-    # 判断群组照片发布者是否已经被管理员移除,如若移除,则不给发布者提醒
696
+    # 判断群组照片发布者是否已经被管理员移除/主动退出,如若移除/退出,则不给发布者提醒
643 697
     if r.sismember(GROUP_USERS_PASSED_SET % group_photo.group_id, group_photo.user_id):
644 698
         UserMessageInfo.objects.create(
645 699
             from_uid=user_id,
@@ -736,7 +790,7 @@ def thumbup_cancel_api(request):
736 790
     group_photo.thumbup_num -= 1
737 791
     group_photo.save()
738 792
 
739
-    # 判断群组照片发布者是否已经被管理员移除,如若移除,则不给发布者提醒
793
+    # 判断群组照片发布者是否已经被管理员移除/主动退出,如若移除/退出,则不给发布者提醒
740 794
     if r.sismember(GROUP_USERS_PASSED_SET % group_photo.group_id, group_photo.user_id):
741 795
         UserMessageInfo.objects.create(
742 796
             from_uid=user_id,

+ 5 - 4
utils/error/errno_utils.py

@@ -41,10 +41,11 @@ class GroupStatusCode(BaseStatusCode):
41 41
     NO_LOCK_PERMISSION = StatusCodeField(402005, u'No Lock Permission', description=u'没有锁定权限')
42 42
     NO_UNLOCK_PERMISSION = StatusCodeField(402006, u'No Unlock Permission', description=u'没有解锁权限')
43 43
     NO_REMOVE_PERMISSION = StatusCodeField(402007, u'No Remove Permission', description=u'没有移除权限')
44
-    NO_PASS_PERMISSION = StatusCodeField(402008, u'No Pass Permission', description=u'没有通过权限')
45
-    NO_REFUSE_PERMISSION = StatusCodeField(402009, u'No Refuse Permission', description=u'没有拒绝权限')
46
-    DUPLICATE_JOIN_REQUEST = StatusCodeField(402010, u'Duplicate Join Request', description=u'重复加群申请')
47
-    JOIN_REQUEST_NOT_FOUND = StatusCodeField(402011, u'Join Request Not Found', description=u'加群申请不存在')
44
+    NO_QUIT_PERMISSION = StatusCodeField(402008, u'No Quit Permission', description=u'没有退出权限')
45
+    NO_PASS_PERMISSION = StatusCodeField(402009, u'No Pass Permission', description=u'没有通过权限')
46
+    NO_REFUSE_PERMISSION = StatusCodeField(402010, u'No Refuse Permission', description=u'没有拒绝权限')
47
+    DUPLICATE_JOIN_REQUEST = StatusCodeField(402011, u'Duplicate Join Request', description=u'重复加群申请')
48
+    JOIN_REQUEST_NOT_FOUND = StatusCodeField(402012, u'Join Request Not Found', description=u'加群申请不存在')
48 49
 
49 50
 
50 51
 class GroupUserStatusCode(BaseStatusCode):

+ 1 - 0
utils/redis/rkeys.py

@@ -12,6 +12,7 @@ GROUP_USERS_APPLYING_SET = 'group:users:applying:set:%s'  # SET,群组用户
12 12
 GROUP_USERS_PASSED_SET = 'group:users:passed:set:%s'  # SET,群组用户通过集合,group_id
13 13
 GROUP_USERS_REFUSED_SET = 'group:users:refused:set:%s'  # SET,群组用户拒绝集合,group_id
14 14
 GROUP_USERS_DELETED_SET = 'group:users:deleted:set:%s'  # SET,群组用户移除集合,group_id
15
+GROUP_USERS_QUIT_SET = 'group:users:quit:set:%s'  # SET,群组用户退出集合,group_id
15 16
 
16 17
 # 群组照片相关
17 18
 GROUP_LAST_PHOTO_PK = 'group:last:photo:pk:%s'  # STRING,群组最后一张照片PK,group_id

+ 12 - 8
utils/sql/raw.py

@@ -1,10 +1,14 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-PAI2_HOME_API = r"select " \
4
-                r"T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T3.id, T3.photo_path, T3.photo_w, T3.photo_h, T3.photo_thumbnail_path, T3.photo_thumbnail_w, T3.photo_thumbnail_h, T3.user_id, T3.nickname, T3.avatar, T3.comment_num, T3.thumbup_num, T3.created_at " \
5
-                r"from (select * from group_groupuserinfo where user_id='{user_id}' and user_status=1) as T1 " \
6
-                r"left outer join group_groupinfo as T2 on T1.group_id = T2.group_id " \
7
-                r"left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.id > T1.current_id " \
8
-                r"where T3.status = 1 " \
9
-                r"order by DATE(T3.created_at) desc, T3.thumbup_num desc " \
10
-                r"limit {offset}, {rows};"
3
+PAI2_HOME_API = (
4
+    r"select "
5
+    r"T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T3.id, T3.photo_path, T3.photo_w, "
6
+    r"T3.photo_h, T3.photo_thumbnail_path, T3.photo_thumbnail_w, T3.photo_thumbnail_h, T3.user_id, T3.nickname, "
7
+    r"T3.avatar, T3.comment_num, T3.thumbup_num, T3.created_at "
8
+    r"from (select * from group_groupuserinfo where user_id='{user_id}' and user_status=1) as T1 "
9
+    r"left outer join group_groupinfo as T2 on T1.group_id = T2.group_id "
10
+    r"left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.id > T1.current_id "
11
+    r"where T3.status = 1 "
12
+    r"order by DATE(T3.created_at) desc, T3.thumbup_num desc "
13
+    r"limit {offset}, {rows};"
14
+)

chengzhenyu/client - Gogs: Go Git Service

33 Commits (07af16db91f61a14bd814b58d1d0e64474adf8f6)

Autor SHA1 Mensaje Fecha
  chengzhenyu 07af16db91 增加友盟自定义点击事件 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 170698d428 集成友盟统计 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 76b303e45b 升级至1021 %!s(int64=9) %!d(string=hace) años
  chengzhenyu a8e9f111f9 升级至1020 %!s(int64=9) %!d(string=hace) años
  chengzhenyu d3810b20ca 设置集合地点 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 55304369e0 集合图标 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 35bce7eb6b 更换图标 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 7bf4173d82 用户名信息乱码问题 %!s(int64=9) %!d(string=hace) años
  chengzhenyu f9b6061072 每次是导游团页面时,均检查是否赋予了定位权限 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 961d29be2b 每次是导游团页面时,均检查是否赋予了定位权限 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 768c98f72d 升级app版本1019 %!s(int64=9) %!d(string=hace) años
  chengzhenyu e088299b0d 解析调整 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 4abc31b420 地理信息上传逻辑优化 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 4a8bec5157 主页接口逻辑 %!s(int64=9) %!d(string=hace) años
  chengzhenyu d5252a0484 加群逻辑调通 %!s(int64=9) %!d(string=hace) años
  chengzhenyu ba98dcf437 轮播图点击事件 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 1ea0f4dac5 轮播图点击事件 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 47d656cfc9 轮播图占位+电话占位 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 33d1f1f545 轮播图控件插入首页 %!s(int64=9) %!d(string=hace) años
  chengzhenyu c97e9f931c 轮播图控件实现 %!s(int64=9) %!d(string=hace) años
  chengzhenyu c0021c68fa 轮播图控件实现 %!s(int64=9) %!d(string=hace) años
  chengzhenyu b2fd887558 轮播图占位 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 7e01c3bc84 用户地理位置上报 %!s(int64=9) %!d(string=hace) años
  chengzhenyu e0011390ea 用户地理位置上报 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 9d209a677a app定位服务 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 1a96f11b2c 增加高德定位相关 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 6666c09e7a 导游电话记录及按钮显示 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 9d3a441979 扫码加导游群接口逻辑 %!s(int64=9) %!d(string=hace) años
  chengzhenyu c453904559 扫码加入导游团逻辑 %!s(int64=9) %!d(string=hace) años
  chengzhenyu cad440ada1 导游群处理 %!s(int64=9) %!d(string=hace) años
  chengzhenyu bb222981b8 打通导游电话 %!s(int64=9) %!d(string=hace) años
  chengzhenyu 556b4e2426 单次请求量调整为20 %!s(int64=9) %!d(string=hace) años
  chengzhenyu ef030d851f transfer to git %!s(int64=9) %!d(string=hace) años