l-4"> 69 
-            'started_at': self.started_at.replace(microsecond=0),
70 
-            'ended_at': self.ended_at.replace(microsecond=0),
71 
-            'gather_at': self.gather_at.replace(microsecond=0),
72 
+            'name': self.name,
73 
+            'phone': self.phone,
74 
+            'started_at': tc.remove_microsecond(self.started_at),
75 
+            'ended_at': tc.remove_microsecond(self.ended_at),
76 
+            'gather_at': tc.remove_microsecond(self.gather_at),
72 77 
             'gather_lon': self.gather_lon,
73 78 
             'gather_lat': self.gather_lat,
74 
-            'created_at': self.created_at.replace(microsecond=0),
79 
+            'created_at': tc.remove_microsecond(self.created_at),
75 80 
         }
76 81
77 82 
     def users(self, admin=True, user_id=None):
@@ -125,7 +130,7 @@ class GroupUserInfo(CreateUpdateMixin):
125 130 
     refused_at = models.DateTimeField(_(u'refused_at'), blank=True, null=True, help_text=_(u'拒绝时间'))
126 131 
     deleted_at = models.DateTimeField(_(u'deleted_at'), blank=True, null=True, help_text=_(u'删除时间'))
127 132 
     quit_at = models.DateTimeField(_(u'quit_at'), blank=True, null=True, help_text=_(u'退出时间'))
128 
-    # 导游团相关
133 
+    # 旅行团相关
129 134 
     subadmin = models.BooleanField(_(u'subadmin'), default=False, help_text=u'副群组管理员')
130 135 
     name = models.CharField(_(u'name'), max_length=255, blank=True, null=True, help_text=u'用户姓名')
131 136 
     phone = models.CharField(_(u'phone'), max_length=255, blank=True, null=True, help_text=u'用户电话')
@@ -321,7 +326,7 @@ class PhotoCommentInfo(CreateUpdateMixin):
321 326 
             'avatar': self.avatar,
322 327 
             'to_uid': self.to_uid,
323 328 
             'comment': self.comment,
324 
-            'created_at': self.created_at.replace(microsecond=0),
329 
+            'created_at': tc.remove_microsecond(self.created_at),
325 330 
         }
326 331
327 332

+ 16 - 14
group/tourguidegroup_views.py
Преглед на файла 

@@ -26,7 +26,7 @@ r = settings.REDIS_CACHE
26 26 
 @logit
27 27 
 def tg_group_create_api(request):
28 28 
     """
29 
-    导游团创建
29 
+    旅行团创建
30 30 
     :param request:
31 31 
     :return:
32 32 
     """
 
@@ -46,7 +46,7 @@ def tg_group_create_api(request):
46 46 
     if not user.istourguide:
47 47 
         return response(GroupStatusCode.NOT_GROUP_ADMIN)
48 48
49 
-    # 导游团校验
49 
+    # 旅行团校验
50 50 
     if GroupInfo.objects.filter(
51 51 
         admin_id=user_id,
52 52 
         group_closed=False,
 
@@ -65,6 +65,8 @@ def tg_group_create_api(request):
65 65 
         group_name=group_name,
66 66 
         group_default_avatar=group_default_avatar,
67 67 
         group_from=GroupInfo.TOURGUIDE_GROUP,
68 
+        name=user.name,
69 
+        phone=user.phone,
68 70 
         started_at=started_at,
69 71 
         ended_at=ended_at,
70 72 
     )
 
@@ -87,10 +89,10 @@ def tg_group_create_api(request):
87 89 
     # Redis 群组用户数据缓存
88 90 
     group_users = set_group_users_info(group)
89 91
90 
-    # Redis 设置导游拥有的导游团
92 
+    # Redis 设置导游拥有的旅行团
91 93 
     set_tour_guide_own_group(user_id, group_id)
