Merge remote-tracking branch 'origin/test'

Controller/CloudStorage.py

@@ -1199,6 +1199,11 @@ class CloudStorageView(View):
         cdk = request_dict.get('cdk', None)
         lang = request_dict.get('lang', 'en')
 
+        redisObj = RedisObject()
+        if redisObj.get_data(key=uid+'do_experience_order'):
+            return response.json(5)
+        redisObj.set_data(key=uid+'do_experience_order', val=uid, expire=300)
+
         if cdk is not None and pay_type == 11:
             cdk_qs = CDKcontextModel.objects.filter(cdk=cdk).values('is_activate', 'rank__id', 'rank__commodity_code')
             if not cdk_qs.exists():
@@ -1211,11 +1216,6 @@ class CloudStorageView(View):
         if uid is None or channel is None or commodity_code is None or pay_type is None or rank is None:
             return response.json(13, '参数有误.')
 
-        redisObj = RedisObject()
-        if redisObj.get_data(key=uid+'do_experience_order'):
-            return response.json(5)
-        redisObj.set_data(key=uid+'do_experience_order', val=uid, expire=300)
-
         dvq = Device_Info.objects.filter(UID=uid)
         dvq = dvq.filter(~Q(vodPrimaryUserID='')).values('vodPrimaryUserID')
         if dvq.exists():

Model/models.py

@@ -533,7 +533,7 @@ class Equipment_Version(models.Model):
     type = models.CharField(blank=True, max_length=16, verbose_name=u'设备机型')
     companyCode = models.CharField(blank=True, max_length=128, verbose_name=u'用户公司名称')
     data_joined = models.DateTimeField(blank=True, verbose_name=u'加入时间', auto_now_add=True)
-    fileSize = models.IntegerField(blank=True, verbose_name=u'文件总大小')
+    fileSize = models.CharField(blank=True, max_length=16, verbose_name=u'文件总大小')
     filePath = models.CharField(blank=True, max_length=256, verbose_name=u'升级文件路径')
     Description = models.TextField(blank=True, default='', verbose_name=u'描述信息')
     fileMd5 = models.CharField(blank=True, max_length=32, default='', verbose_name=u'上传文件MD5加密')