add admin/live/order/list
Se han modificado 3 ficheros con 30 adiciones y 2 borrados
+ 21
- 0
api/admin_views.py
@@ -183,6 +183,27 @@ def live_room_list(request): |
||
| 183 | 183 |
}) |
| 184 | 184 |
|
| 185 | 185 |
@logit(res=True) |
| 186 |
+def live_order_list(request): |
|
| 187 |
+ admin_id = request.POST.get('admin_id', '')
|
|
| 188 |
+ page = request.POST.get('page', 1)
|
|
| 189 |
+ num = request.POST.get('num', 20)
|
|
| 190 |
+ |
|
| 191 |
+ try: |
|
| 192 |
+ administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True) |
|
| 193 |
+ except AdministratorInfo.DoesNotExist: |
|
| 194 |
+ return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND) |
|
| 195 |
+ |
|
| 196 |
+ orders = RoomOrderInfo.objects.all() |
|
| 197 |
+ count = orders.count() |
|
| 198 |
+ orders = Paginator(orders, num).get_page(page) |
|
| 199 |
+ orders = [order.admindata for order in orders] |
|
| 200 |
+ |
|
| 201 |
+ return response(200, 'Live Goods Success', u'直播商品库获取成功', data={
|
|
| 202 |
+ 'orders': orders, |
|
| 203 |
+ 'count': count, |
|
| 204 |
+ }) |
|
| 205 |
+ |
|
| 206 |
+@logit(res=True) |
|
| 186 | 207 |
def fetch_wx_room_list(request): |
| 187 | 208 |
admin_id = request.POST.get('admin_id', '')
|
| 188 | 209 |
try: |
+ 1
- 0
api/urls.py
@@ -41,6 +41,7 @@ urlpatterns += [ |
||
| 41 | 41 |
# 直播 |
| 42 | 42 |
url(r'^admin/live/goods/list$', admin_views.live_goods_list, name='live_goods_list'), # 直播商品库列表 |
| 43 | 43 |
url(r'^admin/live/room/list$', admin_views.live_room_list, name='live_room_list'), # 直播间列表 |
| 44 |
+ url(r'^admin/live/order/list$', admin_views.live_order_list, name='live_order_list'), # 直播间列表 |
|
| 44 | 45 |
|
| 45 | 46 |
#微信直播 api |
| 46 | 47 |
url(r'^admin/live/wx/room/list$', admin_views.fetch_wx_room_list, name='fetch_wx_room_list'), # 微信直播间列表 |
+ 8
- 2
live/models.py
@@ -274,7 +274,7 @@ class RoomOrderInfo(BaseModelMixin): |
||
| 274 | 274 |
def __unicode__(self): |
| 275 | 275 |
return self.pk |
| 276 | 276 |
|
| 277 |
- property |
|
| 277 |
+ @property |
|
| 278 | 278 |
def admindata(self): |
| 279 | 279 |
room = RoomInfo.objects.get(room_id=self.room_id) |
| 280 | 280 |
anchor = AnchorInfo.objects.get(anchor_id=self.anchor_id) |
@@ -290,8 +290,14 @@ class RoomOrderInfo(BaseModelMixin): |
||
| 290 | 290 |
'goods_id': self.goods_id, |
| 291 | 291 |
'goods_name': goods.name, |
| 292 | 292 |
'goods_img': goods.goods_img_url, |
| 293 |
+ 'name': self.name, |
|
| 294 |
+ 'phone': self.phone, |
|
| 295 |
+ 'province': self.province, |
|
| 296 |
+ 'city': self.city, |
|
| 297 |
+ 'county': self.county, |
|
| 298 |
+ 'address': self.address, |
|
| 293 | 299 |
'tracking_number': self.tracking_number, |
| 294 | 300 |
'total_fee': self.total_fee, |
| 295 | 301 |
'pay_status': self.pay_status, |
| 296 |
- 'paid_at': tc.local_string(utc_dt=info.paid_at, format='%Y-%m-%d %H:%M'), |
|
| 302 |
+ 'paid_at': tc.local_string(utc_dt=self.paid_at, format='%Y-%m-%d %H:%M'), |
|
| 297 | 303 |
} |