chenjunkai 6 лет назад
Родитель
Сommit
4e2077a82b
1 измененных файлов с 47 добавлено и 47 удалено
  1. 47 47
      Controller/DeviceMeal.py

+ 47 - 47
Controller/DeviceMeal.py

@@ -78,7 +78,7 @@ class DeviceMeal(View):
                 return self.updatestatusbyuser(request_dict, userID, response)
         return response.json(444, 'userID,operation')
 
-    def add(self, request_dict, userID,response):
+    def add(self, request_dict, userID, response):
         own_perm = ModelService.check_permission(userID=userID, permID=40)
         if own_perm is True:
             uid = request_dict.get('uid', None)
@@ -86,19 +86,19 @@ class DeviceMeal(View):
             rank = request_dict.get('rank', None)
             param_flag = CommonService.get_param_flag(data=[uid, channel, rank])
             if param_flag is True:
-                dmqs = Device_Meal.objects.filter(uid=uid, channel=channel)
-                if dmqs.exists():
-                    days = dmqs[0].day
-                    now_time = timezone.localtime(timezone.now())
-                    if now_time > dmqs[0].end_time:
-                        end_time = now_time + datetime.timedelta(days=int(days))
+                try:
+                    store_meal = Store_Meal.objects.get(id=rank)
+                    dmqs = Device_Meal.objects.filter(uid=uid, channel=channel)
+                    if dmqs.exists():
+                        days = dmqs[0].day
+                        now_time = timezone.localtime(timezone.now())
+                        if now_time > dmqs[0].end_time:
+                            end_time = now_time + datetime.timedelta(days=int(days))
+                        else:
+                            end_time = dmqs[0].end_time + datetime.timedelta(days=int(days))
+                        dmqs.update(end_time=end_time, update_time=now_time)
+                        return response.json(0)
                     else:
-                        end_time = dmqs[0].end_time + datetime.timedelta(days=int(days))
-                    dmqs.update(end_time=end_time,update_time=now_time)
-                    return response.json(0)
-                else:
-                    try:
-                        store_meal = Store_Meal.objects.get(id=rank)
                         days = store_meal.day
                         end_time = datetime.timedelta(days=int(days)) + datetime.datetime.now()
                         print(end_time)
@@ -110,23 +110,23 @@ class DeviceMeal(View):
                             rank=store_meal,
                         )
                         device_meal.save()
-                    except Exception as e:
-                        return response.json(500, {'details': repr(e)})
-                    else:
-                        if device_meal.id:
-                            return response.json(0, {'id': device_meal.id,
-                                                    'status': device_meal.status,
-                                                    'uid': device_meal.uid,
-                                                    'rank': rank,
-                                                    'channel': device_meal.channel,
-                                                    'add_time': str(device_meal.add_time),
-                                                    'update_time': str(device_meal.update_time),
-                                                    'end_time': str(device_meal.end_time)})
+                except Exception as e:
+                    return response.json(500, {'details': repr(e)})
+                else:
+                    return response.json(0, {'id': device_meal.id,
+                                             'status': device_meal.status,
+                                             'uid': device_meal.uid,
+                                             'rank': rank,
+                                             'channel': device_meal.channel,
+                                             'add_time': str(device_meal.add_time),
+                                             'update_time': str(device_meal.update_time),
+                                             'end_time': str(device_meal.end_time)})
+
             return response.json(444)
         else:
             return response.json(404)
 
-    def query(self, request_dict, userID,response):
+    def query(self, request_dict, userID, response):
         own_perm = ModelService.check_permission(userID=userID, permID=30)
         if own_perm is True:
             page = int(request_dict.get('page', None))
@@ -151,14 +151,14 @@ class DeviceMeal(View):
         else:
             return response.json(404)
 
