Add parameter group_id for lensman_photo_upload_api
Brightcells
2 geänderte Dateien mit 16 neuen Zeilen und 12 gelöschten Zeilen
+ 15
- 11
group/lensman_views.py
@@ -24,7 +24,7 @@ from utils.error.response_utils import response |
||
| 24 | 24 |
from utils.message_utils import system_messages |
| 25 | 25 |
from utils.page_utils import pagination |
| 26 | 26 |
from utils.redis.rbrief import set_brief_info |
| 27 |
-from utils.redis.rgroup import get_group_info, set_group_info |
|
| 27 |
+from utils.redis.rgroup import set_group_info |
|
| 28 | 28 |
from utils.redis.rkeys import GROUP_LAST_PHOTO_PK, TODAY_INCOME, TODAY_UPLOAD_PHOTO_AMOUNT, WEEK_INCOME, WEEK_SOLD |
| 29 | 29 |
from utils.redis.rorder import set_lensman_order_record |
| 30 | 30 |
from utils.redis.rprice import get_lensman_price_fixed, set_lensman_price_fixed |
@@ -160,6 +160,7 @@ def lensman_photo_upload_api(request): |
||
| 160 | 160 |
""" |
| 161 | 161 |
user_id = lensman_id = request.POST.get('user_id', '')
|
| 162 | 162 |
nickname = request.POST.get('nickname', '')
|
| 163 |
+ group_id = request.POST.get('group_id', '')
|
|
| 163 | 164 |
session_id = request.POST.get('session_id', '')
|
| 164 | 165 |
|
| 165 | 166 |
photo_id = request.POST.get('photo_id', '')
|
@@ -172,17 +173,20 @@ def lensman_photo_upload_api(request): |
||
| 172 | 173 |
except UserInfo.DoesNotExist: |
| 173 | 174 |
return response(UserStatusCode.USER_NOT_FOUND) |
| 174 | 175 |
|
| 175 |
- # 判断通过 session_id 创建的群组是否存在，如果不存在，则直接创建 |
|
| 176 |
- group, group_created = GroupInfo.objects.get_or_create(session_id=session_id, group_from=GroupInfo.SESSION_GROUP, defaults={
|
|
| 177 |
- 'group_id': CurtailUUID.uuid(GroupInfo, 'group_id'), |
|
| 178 |
- 'admin_id': user_id, |
|
| 179 |
- 'group_name': user.final_nickname, |
|
| 180 |
- 'group_default_avatar': 0, |
|
| 181 |
- }) |
|
| 182 |
- group_id = group.group_id |
|
| 176 |
+ if not group_id: |
|
| 177 |
+ # 判断通过 session_id 创建的群组是否存在，如果不存在，则直接创建 |
|
| 178 |
+ group, group_created = GroupInfo.objects.get_or_create(session_id=session_id, group_from=GroupInfo.SESSION_GROUP, defaults={
|
|
| 179 |
+ 'group_id': CurtailUUID.uuid(GroupInfo, 'group_id'), |
|
| 180 |
+ 'admin_id': user_id, |
|
| 181 |
+ 'group_name': user.final_nickname, |
|
| 182 |
+ 'group_default_avatar': 0, |
|
| 183 |
+ }) |
|
| 184 |
+ |
|
| 185 |
+ # Redis 群组数据缓存 |
|
| 186 |
+ if group_created: |
|
| 187 |
+ set_group_info(group) |
|
| 183 | 188 |
|
| 184 |
- # Redis 群组数据缓存 |
|
| 185 |
- set_group_info(group) if group_created else get_group_info(group_id) |
|
| 189 |
+ group_id = group.group_id |
|
| 186 | 190 |
|
| 187 | 191 |
# # 判断 group_id/user_id 的群组用户是否存在，如果不存在，则直接创建 |
| 188 | 192 |
# group_user_current_id = -1 |
+ 1
- 1
photo/views.py
@@ -20,7 +20,7 @@ from photo.serializers import PhotosInfoSerializer |
||
| 20 | 20 |
from utils.error.errno_utils import LensmanStatusCode, PhotoStatusCode |
| 21 | 21 |
from utils.error.response_utils import response |
| 22 | 22 |
from utils.ip_utils import ip_addr |
| 23 |
-from utils.redis.rgroup import get_group_info, get_group_users_info, set_group_info, set_group_users_info |
|
| 23 |
+from utils.redis.rgroup import get_group_info, set_group_info, set_group_users_info |
|
| 24 | 24 |
from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET, |
| 25 | 25 |
GROUP_USERS_QUIT_SET, GROUP_USERS_REFUSED_SET, UUID_LIST) |
| 26 | 26 |
from utils.redis.ruuid import generate_uuids, update_uuids |