订单列表区分回收站

admin_site/order/views.py

@@ -12,79 +12,93 @@ from django.core.paginator import Paginator
 
 from admin_site.utils import setError, setSuccess, orderPersonToDictionary, userPersonToDictionary
 
+
 # 获取订单详情
 @csrf_exempt
 @require_http_methods(["POST"])
 def info(request):
-    body = json.loads(request.body)
-    if body.get('id') == None:
-        return HttpResponse(setError("改订单不存在！"))
-    order_info = Order_models.objects.get(id=body.get('id'))
-    user = {}
-    if body.get('user_type') != None and body.get('user_type') == "FL001":
-        user = User_models.objects.get(id=order_info.car_user_id)
-    elif body.get('user_type') != None and body.get('user_type') != "FL001":
-        user = User_models.objects.get(id=order_info.user_id)
-    return HttpResponse(setSuccess(msg='成功', data={**orderPersonToDictionary(order_info), 'user_info': userPersonToDictionary(user)}))
+  body = json.loads(request.body)
+  if body.get('id') == None:
+    return HttpResponse(setError("改订单不存在！"))
+  order_info = Order_models.objects.get(id=body.get('id'))
+  user = {}
+  if body.get('user_type') != None and body.get('user_type') == "FL001":
+    user = User_models.objects.get(id=order_info.car_user_id)
+  elif body.get('user_type') != None and body.get('user_type') != "FL001":
+    user = User_models.objects.get(id=order_info.user_id)
+  return HttpResponse(
+    setSuccess(msg='成功', data={**orderPersonToDictionary(order_info), 'user_info': userPersonToDictionary(user)}))
+
 
 @csrf_exempt
 @require_http_methods(["POST"])
 def add(request):
-    body = json.loads(request.body)
-    user_add = Order_models(hazardous_waste=body['hazardous_waste'], recyclable_waste=body['recyclable_waste'], household_food_waste=body['household_food_waste'], residual_waste=body['residual_waste'],
-                           user_id=body['user_id'], start_time=body['start_time'], desc=body['desc'])
-    user_add.save()
-    return HttpResponse(setSuccess(msg='添加成功', data={}))
+  body = json.loads(request.body)
+  user_add = Order_models(hazardous_waste=body['hazardous_waste'], recyclable_waste=body['recyclable_waste'],
+                          household_food_waste=body['household_food_waste'], residual_waste=body['residual_waste'],
+                          user_id=body['user_id'], start_time=body['start_time'], desc=body['desc'])
+  user_add.save()
+  return HttpResponse(setSuccess(msg='添加成功', data={}))
 
 
 @csrf_exempt
 @require_http_methods(["POST"])
 def update(request):
-    body = json.loads(request.body)
-    if body['status'] == 2:
-        body['end_time'] = timezone.now()
-    Order_models.objects.filter(id=body['id']).update(**body)
-    return HttpResponse(setSuccess(msg='更新成功', data={}))
+  body = json.loads(request.body)
+  if body['status'] == 2:
+    body['end_time'] = timezone.now()
+  Order_models.objects.filter(id=body['id']).update(**body)
+  return HttpResponse(setSuccess(msg='更新成功', data={}))
+
 
 @csrf_exempt
 @require_http_methods(["POST"])
 def list(request):
-    body = json.loads(request.body)
-    print(body)
-    order_list = []
-    if body['type'] == 'FL001':
-        print('001', body['status'], body['user_id'])
-        filter_list = Order_models.objects.all().filter(status=body['status'], user_id=body['user_id'])
-    elif body['type'] == 'FL002':
-        # filter_list = Order_models.objects.all().filter(status=body['status'], car_user_id=body['user_id'], user_id=body['user_id'])
-        filter_list = Order_models.objects.raw("select * from order_order where status={0} or (status={0} and car_user_id={1})".format(body['status'], body['user_id'],body['user_id']))
+  body = json.loads(request.body)
+  print(body)
+  order_list = []
+  # filter_list = []
+  user = User_models.objects.get(id=body['user_id'])
+  print(type(body['status']))
+  if body['type'] == 'FL001':
+    print('001', body['status'], body['user_id'])
+    filter_list = Order_models.objects.all().filter(status=body['status'], user_id=body['user_id'])
+  elif body['type'] == 'FL002':
+    if body['status'] == '0':
+      filter_list = Order_models.objects.raw("select * from order_order where status={0}".format(body['status']))
     else:
