Huis Verkennen Help
Registreer Inloggen
Pai2
/
pai2
Volgen 2
Ster 0
Vork 0

Bladeren bron
Add total_persons for GroupInfo

Brightcells 8 jaren geleden
bovenliggende
dd05cee84f
commit
034acddb68
4 gewijzigde bestanden met toevoegingen van 42 en 8 verwijderingen
Toon Diff Stats
  1. 28 0
      group/migrations/0026_auto_20161216_1301.py
  2. 3 2
      group/models.py
  3. 5 0
      group/tourguidegroup_views.py
  4. 6 6
      group/tourguidegroupuser_views.py

+ 28 - 0
group/migrations/0026_auto_20161216_1301.py
Bestand weergeven 

@@ -0,0 +1,28 @@
1 
+# -*- coding: utf-8 -*-
2 
+from __future__ import unicode_literals
3 
+
4 
+from django.db import models, migrations
5 
+
6 
+
7 
+class Migration(migrations.Migration):
8 
+
9 
+    dependencies = [
10 
+        ('group', '0025_auto_20161214_1659'),
11 
+    ]
12 
+
13 
+    operations = [
14 
+        migrations.RemoveField(
15 
+            model_name='groupuserinfo',
16 
+            name='relative_person',
17 
+        ),
18 
+        migrations.AddField(
19 
+            model_name='groupinfo',
20 
+            name='total_persons',
21 
+            field=models.IntegerField(default=1, help_text='\u65c5\u6e38\u56e2\u603b\u4eba\u6570', verbose_name='total_persons'),
22 
+        ),
23 
+        migrations.AddField(
24 
+            model_name='groupuserinfo',
25 
+            name='relative_persons',
26 
+            field=models.IntegerField(default=1, help_text='\u5173\u8054\u4eba\u6570', verbose_name='relative_persons'),
27 
+        ),
28 
+    ]

+ 3 - 2
group/models.py
Bestand weergeven 

@@ -41,6 +41,7 @@ class GroupInfo(CreateUpdateMixin):
41 41 
     phone = models.CharField(_(u'phone'), max_length=255, blank=True, null=True, help_text=u'导游电话')
42 42 
     started_at = models.DateTimeField(_(u'started_at'), blank=True, null=True, help_text=_(u'旅游团开始时间'))
43 43 
     ended_at = models.DateTimeField(_(u'ended_at'), blank=True, null=True, help_text=_(u'旅游团结束时间'))
44 
+    total_persons = models.IntegerField(_(u'total_persons'), default=1, help_text=u'旅游团总人数')
44 45 
     group_closed = models.BooleanField(_(u'group_closed'), default=False, help_text=u'旅游团关闭')
45 46 
     gather_at = models.DateTimeField(_(u'gather_at'), blank=True, null=True, help_text=_(u'旅游团集合时间'))
46 47 
     gather_lon = models.FloatField(_(u'gather_lon'), blank=True, null=True, help_text=_(u'旅游团集合经度'))
 
@@ -134,7 +135,7 @@ class GroupUserInfo(CreateUpdateMixin):
134 135 
     subadmin = models.BooleanField(_(u'subadmin'), default=False, help_text=u'副群组管理员')
135 136 
     name = models.CharField(_(u'name'), max_length=255, blank=True, null=True, help_text=u'用户姓名')
136 137 
     phone = models.CharField(_(u'phone'), max_length=255, blank=True, null=True, help_text=u'用户电话')
137 
-    relative_person = models.IntegerField(_(u'relative_person'), default=1, help_text=u'关联人数')
138 
+    relative_persons = models.IntegerField(_(u'relative_persons'), default=1, help_text=u'关联人数')
138 139 
     remark = models.CharField(_(u'remark'), max_length=255, blank=True, null=True, help_text=u'备注')
139 140
140 141 
     class Meta:
 
@@ -154,7 +155,7 @@ class GroupUserInfo(CreateUpdateMixin):
154 155 
             'subadmin': self.subadmin,
155 156 
             'name': self.name,
156 157 
             'phone': self.phone,
157 
-            'relative_person': self.relative_person,
158 
+            'relative_persons': self.relative_persons,
158 159 
             'remark': self.remark,