92 94
93 
-    return response(200, 'Create Tour Guide Group Success', u'导游团创建成功', {
95 
+    return response(200, 'Create Tour Guide Group Success', u'旅行团创建成功', {
94 96 
         'group_id': group_id,
95 97 
         'group': group_info,
96 98 
         'users': group_users,
 
@@ -100,14 +102,14 @@ def tg_group_create_api(request):
100 102 
 @logit
101 103 
 def tg_group_detail_api(request):
102 104 
     """
103 
-    导游团详情
105 
+    旅行团详情
104 106 
     :param request:
105 107 
     :return:
106 108 
     """
107 109 
     group_id = request.POST.get('group_id', '')
108 110 
     user_id = request.POST.get('user_id', '')
109 111
110 
-    return response(200, 'Get Tour Guide　Group Detail Info Success', u'获取导游团详情成功', {
112 
+    return response(200, 'Get Tour Guide　Group Detail Info Success', u'获取旅行团详情成功', {
111 113 
         'group_id': group_id,
112 114 
         'group': get_group_info(group_id),
113 115 
         'users': get_group_users_info(group_id, user_id),
 
@@ -117,7 +119,7 @@ def tg_group_detail_api(request):
117 119 
 @logit
118 120 
 def tg_group_update_api(request):
119 121 
     """
120 
-    导游团更新
122 
+    旅行团更新
121 123 
     :param request:
122 124 
     :return:
123 125 
     """
 
@@ -128,8 +130,8 @@ def tg_group_update_api(request):
128 130
129 131 
     group_avatar = request.FILES.get('group_avatar', '')
130 132
131 
-    started_at = request.POST.get('started_at', '')
132 
-    ended_at = request.POST.get('ended_at', '')
133 
+    started_at = request.POST.get('started_at', '')  # UTC, %Y-%m-%dT%H:%M:%SZ
134 
+    ended_at = request.POST.get('ended_at', '')  # UTC, %Y-%m-%dT%H:%M:%SZ
133 135
134 136 
     # 群组校验
135 137 
     try:
 
@@ -173,7 +175,7 @@ def tg_group_update_api(request):
173 175 
 @logit
174 176 
 def tg_group_close_api(request):
175 177 
     """
176 
-    导游团关闭
178 
+    旅行团关闭
177 179 
     :param request:
178 180 
     :return:
179 181 
     """
 
@@ -198,19 +200,19 @@ def tg_group_close_api(request):
198 200 
     # Redis 群组数据缓存更新
199 201 
     set_group_info(group)
200 202
201 
-    return response(200, u'Close Tour Guide Group Success', u'导游团关闭成功')
203 
+    return response(200, u'Close Tour Guide Group Success', u'旅行团关闭成功')
202 204
203 205
204 206 
 @logit
205 207 
 def tg_group_gather_start_api(request):
206 208 
     """
207 
-    导游团设置集合时间和地点
209 
+    旅行团设置集合时间和地点
208 210 
     :param request:
209 211 
     :return:
210 212 
     """
211 213 
     group_id = request.POST.get('group_id', '')
212 214 
     admin_id = request.POST.get('admin_id', '') or request.POST.get('user_id', '')
213 
-    gather_at = request.POST.get('gather_at', '')
215 
+    gather_at = request.POST.get('gather_at', '')  # UTC, %Y-%m-%dT%H:%M:%SZ
214 216 
     gather_lon = request.POST.get('lon', '')  # 经度
215 217 
     gather_lat = request.POST.get('lat', '')  # 纬度
216 218 
 
@@ -236,4 +238,4 @@ def tg_group_gather_start_api(request):
236 238 
     # 更新Session
237 239 
     r.set(TOUR_GUIDE_GROUP_CUR_SESSION, shortuuid.uuid())
238 240
239 
-    return response(200, u'Set Tour Guide Group Gather Info Success', u'设置导游团集合信息成功')
241 
+    return response(200, u'Set Tour Guide Group Gather Info Success', u'设置旅行团集合信息成功')

+ 7 - 7
group/tourguidegroupuser_views.py
Преглед на файла 

@@ -26,7 +26,7 @@ r = settings.REDIS_CACHE
26 26 
 @logit
27 27 
 def tgu_group_user_join_api(request):
28 28 
     """
29 
-    导游团用户加群
29 
+    旅行团用户加群
30 30 
     :param request:
31 31 
     :return:
32 32 
     """
 
@@ -34,7 +34,7 @@ def tgu_group_user_join_api(request):
34 34 
     user_id = request.POST.get('user_id', '')
35 35 
     nickname = request.POST.get('nickname', '')
36 36
37 
-    # 获取导游团唯一标识
37 
+    # 获取旅行团唯一标识
38 38 
     group_id = get_tour_guide_own_group(admin_id)
39 39
40 40 
     # 用户校验
 
@@ -92,7 +92,7 @@ def tgu_group_user_join_api(request):
92 92 
 @logit
93 93 
 def tgu_group_user_update_api(request):
94 94 
     """
95 
-    导游团用户更新
95 
+    旅行团用户更新
96 96 
     :param request:
97 97 
     :return:
98 98 
     """
 
@@ -141,7 +141,7 @@ def tgu_group_user_update_api(request):
141 141 
 @logit
142 142 
 def tgu_group_user_locations_api(request):
143 143 
     """
144 
-    导游团所有用户位置信息
144 
+    旅行团所有用户位置信息
145 145 
     :param request:
146 146 
     :return:
147 147 
     """
 
@@ -152,7 +152,7 @@ def tgu_group_user_locations_api(request):
152 152 
     if not GroupUserInfo.objects.filter(group_id=group_id, user_id=admin_id, subadmin=True, status=True).exists():
153 153 
         return response(GroupStatusCode.NO_LOCATION_PERMISSION)
154 154
155 
-    return response(200, 'Get Tour Guide Group All User Location Success', u'获取导游团用户地理位置信息成功', {
155 
+    return response(200, 'Get Tour Guide Group All User Location Success', u'获取旅行团用户地理位置信息成功', {
156 156 
         'group_id': group_id,
157 157 
         'locations': r.georadius(TOUR_GUIDE_GROUP_GEO_INFO % group_id, 0, 0, '+inf', unit='m', withdist=True, withcoord=True, sort='ASC')
158 158 
         # 'locations': [['x', 0.33, (2.68220901489e-06, 1.26736058093e-06)]]
 
@@ -162,7 +162,7 @@ def tgu_group_user_locations_api(request):
162 162 
 @logit
163 163 
 def tgu_group_user_location_api(request):
164 164 
     """
165 
-    导游团单个用户位置信息
165 
+    旅行团单个用户位置信息
166 166 
     :param request:
167 167 
     :return:
168 168 
     """
 
@@ -177,7 +177,7 @@ def tgu_group_user_location_api(request):
177 177 
     session_id = r.get(TOUR_GUIDE_GROUP_CUR_SESSION % group_id)
178 178 
     locations = r.lrange(TOUR_GUIDE_GROUP_USER_GEO_LIST % (group_id, session_id, user_id), 0, -1)
179 179
180 
-    return response(200, 'Get Tour Guide Group User Location Success', u'获取导游团用户地理位置信息成功', {
180 
+    return response(200, 'Get Tour Guide Group User Location Success', u'获取旅行团用户地理位置信息成功', {
181 181 
         'group_id': group_id,
182 182 
         'user_id': user_id,
183 183 
         'locations': [json.loads(loc) for loc in locations]

+ 2 - 1
message/models.py
Преглед на файла 

@@ -3,6 +3,7 @@
3 3 
 from django.conf import settings
4 4 
 from django.db import models
5 5 
 from django.utils.translation import ugettext_lazy as _
6 
+from TimeConvert import TimeConvert as tc
6 7
7 8 
 from group.models import GroupPhotoInfo
8 9 
 from pai2.basemodels import CreateUpdateMixin
 
@@ -72,7 +73,7 @@ class UserMessageInfo(CreateUpdateMixin):
72 73 
             'msg_title': self.msg_title,
73 74 
             'msg_content': self.msg_content,
74 75 
             'read': self.read,
75 
-            'created_at': self.created_at.replace(microsecond=0),
76 
+            'created_at': tc.remove_microsecond(self.created_at),
76 77 
         }
77 78
78 79

+ 3 - 2
pay/models.py
Преглед на файла 

@@ -3,6 +3,7 @@
3 3 
 from django.db import models
4 4 
 from django.utils.translation import ugettext_lazy as _
5 5 
 from shortuuidfield import ShortUUIDField
6 
+from TimeConvert import TimeConvert as tc
6 7
7 8 
 from group.models import GroupPhotoInfo
8 9 
 from pai2.basemodels import CreateUpdateMixin
 
@@ -96,8 +97,8 @@ class OrderInfo(CreateUpdateMixin):
96 97 
             'body': self.body,
97 98 
             'total_fee': self.total_fee,
98 99 
             'pay_status': self.pay_status,
99 
-            'paid_at': self.paid_at and self.paid_at.replace(microsecond=0),
100 
-            'created_at': self.created_at.replace(microsecond=0),
100 
+            'paid_at': tc.remove_microsecond(self.paid_at),
101 
+            'created_at': tc.remove_microsecond(self.created_at),
101 102 
         }
102 103
103 104 
     @property

+ 1 - 1
utils/error/errno_utils.py
Преглед на файла 

@@ -80,7 +80,7 @@ class GroupUserStatusCode(BaseStatusCode):
80 80 
     GROUP_USER_NOT_FOUND = StatusCodeField(402101, u'Group User Not Found', description=u'群组用户不存在')
81 81 
     GROUP_USER_HAS_DELETED = StatusCodeField(402102, u'Group User Has Deleted', description=u'群组用户被移除')
82 82
83 
-    USER_HAS_NOT_JOIN_GROUP = StatusCodeField(402131, u'User Has Not Join Group', description=u'用户未加入导游团')
83 
+    USER_HAS_NOT_JOIN_GROUP = StatusCodeField(402131, u'User Has Not Join Group', description=u'用户未加入旅行团')
84 84
85 85
86 86 
 class GroupPhotoStatusCode(BaseStatusCode):

+ 2 - 2
utils/redis/rkeys.py
Преглед на файла 

@@ -11,8 +11,8 @@ TOUR_GUIDE_GROUP_GEO_INFO = 'tour:guide:group:geo:info:%s'  # ZSET，旅游团
11 11 
 TOUR_GUIDE_GROUP_CUR_SESSION = 'tour:guide:group:cur:session:%s'  # STRING，旅游团当前Session，group_id，导游设置集合时间的时候更新
12 12 
 TOUR_GUIDE_GROUP_USER_GEO_LIST = 'tour:guide:group:user:geo:list:%s:%s:%s'  # LIST，旅游团当前用户地理位置列表，group_id、session_id、user_id
13 13
14 
-TOUR_GUIDE_GROUP_USER_OWN = 'tour:guide:group:user:own:%s'  # STRING，导游当前拥有的导游团，user_id，导游创建导游团的时候更新
15 
-TOUR_GUIDE_GROUP_USER_BELONG = 'tour:guide:group:user:belong:%s'  # STRING，用户当前所属导游团，user_id，用户加入导游团的时候更新
14 
+TOUR_GUIDE_GROUP_USER_OWN = 'tour:guide:group:user:own:%s'  # STRING，导游当前拥有的旅行团，user_id，导游创建旅行团的时候更新
15 
+TOUR_GUIDE_GROUP_USER_BELONG = 'tour:guide:group:user:belong:%s'  # STRING，用户当前所属旅行团，user_id，用户加入旅行团的时候更新
16 16
17 17 
 # 群组相关
18 18 
 GROUP_INFO = 'group:info:%s'  # STRING，群组信息，group_id

+ 2 - 2
utils/redis/rtourguide.py
Преглед на файла 

@@ -12,10 +12,10 @@ r = settings.REDIS_CACHE
12 12
13 13
14 14 
 def set_tour_guide_own_group(user_id, group_id):
15 
-    """ 设置导游拥有的导游团 """
15 
+    """ 设置导游拥有的旅行团 """
16 16 
     r.set(TOUR_GUIDE_GROUP_USER_OWN % user_id, group_id)
17 17
18 18
19 19 
 def get_tour_guide_own_group(user_id):
20 
-    """ 获取导游拥有的导游团 """
20 
+    """ 获取导游拥有的旅行团 """
21 21 
     return r.get(TOUR_GUIDE_GROUP_USER_OWN % user_id)

:art: Support activity_contribute · deb2b19881 - Gogs: Go Git Service
Главная Обзор Помощь
Зарегистрироваться Войти
Kodo
/
kodo
Следить 2
В избранное 0
Ответвить 0

Просмотр исходного кода
:art: Support activity_contribute

huangqimin001 лет %!s(int64=3): %!d(string=назад)
Родитель
d169cce602
Сommit
deb2b19881
5 измененных файлов с 118 добавлено и 17 удалено
Показать статистику Diff
  1. 33 2
      api/member_views.py
  2. 2 0
      api/urls.py
  3. 9 2
      member/admin.py
  4. 38 0
      member/migrations/0035_memberactivitycontributioninfo.py
  5. 36 13
      member/models.py

+ 33 - 2
api/member_views.py
Просмотреть файл 

@@ -15,8 +15,8 @@ from TimeConvert import TimeConvert as tc
15 15
16 16 
 from account.models import UserInfo
17 17 
 from coupon.models import UserCouponInfo
18 
-from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityGroupShareInfo, MemberActivityInfo,
19 
-                           MemberActivitySigninInfo, MemberActivitySignupInfo, RightInfo)
18 
+from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityContributionInfo, MemberActivityGroupShareInfo,
19 
+                           MemberActivityInfo, MemberActivitySigninInfo, MemberActivitySignupInfo, RightInfo)
20 20 
 from utils.error.errno_utils import (MemberActivityStatusCode, MemberCouponStatusCode, MemberGoodStatusCode,
21 21 
                                      MemberRightStatusCode, UserStatusCode)
22 22 
 from utils.redis.connect import r
 
@@ -508,3 +508,34 @@ def activity_group_share(request):
508 508 
         return response(400002, 'Activity has been offline', '会员活动已下线')
509 509
510 510 
     return response()
511 
+
512 
+
513 
+@logit
514 
+def activity_contribute(request):
515 
+    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
516 
+    user_id = request.POST.get('user_id', '')
517 
+    activity_id = request.POST.get('activity_id')
518 
+    content_type = get_query_value(request, 'content_type', val_cast_type='int')
519 
+    title = request.POST.get('title', '')
520 
+    content = request.POST.get('content', '')
521 
+    images = get_query_value(request, 'images', val_cast_type='listjson')
522 
+
523 
+    # 校验用户是否存在
524 
+    try:
525 
+        UserInfo.objects.get(user_id=user_id)
526 
+    except UserInfo.DoesNotExist:
527 
+        return response(UserStatusCode.USER_NOT_FOUND)
528 
+
529 
+    contribution = MemberActivityContributionInfo.objects.create(
530 
+        brand_id=brand_id,
531 
+        user_id=user_id,
532 
+        activity_id=activity_id,
533 
+        content_type=content_type,
534 
+        title=title,
535 
+        content=content,
536 
+        images=images,
537 
+    )
538 
+
539 
+    return response(data={
540 
+        'contribution': contribution.data,
541 
+    })

+ 2 - 0
api/urls.py
Просмотреть файл 

@@ -228,6 +228,8 @@ urlpatterns += [
228 228
229 229 
     url(r'^member/activity/group_share$', member_views.activity_group_share, name='member_activity_group_share'),
230 230
231 
+    url(r'^member/activity/contribute$', member_views.activity_contribute, name='member_activity_contribute'),
232 
+
231 233 
     url(r'^rights$', member_views.rights, name='rights'),
232 234 
     url(r'^right/detail$', member_views.right_detail, name='right_detail'),
233 235 
     url(r'^goods$', member_views.goods, name='goods'),

+ 9 - 2
member/admin.py
Просмотреть файл 

@@ -5,8 +5,9 @@ from django.contrib import admin
5 5 
 from django_admin import DeleteModelAdmin
6 6
7 7 
 from account.models import UserInfo
8 
-from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityGroupShareInfo, MemberActivityInfo,
9 
-                           MemberActivitySigninInfo, MemberActivitySignupInfo, RightInfo, ShotTypeInfo)
8 
+from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityContributionInfo, MemberActivityGroupShareInfo,
9 
+                           MemberActivityInfo, MemberActivitySigninInfo, MemberActivitySignupInfo, RightInfo,
10 
+                           ShotTypeInfo)
10 11 
 from pre.custom_message import sendwxasubscribemessage
11 12 
 from utils.redis.rshot import update_member_shot_data
12 13 
 
@@ -97,6 +98,11 @@ class MemberActivityGroupShareInfoAdmin(admin.ModelAdmin):
97 98 
     list_filter = ('is_integral', 'status')
98 99
99 100
101 
+class MemberActivityContributionInfoAdmin(admin.ModelAdmin):
102 
+    list_display = ('contribution_id', 'activity_id', 'content_type', 'title', 'content', 'images', 'status', 'created_at', 'updated_at')
103 
+    list_filter = ('activity_id', 'content_type', 'status')
104 
+
105 
+
100 106 
 admin.site.register(GoodsInfo, GoodsInfoAdmin)
101 107 
 admin.site.register(GoodsOrderInfo, GoodsOrderInfoAdmin)
102 108 
 admin.site.register(RightInfo, RightInfoAdmin)
 
@@ -105,3 +111,4 @@ admin.site.register(MemberActivityInfo, MemberActivityInfoAdmin)
105 111 
 admin.site.register(MemberActivitySignupInfo, MemberActivitySignupInfoAdmin)
106 112 
 admin.site.register(MemberActivitySigninInfo, MemberActivitySigninInfoAdmin)
107 113 
 admin.site.register(MemberActivityGroupShareInfo, MemberActivityGroupShareInfoAdmin)
114 
+admin.site.register(MemberActivityContributionInfo, MemberActivityContributionInfoAdmin)

+ 38 - 0
member/migrations/0035_memberactivitycontributioninfo.py
Просмотреть файл 

@@ -0,0 +1,38 @@
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 3.2.16 on 2022-10-23 06:42
3 
+
4 
+from django.db import migrations, models
5 
+import jsonfield.fields
6 
+import shortuuidfield.fields
7 
+
8 
+
9 
+class Migration(migrations.Migration):
10 
+
11 
+    dependencies = [
12 
+        ('member', '0034_memberactivityinfo_limit_image_num'),
13 
+    ]
14 
+
15 
+    operations = [
16 
+        migrations.CreateModel(
17 
+            name='MemberActivityContributionInfo',
18 
+            fields=[
19 
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
20 
+                ('status', models.BooleanField(default=True, help_text='Status', verbose_name='status')),
21 
+                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),
22 
+                ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),
23 
+                ('brand_id', models.CharField(blank=True, db_index=True, help_text='品牌唯一标识', max_length=32, null=True, verbose_name='brand_id')),
24 
+                ('brand_name', models.CharField(blank=True, help_text='品牌名称', max_length=255, null=True, verbose_name='brand_name')),
25 
+                ('contribution_id', shortuuidfield.fields.ShortUUIDField(blank=True, db_index=True, editable=False, help_text='投稿唯一标识', max_length=22, null=True, unique=True)),
26 
+                ('user_id', models.CharField(blank=True, db_index=True, help_text='用户唯一标识', max_length=32, null=True, verbose_name='user_id')),
27 
+                ('activity_id', models.CharField(blank=True, db_index=True, help_text='活动唯一标识', max_length=32, null=True, verbose_name='activity_id')),
28 
+                ('content_type', models.IntegerField(choices=[(0, '投稿'), (1, '入围'), (2, '创作日记')], db_index=True, default=0, help_text='内容类型', verbose_name='content_type')),
29 
+                ('title', models.CharField(blank=True, help_text='标题', max_length=255, null=True, verbose_name='title')),
30 
+                ('content', models.TextField(blank=True, help_text='内容', null=True, verbose_name='content')),
31 
+                ('images', jsonfield.fields.JSONField(default=[], help_text='图片列表', verbose_name='images')),
32 
+            ],
33 
+            options={
34 
+                'verbose_name': '会员活动投稿信息',
35 
+                'verbose_name_plural': '会员活动投稿信息',
36 
+            },
37 
+        ),
38 
+    ]

+ 36 - 13
member/models.py
Просмотреть файл 

@@ -601,6 +601,7 @@ class MemberActivitySignupInfo(BaseModelMixin):
601 601 
     @property
602 602 
     def admindata(self):
603 603 
         return {
604 
+            'signup_id': self.signup_id,
604 605 
             'user_id': self.user_id,
605 606 
             'activity_id': self.activity_id,
606 607 
             'title': self.title,
 
@@ -664,28 +665,50 @@ class MemberActivityGroupShareInfo(BaseModelMixin):
664 665
665 666
666 667 
 class MemberActivityContributionInfo(BaseModelMixin):
668 
+    CONTENT_TYPE = (
669 
+        (0, u'投稿'),
670 
+        (1, u'入围'),
671 
+        (2, u'创作日记'),
672 
+    )
673 
+
667 674 
     brand_id = models.CharField(_(u'brand_id'), max_length=32, blank=True, null=True, help_text=u'品牌唯一标识', db_index=True)
668 675 
     brand_name = models.CharField(_(u'brand_name'), max_length=255, blank=True, null=True, help_text=u'品牌名称')
669 676
670 
-    activity_id = models.CharField(_(u'activity_id'), max_length=32, blank=True, null=True, help_text=u'活动唯一标识', db_index=True)
677 
+    contribution_id = ShortUUIDField(_(u'contribution_id'), max_length=32, blank=True, null=True, help_text=u'投稿唯一标识', db_index=True, unique=True)
671 678
672 
-    share_user_id = models.CharField(_(u'share_user_id'), max_length=32, blank=True, null=True, help_text=u'分享用户唯一标识', db_index=True)
673 
-    click_user_id = models.CharField(_(u'click_user_id'), max_length=32, blank=True, null=True, help_text=u'点击用户唯一标识', db_index=True)
679 
+    user_id = models.CharField(_(u'user_id'), max_length=32, blank=True, null=True, help_text=u'用户唯一标识', db_index=True)
674 680
675 
-    open_gid = models.CharField(_(u'open_gid'), max_length=32, blank=True, null=True, help_text=u'群组唯一标识', db_index=True)
681 
+    activity_id = models.CharField(_(u'activity_id'), max_length=32, blank=True, null=True, help_text=u'活动唯一标识', db_index=True)
676 682
677 
-    title = models.CharField(_(u'title'), max_length=255, blank=True, null=True, help_text=u'活动名称')
683 
+    content_type = models.IntegerField(_(u'content_type'), choices=CONTENT_TYPE, default=0, help_text=u'内容类型', db_index=True)
678 684
679 
-    is_integral = models.BooleanField(_(u'is_integral'), default=False, help_text=u'是否有积分')
680 
-    integral = models.IntegerField(_(u'integral'), default=0, help_text=u'积分')
685 
+    # 传参图片列表（默认第一张为封面图，包括图片url、宽、高）、标题、内容（纯文本）。
686 
+    title = models.CharField(_(u'title'), max_length=255, blank=True, null=True, help_text=u'标题')
687 
+    content = models.TextField(_(u'content'), blank=True, null=True, help_text=u'内容')
688 
+    # content_rich_text = RichTextField(_(u'content_rich_text'), blank=True, default='', help_text=u'内容')
689 
+    # [{
690 
+    #     'image_url': '',
691 
+    #     'width': 100,
692 
+    #     'height': 100,
693 
+    # }]
694 
+    images = JSONField(_(u'images'), default=[], help_text=u'图片列表')
681 695
682 696 
     class Meta:
683 
-        verbose_name = _(u'会员活动群组分享信息')
684 
-        verbose_name_plural = _(u'会员活动群组分享信息')
685 
-
686 
-        unique_together = (
687 
-            ('activity_id', 'share_user_id', 'click_user_id', 'open_gid', 'brand_id'),
688 
-        )
697 
+        verbose_name = _(u'会员活动投稿信息')
698 
+        verbose_name_plural = _(u'会员活动投稿信息')
689 699
690 700 
     def __unicode__(self):
691 701 
         return '%d' % self.pk
702 
+
703 
+    @property
704 
+    def data(self):
705 
+        return {
706 
+            'contribution_id': self.contribution_id,
707 
+            'user_id': self.user_id,
708 
+            'activity_id': self.activity_id,
709 
+            'content_type': self.content_type,
710 
+            'content_type_str': dict(MemberActivityContributionInfo.CONTENT_TYPE).get(self.content_type),
711 
+            'title': self.title,
712 
+            'content': self.content,
713 
+            'images': self.images,
714 
+        }