-        user = User_models.objects.get(id=body['user_id'])
-        filter_list = Order_models.objects.raw("select * from order_order where status={0} or (status={0} and studio_address='{1}')".format(body['status'], str(user.address)))
-    for e in filter_list:
-        order_list.append(orderPersonToDictionary(e))
-        # print(orderPersonToDictionary(e))
-    # return HttpResponse("Hello, world. request.")
-    return HttpResponse(setSuccess(msg='成功', data=order_list))
+      filter_list = Order_models.objects.raw(
+        "select * from order_order where (status={0} and studio_address='{2}') or (status={0} and car_user_id={1})".format(
+          body['status'], body['user_id'], str(user.address)))
+  else:
+    filter_list = Order_models.objects.raw(
+      "select * from order_order where status={0} and studio_address='{1}'".format(body['status'], str(user.address)))
+  for e in filter_list:
+    order_list.append(orderPersonToDictionary(e))
+  return HttpResponse(setSuccess(msg='成功', data=order_list))
+
 
 """"订单统计：回收站"""
+
+
 @csrf_exempt
 @require_http_methods(["POST"])
 def statistics(request):
-    body = json.loads(request.body)
-    user = User_models.objects.get(id=body['user_id'])
-    start_date = datetime.strptime(body['start_time'],'%Y-%m-%d')
-    end_date = datetime.strptime(body['end_time'],'%Y-%m-%d')
-    query_list = Order_models.objects.raw("select * from order_order where status=2 and end_time between '{0}' and '{1}'".format(start_date, end_date))
-    # print(end_date)
-    field = ['hazardous_waste', 'recyclable_waste', 'household_food_waste', 'residual_waste']
-    order_list = []
-    statistics_count_obj = {}
-    for e in query_list:
-        item = orderPersonToDictionary(e)
-        order_list.append(item)
-        for key in field:
-            if statistics_count_obj.get(key) == None:
-                statistics_count_obj.setdefault(key, 0)
-            statistics_count_obj[key] = statistics_count_obj[key] + item[key]
-    return HttpResponse(setSuccess(msg='成功', data={'order_list': order_list, 'statistics_count': statistics_count_obj}))
+  body = json.loads(request.body)
+  user = User_models.objects.get(id=body['user_id'])
+  start_date = datetime.strptime(body['start_time'], '%Y-%m-%d')
+  end_date = datetime.strptime(body['end_time'], '%Y-%m-%d')
+  query_list = Order_models.objects.raw(
+    "select * from order_order where status=2 and end_time between '{0}' and '{1}'".format(start_date, end_date))
+  # print(end_date)
+  field = ['hazardous_waste', 'recyclable_waste', 'household_food_waste', 'residual_waste']
+  order_list = []
+  statistics_count_obj = {}
+  for e in query_list:
+    item = orderPersonToDictionary(e)
+    order_list.append(item)
+    for key in field:
+      if statistics_count_obj.get(key) == None:
+        statistics_count_obj.setdefault(key, 0)
+      statistics_count_obj[key] = statistics_count_obj[key] + item[key]
+  return HttpResponse(setSuccess(msg='成功', data={'order_list': order_list, 'statistics_count': statistics_count_obj}))

admin_site/user/views.py

@@ -36,9 +36,9 @@ def info(request):
 def login(request):
     body = json.loads(request.body)
     if body.get('email') == None:
-        return HttpResponse(setError("该用户不存在0！"))
+        return HttpResponse(setError("该用户不存在！"))
     if body.get('password') == None:
-        return HttpResponse(setError("该用户不存在1！"))
+        return HttpResponse(setError("该用户不存在！"))
     user_info = userPersonToDictionary(User_models.objects.get(email=body.get('email'), password=body.get('password')))
     print(user_info)
     return HttpResponse(setSuccess(data=user_info))