ts

Controller/CloudVod.py

@@ -116,9 +116,9 @@ class CloudVodView(View):
 
     def do_get_details(self, request_dict, response):
         did = request_dict.get('did', None)
-        dvqs = Device_Info.objects.filter(id=did).values('UID')
+        dvqs = Device_Info.objects.filter(id=did,isShare=False).values('UID')
         if not dvqs.exists():
-            return response.json(10, '设备不存在')
+            return response.json(12)
         UID = dvqs[0]['UID']
         ubqs = UID_Bucket.objects.filter(uid=UID). \
             values('bucket__content', 'status', 'channel', 'endTime', 'uid')
@@ -197,7 +197,8 @@ class CloudVodView(View):
             return response.json(12)
         if not did or not channel or not rank:
             return response.json(444, 'did,channel,rank')
-        smqs = Store_Meal.objects.filter(id=rank).values("currency", "price", "content", "day", "bucket__storeDay")
+        smqs = Store_Meal.objects.filter(id=rank).\
+            values("currency", "price", "content", "day", "bucket__storeDay","bucket__region")
         if not smqs.exists():
             return response.json(10, '套餐不存在')
         currency = smqs[0]['currency']
@@ -205,10 +206,13 @@ class CloudVodView(View):
         content = smqs[0]['content']
         day = smqs[0]['day']
         uid = qs[0]['UID']
-        ubqs = UID_Bucket.objects.filter(uid=uid, channel=channel).values("bucket__storeDay")
+        ubqs = UID_Bucket.objects.filter(uid=uid, channel=channel, endTime__gte=CommonService.get_utc()).\
+            values("bucket__storeDay","bucket__region")
         if ubqs.exists():
             if ubqs[0]['bucket__storeDay'] > smqs[0]['bucket__storeDay']:
                 return response.json(10, '不可降级')
+            elif ubqs[0]['bucket__region'] != smqs[0]['bucket__region']:
+                return response.json(10,'区域不一致')
             # 续费流程
         # 新增流程
         orderID = CommonService.createOrderID()
@@ -525,7 +529,7 @@ class CloudVodView(View):
         channel = request_dict.get('channel', None)
         dvqs = Device_Info.objects.filter(id=did, userID_id=userID,isShare=False).values("UID")
         if not dvqs.exists():
-            return response.json(10, '无设备')
+            return response.json(12)
         UID = dvqs[0]["UID"]
         ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel).values('status')
         if not ubqs.exists():

Controller/MealManage.py

@@ -221,8 +221,6 @@ class MealView(View):
         response.lang = tko.lang
         if tko.code != 0:
             return response.json(tko.code)
-        if operation == 'list':
-            return self.do_query_list(response)
         elif operation == 'query':
             return self.do_query(response)
         else:
@@ -244,11 +242,3 @@ class MealView(View):
             return response.json(0, result)
         else:
             return response.json(0)
-
-    def do_query_list(self, response):
-        qs = Store_Meal.objects.all(). \
-            values("id", "title", "content", "price", "day", "currency", "bucket__storeDay", "bucket__bucket")
-        if qs.exists():
-            return response.json(0, list(qs))
-        else:
-            return response.json(0, [])