套餐语言增加discount_content1

Controller/CloudStorage.py

@@ -221,7 +221,7 @@ class CloudStorageView(View):
             qs = qs.filter(pay_type='10')
 
         qs = qs.filter(~Q(pay_type='11'))  # 过滤不显示激活码套餐
-        qs = qs.annotate(title=F('lang__title'),content=F('lang__content'))
+        qs = qs.annotate(title=F('lang__title'),content=F('lang__content'),discount_content=F('lang__discount_content'))
         qs = qs.values("id", "title", "content", "price", "day", "currency", "bucket__storeDay",
                        "bucket__bucket", "bucket__area", "commodity_code",
                        "commodity_type", "is_discounts", "virtual_price", "expire",

Controller/MealManage.py

@@ -90,7 +90,6 @@ class MealManage(View):
         virtual_price = request_dict.get('virtual_price', None)
         is_discounts = request_dict.get('is_discounts', None)
         discount_price = request_dict.get('discount_price', None)
-        discount_content = request_dict.get('discount_content', None)
         expire = request_dict.get('expire', None)
         symbol = request_dict.get('symbol', None)
 
@@ -106,7 +105,7 @@ class MealManage(View):
                 return response.json(10, '已存在')
             store_meal = Store_Meal(id=id, price=price, day=day, bucket_id=bucketID, commodity_code = commodity_code,
                                     currency=currency, virtual_price=virtual_price, is_discounts=is_discounts,
-                                    discount_price=discount_price, discount_content=discount_content, expire=expire, symbol=symbol)
+                                    discount_price=discount_price, expire=expire, symbol=symbol)
             store_meal.save()
             paytype = paytype.split(',')
             if len(paytype) > 0:
@@ -136,7 +135,7 @@ class MealManage(View):
 
         qs = Store_Meal.objects.values("id", "price", "day", "add_time", "update_time", "currency"
                                        , "bucket_id", "commodity_type", "commodity_code", "virtual_price", "is_discounts"
-                                       , "discount_price", "discount_content", "expire", "symbol"
+                                       , "discount_price", "expire", "symbol"
                                        , "bucket__bucket", "bucket__area", "bucket__storeDay")
         res = {}
         if qs.exists():
@@ -167,7 +166,6 @@ class MealManage(View):
         virtual_price = request_dict.get('virtual_price', None)
         is_discounts = request_dict.get('is_discounts', None)
         discount_price = request_dict.get('discount_price', None)
-        discount_content = request_dict.get('discount_content', None)
         expire = request_dict.get('expire', None)
         symbol = request_dict.get('symbol', None)
         type = request_dict.get('type', None)
@@ -188,7 +186,6 @@ class MealManage(View):
             store_meal.virtual_price = virtual_price
             store_meal.is_discounts = is_discounts
             store_meal.discount_price = discount_price
-            store_meal.discount_content = discount_content
             store_meal.expire = expire
             store_meal.symbol = symbol
             store_meal.day = day
@@ -268,16 +265,17 @@ class MealManage(View):
         lang = request_dict.get('lang', None)
         title = request_dict.get('title', None)
         content = request_dict.get('content', None)
-        if not store_meal_id or not lang or not title or not content:
+        discount_content = request_dict.get('discount_content', None)
+        if not store_meal_id or not lang or not title or not content or not discount_content:
             return response.json(444, 'store_meal_id,lang,title,content')
         # 查询该套餐是否存在
         storeMeal_qs = Store_Meal.objects.get(id=store_meal_id)
         if not storeMeal_qs:
             return response.json(500)
-        lang_obj = Lang.objects.filter(lang=lang, title=title, content=content)
+        lang_obj = Lang.objects.filter(lang=lang, title=title, content=content, discount_content=discount_content)
         if not lang_obj.exists():
             # 数据不存在,lang表创建数据
-            lang_obj = Lang.objects.create(lang=lang, title=title, content=content)
+            lang_obj = Lang.objects.create(lang=lang, title=title, content=content, discount_content=discount_content)
         storeMeal_qs.lang.add(*lang_obj)    # store_meal表添加语言数据
         # count = lang_obj.count()
         # res = {

Model/models.py

@@ -423,7 +423,6 @@ class Store_Meal(models.Model):
     virtual_price = models.CharField(blank=True, max_length=32, verbose_name=u'虚拟价格')
     is_discounts = models.SmallIntegerField(default=0, verbose_name=u'该套餐是否有优惠 [0=否，1是]')   # 0没有；1有
     discount_price = models.CharField(blank=True, max_length=32, verbose_name=u'第二年优惠价格')
-    discount_content = models.CharField(blank=True, max_length=320, verbose_name=u'优惠信息描述')
     day = models.IntegerField(default=0, blank=True, verbose_name=u'云存录像保存天数（循环）')   # 7,30,180,360
     expire = models.IntegerField(default=0, blank=True, verbose_name=u'有效期') #单位月
     # content = models.TextField(blank=True, null=True, verbose_name=u'描述')
@@ -468,6 +467,7 @@ class Lang(models.Model):
     lang = models.CharField(default='', max_length=20, verbose_name='语言/国家')
     title = models.CharField(blank=True, max_length=32, verbose_name='标题')
     content = models.TextField(blank=True, null=True, verbose_name='描述')
+    discount_content = models.CharField(blank=True, max_length=320, verbose_name=u'优惠信息描述')
 
     def __str__(self):
         return self.id