chenjunkai 6 жил өмнө
parent
commit
e1d64677d6

+ 6 - 6
Ansjer/config.py

@@ -64,12 +64,12 @@ elif SERVER_TYPE == 'Ansjer.test_settings':
     DOMAIN_HOST = 'test.dvema.com'
     SERVER_HOST = 'localhost'
     PAYPAL_CRD = {
-        "mode": "live",  # sandbox or live
-        "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
-        "client_secret": "ENT-J08N3Fw0B0uAokg4RukljAwO9hFHPf8whE6-Dwd8oBWJO8AWMgpdTKpfB1pOy89t4bsFEzMWDowm"
-        # "mode": "sandbox",  # sandbox or live
-        # "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
-        # "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
+        # "mode": "live",  # sandbox or live
+        # "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
+        # "client_secret": "ENT-J08N3Fw0B0uAokg4RukljAwO9hFHPf8whE6-Dwd8oBWJO8AWMgpdTKpfB1pOy89t4bsFEzMWDowm"
+        "mode": "sandbox",  # sandbox or live
+        "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
+        "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
     }
 elif SERVER_TYPE == 'Ansjer.formal_settings':
     NGINX_RTMP_STAT = 'http://www.dvema.com/stat'

+ 15 - 5
Controller/OrderContrller.py

@@ -19,6 +19,7 @@ from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Model.models import Order_Model, Device_Info
 from Service.CommonService import CommonService
+from Service.ModelService import ModelService
 
 '''
 # 获取所有设备下单信息
@@ -55,7 +56,7 @@ class OrderView(View):
         userID = tko.userID
         if operation == 'querylist':
             return self.do_querylist(request_dict, userID, response)
-        elif operation == 'delete':
+        elif operation == 'do_admin_delete':
             return self.do_deleteOrder(request_dict, userID, response)
         else:
             return response.json(444, 'error path')
@@ -106,7 +107,16 @@ class OrderView(View):
                     data.append(d)
         return response.json(0, {'data': data, 'count': count})
 
-    def do_deleteOrder(self, request_dict, userID, response):
-        orderID = request_dict.get('orderID')
-        Order_Model.objects.filter(orderID=orderID, userID_id=userID).delete()
-        return response.json(0)
+    # admins ^^^^^^^^^^^^
+    def do_admin_delete(self, request_dict, userID, response):
+        own_perm = ModelService.check_perm(userID, 20)
+        if own_perm is True:
+            orderID = request_dict.get('orderID')
+            Order_Model.objects.filter(orderID=orderID, userID_id=userID).delete()
+            return response.json(0)
+        else:
+            return response.json(404)
+
+
+    # def do_admin_query(self, request_dict, userID, response):
+