|
@@ -86,7 +86,7 @@ class GatewayFamilyMemberView(View):
|
|
|
items = join_ids.split(',')
|
|
|
for item in items:
|
|
|
family_member_join_qs = FamilyMemberJoin.objects.filter(id=int(item))
|
|
|
- if not family_member_join_qs.exists():
|
|
|
+ if family_member_join_qs.exists():
|
|
|
family_member_join_qs.delete()
|
|
|
return response.json(0)
|
|
|
except Exception as e:
|
|
@@ -365,6 +365,10 @@ class GatewayFamilyMemberView(View):
|
|
|
return response.json(173)
|
|
|
data['msg'] = msg_text
|
|
|
with transaction.atomic():
|
|
|
+ member_join_qs = FamilyMemberJoin.objects.filter(family_id=family_id, user_id=join_user_id)
|
|
|
+ if member_join_qs.exists():
|
|
|
+ member_join_qs.update(updated_time=now_time)
|
|
|
+ return response.json(0)
|
|
|
family_user_join = FamilyMemberJoin.objects.create(family_id=family_id, user_id=join_user_id,
|
|
|
status=0,
|
|
|
updated_time=now_time,
|
|
@@ -421,7 +425,7 @@ class GatewayFamilyMemberView(View):
|
|
|
|
|
|
page_no = int(page_no)
|
|
|
page_size = int(page_size)
|
|
|
- member_join = member_join.order_by('-created_time')[(page_no - 1) * page_size: page_no * page_size]
|
|
|
+ member_join = member_join.order_by('-updated_time')[(page_no - 1) * page_size: page_no * page_size]
|
|
|
if not member_join.exists():
|
|
|
return response.json(0, [])
|
|
|
result = []
|