mol

Controller/MealManage.py

@@ -16,12 +16,11 @@ from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from Service.ModelService import ModelService
 from Service.CommonService import CommonService
-from Model.models import Store_Meal
+from Model.models import Store_Meal,VodBucketModel
 import traceback
 from django.utils import timezone
 from Object.TokenObject import TokenObject
 from Object.ResponseObject import ResponseObject
-
 '''
 http://192.168.136.40:8077/meal/manage?operation=add&token=local&title=套餐A&price=$199&content=存7天&day=7&id=1
 http://192.168.136.45:8077/meal/manage?operation=update&token=test&id=1&title=套餐A&price=$199&content=存3天&day=7
@@ -79,12 +78,12 @@ class MealManage(View):
         price = request_dict.get('price', None)
         content = request_dict.get('content', None)
         day = request_dict.get('day', None)
-        storeDay = request_dict.get('storeDay', None)
-        param_flag = CommonService.get_param_flag(data=[title, price, content])
-        if param_flag is not True:
-            return response.json(444,'title,id,price,content,day,storeDay')
+        bucketID = request_dict.get('bucketID',None)
+        if not title or not id or not price or not day or not content:
+            return response.json(444,'title,id,price,content,day,bucketID')
         try:
-            store_meal = Store_Meal(id=id,title=title,price=price,content=content,day=day,storeDay=storeDay)
+            bucketQs= VodBucketModel.objects.filter(id=bucketID)
+            store_meal = Store_Meal(id=id,title=title,price=price,content=content,day=day,bucket_id=bucketID)
             store_meal.save()
         except Exception:
             errorInfo = traceback.format_exc()
@@ -93,14 +92,15 @@ class MealManage(View):
         else:
             if store_meal.id:
                 return response.json(0, {
-                    'id': store_meal.id,
-                    'title': store_meal.title,
-                    'price': store_meal.price,
-                    'content': store_meal.content,
-                    'day': store_meal.day,
+                    'bucket__bucket':bucketQs[0].bucket,
+                    'bucket__storeDay':bucketQs[0].storeDay,
+                    'id': id,
+                    'title': title,
+                    'price': price,
+                    'content': content,
+                    'day': day,
                     'add_time': str(store_meal.add_time),
-                    'update_time': str(store_meal.update_time),
-                    'storeDay':storeDay})
+                    'update_time': str(store_meal.update_time)})
 
     def query(self, request_dict, response):
         page = int(request_dict.get('page', None))
@@ -123,9 +123,8 @@ class MealManage(View):
             title = request_dict.get('title', None)
             price = request_dict.get('price', None)
             day = request_dict.get('day', None)
-            storeDay = request_dict.get('storeDay', None)
             content = request_dict.get('content', None)
-
+            bucketID = request_dict.get('bucketID', None)
             param_flag = CommonService.get_param_flag(
                 data=[id, title, price, content, day])
             if param_flag is True:
@@ -142,8 +141,8 @@ class MealManage(View):
                         store_meal.title = title
                         store_meal.price = price
                         store_meal.content = content
-                        store_meal.storeDay = storeDay
                         store_meal.day = day
+                        store_meal.bucket_id = bucketID
                         store_meal.save()
                         return response.json(0, {'update_id': store_meal.id,
                                                  'update_time': str(now_time)})
@@ -230,7 +229,7 @@ class MealView(View):
             return response.json(414)
 
     def do_query_list(self, response):
-        qs = Store_Meal.objects.all().values("id","title","content","price","day","storeDay")
+        qs = Store_Meal.objects.all().values("id","title","content","price","day","bucket__storeDay","bucket__bucket")
         if qs.exists():
             # res = CommonService.qs_to_list(qs)
             return response.json(0, list(qs))