|
|
@@ -104,9 +104,16 @@ def session_join_api(request):
|
104
|
104
|
""" Session 详情 """
|
105
|
105
|
user_id = request.POST.get('user_id', '')
|
106
|
106
|
session_id = request.POST.get('session_id', '')
|
|
107
|
+ lensman_id = request.POST.get('lensman_id', '')
|
107
|
108
|
nickname = request.POST.get('nickname', '')
|
108
|
109
|
current_id = -1
|
109
|
110
|
|
|
111
|
+ # 摄影师校验
|
|
112
|
+ try:
|
|
113
|
+ lensman = UserInfo.objects.get(user_id=lensman_id)
|
|
114
|
+ except UserInfo.DoesNotExist:
|
|
115
|
+ return response(LensmanStatusCode.LENSMAN_NOT_FOUND)
|
|
116
|
+
|
110
|
117
|
# 判断 user_id 是否存在,如果不存在,则直接分配帐户
|
111
|
118
|
user, user_created = UserInfo.objects.get_or_create(user_id=user_id, defaults={
|
112
|
119
|
'user_id': CurtailUUID.uuid(UserInfo, 'user_id'),
|
|
|
@@ -119,8 +126,8 @@ def session_join_api(request):
|
119
|
126
|
# 判断通过 session_id 创建的群组是否存在,如果不存在,则直接创建
|
120
|
127
|
group, group_created = GroupInfo.objects.get_or_create(session_id=session_id, group_from=GroupInfo.SESSION_GROUP, defaults={
|
121
|
128
|
'group_id': CurtailUUID.uuid(GroupInfo, 'group_id'),
|
122
|
|
- 'admin_id': user_id,
|
123
|
|
- 'group_name': user.final_nickname,
|
|
129
|
+ 'admin_id': lensman_id,
|
|
130
|
+ 'group_name': lensman.final_nickname,
|
124
|
131
|
'group_default_avatar': 0,
|
125
|
132
|
})
|
126
|
133
|
group_id = group.group_id
|
|
|
@@ -158,7 +165,7 @@ def session_join_api(request):
|
158
|
165
|
photos = PhotosInfo.objects.filter(session_id=session_id, status=True)
|
159
|
166
|
|
160
|
167
|
# 获取摄影师定价
|
161
|
|
- price_info = get_lensman_price_fixed(user_id)
|
|
168
|
+ price_info = get_lensman_price_fixed(lensman_id)
|
162
|
169
|
|
163
|
170
|
group_photo = None
|
164
|
171
|
for photo in photos:
|
|
|
@@ -167,9 +174,9 @@ def session_join_api(request):
|
167
|
174
|
# 群组照片记录创建
|
168
|
175
|
group_photo = GroupPhotoInfo.objects.create(
|
169
|
176
|
group_id=group_id,
|
170
|
|
- user_id=user_id,
|
171
|
|
- nickname=user.final_nickname,
|
172
|
|
- avatar=user.avatar,
|
|
177
|
+ user_id=lensman_id,
|
|
178
|
+ nickname=lensman.final_nickname,
|
|
179
|
+ avatar=lensman.avatar,
|
173
|
180
|
photo_path=photo_info.photo_path,
|
174
|
181
|
photo_w=photo_info.photo_w,
|
175
|
182
|
photo_h=photo_info.photo_h,
|