-    def update(self, request_dict, userID,response):
+    def update(self, request_dict, userID, response):
         own_perm = ModelService.check_permission(userID=userID, permID=30)
         if not own_perm:
             return response.json(404)
         id = request_dict.get('id', None)
         status = request_dict.get('status', None)
         uid = request_dict.get('uid', None)
-        param_flag = CommonService.get_param_flag(data=[status, uid,id])
+        param_flag = CommonService.get_param_flag(data=[status, uid, id])
         if param_flag is True:
             try:
                 dmqs = Device_Meal.objects.get(id=id)
@@ -170,12 +170,12 @@ class DeviceMeal(View):
                 print(errorInfo)
                 return response.json(424, {'details': repr(e)})
             else:
-                return response.json(0, {'update_id': dmqs.id,'update_time': str(dmqs.now_time),
-                                             'end_time': str(dmqs.end_time)})
+                return response.json(0, {'update_id': dmqs.id, 'update_time': str(dmqs.now_time),
+                                         'end_time': str(dmqs.end_time)})
         else:
             return response.json(444)
 
-    def delete(self, request_dict, userID,response):
+    def delete(self, request_dict, userID, response):
         own_perm = ModelService.check_permission(userID=userID, permID=10)
         if own_perm is True:
             id_list = request_dict.getlist('id', None)
@@ -225,22 +225,22 @@ class DeviceMeal(View):
                     else:
                         if device_meal.id:
                             return response.json(0,
-                                                {
-                                                    'id': device_meal.id,
-                                                    'status': device_meal.status,
-                                                    'uid': device_meal.uid,
-                                                    'rank': rank,
-                                                    'channel': device_meal.channel,
-                                                    'add_time': str(device_meal.add_time),
-                                                    'update_time': str(device_meal.update_time),
-                                                    'end_time': str(device_meal.end_time),
-                                                })
+                                                 {
+                                                     'id': device_meal.id,
+                                                     'status': device_meal.status,
+                                                     'uid': device_meal.uid,
+                                                     'rank': rank,
+                                                     'channel': device_meal.channel,
+                                                     'add_time': str(device_meal.add_time),
+                                                     'update_time': str(device_meal.update_time),
+                                                     'end_time': str(device_meal.end_time),
+                                                 })
             else:
                 return response.json(14)
         return response.json(444)
 
     # 查询设备是否开通
-    def querybyuser(self, request_dict, userID,response):
+    def querybyuser(self, request_dict, userID, response):
         uid = request_dict.get('uid', None)
         channel = request_dict.get('channel', None)
         param_flag = CommonService.get_param_flag(data=[uid, channel])
@@ -262,7 +262,7 @@ class DeviceMeal(View):
         else:
             return response.json(444)
 
-    def updatebyuser(self, request_dict, userID,response):
+    def updatebyuser(self, request_dict, userID, response):
         uid = request_dict.get('uid', None)
         channel = request_dict.get('channel', None)
         rank = request_dict.get('rank', None)
@@ -291,14 +291,14 @@ class DeviceMeal(View):
                         device_meal.rank = store_meal
                         device_meal.save()
                         return response.json(0, {'update_id': device_meal.id,
-                                                'update_time': str(now_time),
-                                                'end_time': str(end_time)})
+                                                 'update_time': str(now_time),
+                                                 'end_time': str(end_time)})
             else:
                 return response.json(14)
         else:
             return response.json(444)
 
-    def updatestatusbyuser(self, request_dict, userID,response):
+    def updatestatusbyuser(self, request_dict, userID, response):
         uid = request_dict.get('uid', None)
         channel = request_dict.get('channel', None)
         status = request_dict.get('status', None)
@@ -317,7 +317,7 @@ class DeviceMeal(View):
                         device_meal.save()
                         now_time = timezone.localtime(timezone.now())
                         return response.json(0, {'update_id': device_meal.id,
-                                                'update_time': str(now_time)})
+                                                 'update_time': str(now_time)})
             else:
                 return response.json(14)
         else: