complement_code_list 增加时间筛选和返回二维码

FFIB %!s(int64=4) %!d(string=hace) años
padre
commit
d0cf717d06
Se han modificado 2 ficheros con 18 adiciones y 0 borrados
  1. 16 0
      api/admin_views.py
  2. 2 0
      logs/models.py

+ 16 - 0
api/admin_views.py

@@ -772,6 +772,8 @@ def member_goods_order(request):
772 772
     page = request.POST.get('page', 1)
773 773
     num = request.POST.get('num', 20)
774 774
     order_status = int(request.POST.get('order_status', 0))
775
+    start_time = request.POST.get('start_time', '')
776
+    end_time = request.POST.get('end_time', '')
775 777
 
776 778
     if brand_id != settings.KODO_DEFAULT_BRAND_ID:
777 779
         return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
@@ -785,6 +787,11 @@ def member_goods_order(request):
785 787
 
786 788
     if good_type:
787 789
         orders = orders.filter(good_type=good_type)
790
+    
791
+    if start_time and end_time:
792
+        start_time = datetime.strptime(start_time, '%Y%m%d')
793
+        end_time = datetime.strptime(end_time + ' 23:59:59', '%Y%m%d %H:%M:%S')
794
+        orders = orders.filter(created_at__range=(start_time, end_time))
788 795
 
789 796
     # 未发货,即快递单号为空
790 797
     if order_status == 1:
@@ -1389,6 +1396,8 @@ def complement_code_list(request):
1389 1396
     admin_id = request.POST.get('admin_id', '')
1390 1397
     page = request.POST.get('page', 1)
1391 1398
     num = request.POST.get('num', 20)
1399
+    start_time = request.POST.get('start_time', '')
1400
+    end_time = request.POST.get('end_time', '')
1392 1401
     type_ = request.POST.get('type', '')
1393 1402
 
1394 1403
     if brand_id != settings.KODO_DEFAULT_BRAND_ID:
@@ -1400,6 +1409,13 @@ def complement_code_list(request):
1400 1409
         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1401 1410
 
1402 1411
     logs = ComplementCodeLogInfo.objects.filter(status=True)
1412
+    
1413
+    
1414
+    if start_time and end_time:
1415
+        start_time = datetime.strptime(start_time, '%Y%m%d')
1416
+        end_time = datetime.strptime(end_time + ' 23:59:59', '%Y%m%d %H:%M:%S')
1417
+        logs = logs.filter(created_at__range=(start_time, end_time))
1418
+
1403 1419
     if type_ == 'todo':
1404 1420
         logs = logs.filter(audit_status=ComplementCodeLogInfo.AUDIT_TODO)
1405 1421
     elif type_ == 'pass':

+ 2 - 0
logs/models.py

@@ -187,4 +187,6 @@ class ComplementCodeLogInfo(BaseModelMixin):
187 187
             'invoice_image_url': self.invoice_image_url,
188 188
             'audit_status': self.audit_status,
189 189
             'is_contacted': self.is_contacted,
190
+            'ciphertext': self.ciphertext,
191
+            'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d %H:%M:%S')
190 192
         }