159 160 
         }
160 161

+ 5 - 0
group/tourguidegroup_views.py
Bestand weergeven 

@@ -37,6 +37,7 @@ def tg_group_create_api(request):
37 37 
     group_default_avatar = int(request.POST.get('group_default_avatar', 0))
38 38 
     started_at = tc.utc_string_to_utc_datetime(request.POST.get('started_at', ''))  # UTC, %Y-%m-%dT%H:%M:%SZ
39 39 
     ended_at = tc.utc_string_to_utc_datetime(request.POST.get('ended_at', ''))  # UTC, %Y-%m-%dT%H:%M:%SZ
40 
+    total_persons = request.POST.get('total_persons', '')
40 41
41 42 
     # 用户校验
42 43 
     try:
 
@@ -71,6 +72,7 @@ def tg_group_create_api(request):
71 72 
         phone=user.phone,
72 73 
         started_at=started_at,
73 74 
         ended_at=ended_at,
75 
+        total_persons=total_persons,
74 76 
     )
75 77
76 78 
     # Redis 群组数据缓存
 
@@ -136,6 +138,7 @@ def tg_group_update_api(request):
136 138
137 139 
     started_at = tc.utc_string_to_utc_datetime(request.POST.get('started_at', ''))  # UTC, %Y-%m-%dT%H:%M:%SZ
138 140 
     ended_at = tc.utc_string_to_utc_datetime(request.POST.get('ended_at', ''))  # UTC, %Y-%m-%dT%H:%M:%SZ
141 
+    total_persons = request.POST.get('total_persons', '')
139 142
140 143 
     # 群组校验
141 144 
     try:
 
@@ -166,6 +169,8 @@ def tg_group_update_api(request):
166 169 
         group.started_at = started_at
167 170 
     if ended_at:
168 171 
         group.ended_at = ended_at
172 
+    if total_persons:
173 
+        group.total_persons = total_persons
169 174 
     group.save()
170 175
171 176 
     # Redis 群组数据缓存更新

+ 6 - 6
group/tourguidegroupuser_views.py
Bestand weergeven 

@@ -36,7 +36,7 @@ def tgu_group_user_join_api(request):
36 36
37 37 
     name = request.POST.get('name', '')
38 38 
     phone = request.POST.get('phone', '')
39 
-    relative_person = request.POST.get('relative_person', '')
39 
+    relative_persons = request.POST.get('relative_persons', '')
40 40 
     remark = request.POST.get('remark', '')
41 41
42 42 
     # 获取旅行团唯一标识
 
@@ -65,7 +65,7 @@ def tgu_group_user_join_api(request):
65 65 
         defaults={
66 66 
             'name': name,
67 67 
             'phone': phone,
68 
-            'relative_person': relative_person,
68 
+            'relative_persons': relative_persons,
69 69 
             'remark': remark,
70 70 
         }
71 71 
     )
 
@@ -73,7 +73,7 @@ def tgu_group_user_join_api(request):
73 73 
     if not created:
74 74 
         group_user.name = name
75 75 
         group_user.phone = phone
76 
-        group_user.relative_person = relative_person
76 
+        group_user.relative_persons = relative_persons
77 77 
         group_user.remark = remark
78 78 
         group_user.save()
79 79 
 
@@ -121,7 +121,7 @@ def tgu_group_user_update_api(request):
121 121
122 122 
     name = request.POST.get('name', '')
123 123 
     phone = request.POST.get('phone', '')
124 
-    relative_person = request.POST.get('relative_person', '')
124 
+    relative_persons = request.POST.get('relative_persons', '')
125 125 
     remark = request.POST.get('remark', '')
126 126
127 127 
     # 群组校验
 
@@ -145,8 +145,8 @@ def tgu_group_user_update_api(request):
145 145 
         group_user.name = name
146 146 
     if phone:
147 147 
         group_user.phone = phone
148 
-    if relative_person:
149 
-        group_user.relative_person = relative_person
148 
+    if relative_persons:
149 
+        group_user.relative_persons = relative_persons
150 150 
     if remark:
151 151 
         group_user.remark = remark
152 152 
     group_user.save()