@@ -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,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 |
@@ -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): |
@@ -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 |
@@ -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) |