api/admin_views.py

@@ -2,6 +2,8 @@

                 
              

                 from __future__ import division
              

                 
              

                +import json
              

                +
              

                 from collections import defaultdict
              

                 from datetime import datetime
              

                 
              
@@ -710,7 +712,7 @@ def member_goods_order(request):

                     
              

                     # 未发货，即快递单号为空
              

                     if order_status == 1:
              

                -        orders = orders.filter(tracking_number__isnull=True)
              

                +        orders = orders.filter(Q(tracking_number__isnull=True) | Q(tracking_number=''))
              

                     elif order_status == 2:
              

                         orders = orders.filter(tracking_number__isnull=False).exclude(tracking_number='')
              

                 
              
@@ -741,7 +743,34 @@ def member_goods_order_update(request):

                 
              

                     GoodsOrderInfo.objects.filter(order_id=order_id, status=True).update(tracking_number=tracking_number)
              

                 
              

                -    return response(200, 'Get Member Goods Order Update Success', u'获取会员商品订单修改成功')
              

                +    return response(200, 'Member Goods Order Update Success', u'会员商品订单修改成功')
              

                +
              

                +def member_goods_order_batch_update(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                +    admin_id = request.POST.get('admin_id', '')
              

                +    orders = json.loads(request.POST.get('orders', '[]'))
              

                +
              

                +    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
              

                +        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
              

                +
              

                +    try:
              

                +        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
              

                +    except AdministratorInfo.DoesNotExist:
              

                +        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              

                +
              

                +    err_orders = []
              

                +    for order in orders:
              

                +        try:
              

                +            GoodsOrderInfo.objects.filter(order_id=order['order_id'], status=True).update(tracking_number=order['tracking_number'])
              

                +        except:
              

                +            err_orders.append(order['order_id'])
              

                +
              

                +    if err_orders:
              

                +        return response(40001, 'Member Goods Order Update Error', u'部分会员商品订单修改失败', data={
              

                +            'orders': err_orders
              

                +        })
              

                +
              

                +    return response(200, 'Member Goods Order Update Success', u'会员商品订单修改成功')
              

                 
              

                 
              

                 def record_warehouse(request):
              

api/urls.py

@@ -157,6 +157,7 @@ urlpatterns += [

                 
              

                     url(r'^admin/member/goods/order$', admin_views.member_goods_order, name='member_goods_order'),
              

                     url(r'^admin/member/goods/order/update$', admin_views.member_goods_order_update, name='member_goods_order_update'),
              

                +    url(r'^admin/member/goods/order/batch/update$', admin_views.member_goods_order_batch_update, name='member_goods_order_batch_update'),
              

                     
              

                     url(r'^admin/member/activity/list$', admin_views.member_activity_list, name='member_activity_list'),
              

                     url(r'^admin/member/activity/details$', admin_views.member_activity_details, name='member_activity_details'),