MemberActivityInfo add created_at

FFIB лет %!s(int64=4): %!d(string=назад)
Родитель
Сommit
132a718081
2 измененных файлов с 7 добавлено и 5 удалено
  1. 2 2
      api/admin_views.py
  2. 5 3
      member/models.py

+ 2 - 2
api/admin_views.py

@@ -792,7 +792,7 @@ def member_activity_list(request):
792 792
     except AdministratorInfo.DoesNotExist:
793 793
         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
794 794
 
795
-    logs = MemberActivityInfo.objects.filter(title__icontains=title, status=True)
795
+    logs = MemberActivityInfo.objects.filter(title__icontains=title)
796 796
 
797 797
     if start_time and end_time:
798 798
         start_time = datetime.strptime(start_time, '%Y%m%d')
@@ -824,7 +824,7 @@ def member_activity_details(request):
824 824
         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
825 825
 
826 826
     try:
827
-        log = MemberActivityInfo.objects.get(activity_id=activity_id, status=True)
827
+        log = MemberActivityInfo.objects.get(activity_id=activity_id)
828 828
     except:
829 829
         return response()
830 830
     

+ 5 - 3
member/models.py

@@ -150,7 +150,7 @@ class GoodsOrderInfo(BaseModelMixin):
150 150
             'user_address': self.address,
151 151
             'tracking_number': self.tracking_number,
152 152
             'integral': self.integral,
153
-            'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d %H:%M'),
153
+            'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d %H:%M:%S'),
154 154
         }
155 155
 
156 156
 
@@ -425,7 +425,8 @@ class MemberActivityInfo(BaseModelMixin):
425 425
             'state': self.final_state,
426 426
             'is_signup': self.is_signup,
427 427
             'share_integral': self.group_share_integral,
428
-            'share_max_integral': self.group_share_max_integral
428
+            'share_max_integral': self.group_share_max_integral,
429
+            'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d %H:%M:%S'),
429 430
         }
430 431
     
431 432
     @property
@@ -449,7 +450,8 @@ class MemberActivityInfo(BaseModelMixin):
449 450
             'state': self.final_state,
450 451
             'is_signup': self.is_signup,
451 452
             'share_integral': self.group_share_integral,
452
-            'share_max_integral': self.group_share_max_integral
453
+            'share_max_integral': self.group_share_max_integral,
454
+            'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d %H:%M:%S'),
453 455
         }
454 456
 
455 457