Merge branch 'dev' into lang

Controller/MealManage.py

@@ -283,9 +283,9 @@ class MealManage(View):
         lang = request_dict.get('lang', None)
         title = request_dict.get('title', None)
         content = request_dict.get('content', None)
-        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,discount_content')
+        discount_content = request_dict.get('discount_content', '')
+        if not store_meal_id or not lang or not title or not 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:
@@ -305,22 +305,24 @@ class MealManage(View):
         lang = request_dict.get('lang', None)
         title = request_dict.get('title', None)
         content = request_dict.get('content', None)
-        discount_content = request_dict.get('discount_content', None)
-        if not store_meal_id or not lang_id or not lang or not title or not content or not discount_content:
-            return response.json(444, 'store_meal_id,lang_id,lang,title,content,discount_content')
+        discount_content = request_dict.get('discount_content', '')
+        if not store_meal_id or not lang_id or not lang or not title or not content:
+            return response.json(444, 'store_meal_id,lang_id,lang,title,content')
         storeMeal_qs = Store_Meal.objects.get(id=store_meal_id)
         if not storeMeal_qs:
             return response.json(500)
-        # 删除原有数据
-        lang_qs = Lang.objects.filter(id=lang_id)
-        storeMeal_qs.lang.remove(*lang_qs)
-        lang_obj = Lang.objects.filter(lang=lang, title=title, content=content, discount_content=discount_content)
-        if not lang_obj.exists():
-            # 数据不存在,lang表创建数据
-            Lang.objects.create(lang=lang, title=title, content=content, discount_content=discount_content)
-            lang_obj = Lang.objects.filter(lang=lang, title=title, content=content, discount_content=discount_content)
-        storeMeal_qs.lang.add(*lang_obj)  # store_meal表添加语言数据
+        Lang.objects.filter(id=lang_id).update(lang=lang, title=title, content=content, discount_content=discount_content)
         return response.json(0)
+        # # 删除原有数据
+        # lang_qs = Lang.objects.filter(id=lang_id)
+        # storeMeal_qs.lang.remove(*lang_qs)
+        # lang_obj = Lang.objects.filter(lang=lang, title=title, content=content, discount_content=discount_content)
+        # if not lang_obj.exists():
+        #     # 数据不存在,lang表创建数据
+        #     Lang.objects.create(lang=lang, title=title, content=content, discount_content=discount_content)
+        #     lang_obj = Lang.objects.filter(lang=lang, title=title, content=content, discount_content=discount_content)
+        # storeMeal_qs.lang.add(*lang_obj)  # store_meal表添加语言数据
+        # return response.json(0)
 
     def delete_language(self, request_dict, response):
         # 删除套餐语言