Merge branch 'dev' of http://192.168.136.99:3000/SERVER/AnsjerServer into dev

Controller/CloudStorage.py

@@ -108,6 +108,8 @@ class CloudStorageView(View):
                 return self.do_query_order(request_dict, userID, response)
             elif operation == 'experienceorder':
                 return self.do_experience_order(request_dict, userID, response)
+            elif operation == 'experiencereset':
+                return self.do_experience_reset(request_dict, userID, response)
             else:
                 return response.json(414)
 
@@ -1032,8 +1034,7 @@ class CloudStorageView(View):
                                                   'error_code': 0})
             # 调起支付接口
 
-        # 生成体验订单
-
+    # 生成体验订单
     def do_experience_order(self, request_dict, userID, response):
         uid = request_dict.get('uid', None)
         channel = request_dict.get('channel', None)
@@ -1118,6 +1119,24 @@ class CloudStorageView(View):
 
         # return HttpResponseRedirect(red_url)
 
+    #重置设备云存体验
+    def do_experience_reset(self, request_dict, userID, response):
+        bid = request_dict.get("id",None)
+        ubq = UID_Bucket.objects.filter(id=bid)
+        if ubq:
+            eq =ExperienceContextModel.objects.filter(uid = ubq[0].uid)
+            if eq:
+                eq.delete()
+                Order_Model.objects.filter(uid_bucket_id = bid).delete()
+                ubq.delete()
+            else:
+                return response.json(10007)
+
+        else:
+            return response.json(0, '重置云存体验失败')
+
+        return response.json(0,'重置云存体验成功')
+
 
 def deleteVodHls(request):
     UID = 'DSXG7481JVA2JM94111A'

Object/ResponseObject.py

@@ -140,6 +140,7 @@ class ResponseObject(object):
             10004: '请求方法不正确。请联系开发者',
             10005: '配置错误，客户编号这个值是错误的',
             10006: '配置错误，路径这个值是错误的',
+            10007: '此设备不是体验套餐，无法重置'
         }
         if self.lang == 'cn':
             msg = data_cn