update callback

Controller/CloudStorage.py

@@ -119,6 +119,8 @@ class CloudStorageView(View):
                 return self.deleteVodList(request_dict, response)
             elif operation == 'devicecommodity':
                 return self.device_commodity(request_dict, response)
+            elif operation == 'switchdevicecommodity':
+                return self.switch_device_commodity(request_dict, response)
             else:
                 return response.json(414)
 
@@ -904,10 +906,9 @@ class CloudStorageView(View):
         bucketId = smqs[0]['bucket_id']
         if not smqs.exists():
             return response.json(0, '套餐已删除')
-
         # ##
         ubqs = UID_Bucket.objects.filter(bucket__id=bucketId, uid=UID, channel=channel, endTime__gte=nowTime). \
-            values("bucket__storeDay", "bucket__region", "endTime")
+            values("id", "bucket__storeDay", "bucket__region", "endTime")
         expire = smqs[0]['expire']
         if order_list[0]['isSelectDiscounts'] == 1:
             expire = smqs[0]['expire'] * 2
@@ -919,7 +920,7 @@ class CloudStorageView(View):
             ub_cqs = ubqs.update \
                 (uid=UID, channel=channel, bucket_id=bucketId,
                  endTime=endTime)
-            uid_bucket_id = ubq.id
+            uid_bucket_id = ubq['id']
         else:
             endTime = CommonService.calcMonthLater(expire)
             ub_cqs = UID_Bucket.objects.create \
@@ -1238,34 +1239,36 @@ class CloudStorageView(View):
         else:
             return response.json(0, '删除成功.')
 
+    #设备关联套餐列表
     def device_commodity(self, request_dict, response):
         uid = request_dict.get('uid',None)
         now_time = int(time.time())
+        uid_bucket = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time).values("id", "uid", "endTime",
+                                                                                 "is_use","bucket__content")
+        if not uid_bucket.exists():
+            return response.json(404,'该设备未购买云存套餐.')
+        return response.json(0,list(uid_bucket))
+
+    #切换设备关联套餐
+    def switch_device_commodity(self, request_dict, response):
+        uid = request_dict.get('uid',None)
         switch_commodity_id = request_dict.get('switch_commodity_id',None)
         if switch_commodity_id:
             #切换设备套餐关联
-            using_uid_bucket = UID_Bucket.objects.filter(uid=uid, is_use=1).values("id", "uid", "endTime",
-                                                                                          "is_use","bucket__content")
+            using_uid_bucket = UID_Bucket.objects.filter(uid=uid, is_use='1').values("id", "uid", "endTime",
+                                                                                   "is_use","bucket__content")
             if not using_uid_bucket.exists():
                 return response.json(404,'该设备未购买云存套餐.')
 
-            if using_uid_bucket[0]['id'] == switch_commodity_id:
-                return response.json(404,'转移的云存套餐ID不能与正在使用中的相同.')
+            if int(using_uid_bucket[0]['id']) == int(switch_commodity_id):
+                return response.json(404,'切换的云存套餐ID不能与正在使用中的相同.')
 
             UID_Bucket.objects.filter(id=switch_commodity_id).update(is_use=1)  #更新转移的云存套餐为使用中
             UID_Bucket.objects.filter(id=using_uid_bucket[0]['id']).delete()    #删除原来使用中的云存套餐
             VodHlsModel.objects.filter(uid=uid).delete()                        #删除播放列表
             StsCrdModel.objects.filter(uid=uid).delete()                        #删除sts记录
-            return response.json(0,'转移成功')
-        else:
-            uid_bucket = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time).values("id", "uid", "endTime",
-                                                                                     "is_use","bucket__content")
-            if not uid_bucket.exists():
-                return response.json(404,'该设备未购买云存套餐.')
-            return response.json(0,list(uid_bucket))
-
-
-
+            return response.json(0,'切换云存套餐成功')
+        return response.json(404,'切换的套餐ID不能为空')