update 套餐语言

Controller/CloudStorage.py

@@ -202,14 +202,15 @@ class CloudStorageView(View):
     def do_commodity_list(self, request_dict, userID, response):
         mold = request_dict.get('mold', None)
         uid = request_dict.get('uid', None)
+        lang = response.lang
         qs = Store_Meal.objects
         eq = ExperienceContextModel.objects.filter(uid=uid, experience_type=0).values('id')
         # userqs = Device_User.objects.filter(userID=userID).values('is_experience')
 
         if mold:
-            qs = qs.filter(bucket__mold=mold)
+            qs = qs.filter(bucket__mold=mold,lang=lang)
         else:
-            qs = qs.all()
+            qs = qs.filter(lang=lang)
 
         if eq:
             qs = qs.filter(~Q(pay_type='10'))
@@ -392,7 +393,7 @@ class CloudStorageView(View):
                 'AccessKeySecret': response['Credentials']['SecretAccessKey'],
                 'SessionToken': response['Credentials']['SessionToken'],
                 'Expiration': response['Credentials']['Expiration'],
-                'expire': '3600',
+                'expire': '7200',
                 'endpoint': endpoint,
                 'bucket_name': bucket_name,
                 'arn': response['FederatedUser']['Arn'],

Model/models.py

@@ -435,6 +435,7 @@ class Store_Meal(models.Model):
                                default=1, verbose_name='存储空间')
     commodity_type = models.SmallIntegerField(default=0, verbose_name='云存储套餐类型')  # 0：事件型 1：连续型
     commodity_code = models.CharField(default='', max_length=32, verbose_name='套餐规格码')
+    lang = models.CharField(default='', max_length=20, verbose_name='语言/国家')
 
     def __str__(self):
         return self.id
@@ -445,6 +446,7 @@ class Store_Meal(models.Model):
         verbose_name_plural = verbose_name
         ordering = ('id',)
 
+
 class Pay_Type(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增ID')
     payment = models.CharField(max_length=32, verbose_name=u'支付方式')