@@ -46,12 +46,13 @@ def tg_group_create_api(request): |
||
46 | 46 |
|
47 | 47 |
# 旅行团校验 |
48 | 48 |
if GroupInfo.objects.filter( |
49 |
- admin_id=user_id, |
|
49 |
+ # admin_id=user_id, |
|
50 |
+ group_id=get_tour_guide_own_group(user_id), |
|
50 | 51 |
group_closed=False, |
51 | 52 |
status=True, |
52 | 53 |
ended_at__gt=tc.utc_datetime(), |
53 | 54 |
).exists(): |
54 |
- return response(GroupStatusCode.COULD_HAVE_ONLY_ONE_ACTIVE_GROUP) |
|
55 |
+ return response(GroupStatusCode.ONLY_ONE_ACTIVE_GROUP_ALLOWED) |
|
55 | 56 |
|
56 | 57 |
# 群组唯一标识 |
57 | 58 |
group_id = CurtailUUID.uuid(GroupInfo, 'group_id') |
@@ -312,6 +313,10 @@ def tg_group_transfer_api(request): |
||
312 | 313 |
user_id = request.POST.get('user_id', '') |
313 | 314 |
token = request.POST.get('token', '') |
314 | 315 |
|
316 |
+ # 被转移用户是否已经有群 |
|
317 |
+ if get_tour_guide_own_group(user_id): |
|
318 |
+ return response(GroupStatusCode.ONLY_ONE_ACTIVE_GROUP_ALLOWED) |
|
319 |
+ |
|
315 | 320 |
# 获取旅行团唯一标识 |
316 | 321 |
group_id = get_tour_guide_own_group(admin_id) |
317 | 322 |
|
@@ -77,7 +77,7 @@ class GroupStatusCode(BaseStatusCode): |
||
77 | 77 |
JOIN_REQUEST_NOT_FOUND = StatusCodeField(402031, 'Join Request Not Found', description=u'加群申请不存在') |
78 | 78 |
# 旅行团 |
79 | 79 |
GROUP_HAS_ENDED = StatusCodeField(402040, 'Group Has Ended', description=u'群组已结束') |
80 |
- COULD_HAVE_ONLY_ONE_ACTIVE_GROUP = StatusCodeField(402041, 'Could Have Only One Active Group', description=u'只能创建一个活跃团') |
|
80 |
+ ONLY_ONE_ACTIVE_GROUP_ALLOWED = StatusCodeField(402041, 'Only One Active Group Allowed', description=u'只能创建一个活跃团') |
|
81 | 81 |
|
82 | 82 |
|
83 | 83 |
class GroupUserStatusCode(BaseStatusCode): |