228 
+        })
229 
+
230 
+    try:
231 
+        group = GroupInfo.objects.get(group_id=group_id)
232 
+    except GroupInfo.DoesNotExist:
233 
+        return JsonResponse({
234 
+            'status': 4020,
235 
+            'message': u'群组不存在',
236 
+        })
237 
+    if group.admin_id != admin_id:
238 
+        return JsonResponse({
239 
+            'status': 40222,
240 
+            'message': u'没有移除权限',
241 
+        })
242 
+
243 
+    try:
244 
+        group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED)
245 
+    except GroupUserInfo.DoesNotExist:
246 
+        return JsonResponse({
247 
+            'status': 4029,
248 
+            'message': u'该用户不在群组',
249 
+        })
250 
+    group_user.user_status = GroupUserInfo.DELETED
251 
+    group_user.deleted_at = tc.utc_datetime()
252 
+    group_user.save()
253 
+
254 
+    return JsonResponse({
255 
+        'status': 200,
256 
+        'message': u'用户移除成功',
257 
+        'data': {
258 
+            'group_id': group_id,
259 
+            'users': group.users(admin_id)
260 
+        },
261 
+    })
262 
+
263 
+
165 264 
 def group_pass_api(request):
166 265 
     group_id = request.POST.get('group_id', '')
167 266 
     admin_id = request.POST.get('admin_id', '')
@@ -191,7 +290,7 @@ def group_pass_api(request):
191 290 
         })
192 291 
     if group.admin_id != admin_id:
193 292 
         return JsonResponse({
194 
-            'status': 4024,
293 
+            'status': 40223,
195 294 
             'message': u'没有通过权限',
196 295 
         })
197 296 
 
@@ -199,7 +298,7 @@ def group_pass_api(request):
199 298 
         group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.APPLYING)
200 299 
     except GroupUserInfo.DoesNotExist:
201 300 
         return JsonResponse({
202 
-            'status': 4027,
301 
+            'status': 4028,
203 302 
             'message': u'加群申请不存在',
204 303 
         })
205 304 
     group_user.user_status = GroupUserInfo.PASSED
@@ -211,7 +310,7 @@ def group_pass_api(request):
211 310 
         'message': u'申请通过成功',
212 311 
         'data': {
213 312 
             'group_id': group_id,
214 
-            'users': group.users(user_id)
313 
+            'users': group.users(admin_id)
215 314 
         },
216 315 
     })
217 316 
 
@@ -245,7 +344,7 @@ def group_refuse_api(request):
245 344 
         })
246 345 
     if group.admin_id != admin_id:
247 346 
         return JsonResponse({
248 
-            'status': 4025,
347 
+            'status': 40224,
249 348 
             'message': u'没有拒绝权限',
250 349 
         })
251 350 
 
@@ -253,7 +352,7 @@ def group_refuse_api(request):
253 352 
         group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.APPLYING)
254 353 
     except GroupUserInfo.DoesNotExist:
255 354 
         return JsonResponse({
256 
-            'status': 4027,
355 
+            'status': 4028,
257 356 
             'message': u'加群申请不存在',
258 357 
         })
259 358 
     group_user.user_status = GroupUserInfo.REFUSED
@@ -265,7 +364,7 @@ def group_refuse_api(request):
265 364 
         'message': u'申请拒绝成功',
266 365 
         'data': {
267 366 
             'group_id': group_id,
268 
-            'users': group.users(user_id)
367 
+            'users': group.users(admin_id)
269 368 
         },
270 369 
     })
271 370

+ 1 - 1
requirements.txt
Voir le fichier 

@@ -1,7 +1,7 @@
1 1 
 CodeConvert==2.0.3
2 2 
 Django==1.8.4
3 3 
 MySQL-python==1.2.5
4 
-TimeConvert==1.1.3
4 
+TimeConvert==1.1.6
5 5 
 django-curtail-uuid==1.0.0
6 6 
 django-multidomain==1.1.4
7 7 
 django-shortuuidfield==0.1.3

kodo - Gogs: Go Git Service
Начало Разгледай Помощ
Регистриране Влизане
Kodo
/
kodo
Следи 2
Харесвам 0
Разклонение 0
Проблеми 0 Заявки за сливане 0 Ревизии 1804 Издания 0

Няма описание

ZIP TAR.GZ

0005_auto_20190828_0511.py 928B
История Суров 

    # -*- coding: utf-8 -*-
# Generated by Django 1.11.23 on 2019-08-27 21:11
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

    dependencies = [
        ('sales', '0004_auto_20190826_1808'),
    ]

    operations = [
        migrations.AddField(
            model_name='salesresponsibilityinfomodelssalestatisticinfo',
            name='sr_id',
            field=models.CharField(blank=True, db_index=True, help_text='\u9500\u552e\u62c5\u5f53\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='sr_id'),
        ),
        migrations.AlterField(
            model_name='supersalesresponsibilityinfomodelssalestatisticinfo',
            name='sr_id',
            field=models.CharField(blank=True, db_index=True, help_text='\u9500\u552e\u62c5\u5f53\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='sr_id'),
        ),
    ]