ts

Ansjer/test/util/var_dump.py → Ansjer/test/util/testss.py

@@ -1,3 +1,4 @@
+
 import time
 
 tmstm = '2018121810'

Controller/CloudVod.py

@@ -113,10 +113,13 @@ class CloudVodView(View):
 
     def do_meal_details(self, request_dict, userID, response):
         did = request_dict.get('did', None)
-        qs = Device_Info.objects.filter(userID_id=userID, id=did).values("UID")
-        UID = qs[0]["UID"]
-        dmqs = Device_Meal.objects.filter(uid=UID).values('rank', 'status', 'channel', 'add_time', 'update_time',
-                                                          'end_time', 'rank__title')
+        uidf = Device_Info.objects.filter(userID_id=userID)
+        if did:
+            uidf.filter(id=did)
+        uids = uidf.values_list("UID",flat=True)
+        uid_list = list(uids)
+        dmqs = Device_Meal.objects.filter(uid__in=uid_list).values('rank', 'status', 'channel', 'add_time', 'update_time',
+                                                              'end_time', 'rank__title')
         res = CommonService.qs_to_list(dmqs)
         return response.json(0, res)
 
@@ -456,7 +459,8 @@ class CloudVodView(View):
             bucket = oss2.Bucket(auth, endpoint, bucket_name)
             m3u8 = '{uid}/vod{channel}/{daytime}/{time}/{time}.m3u8'. \
                 format(uid=UID, channel=channel, daytime=daytime, time=vod['time'])
-            ts = '{uid}/vod{channel}/{daytime}/{time}/ts0.ts'.format(uid=UID, channel=channel, daytime=daytime,time=vod['time'])
+            ts = '{uid}/vod{channel}/{daytime}/{time}/ts0.ts'.format(uid=UID, channel=channel, daytime=daytime,
+                                                                     time=vod['time'])
             url = bucket.sign_url('GET', m3u8, 3600, params={'x-oss-process': 'hls/sign'})
             urllst = url.split('?')
             url_start = urllib.parse.unquote(urllst[0])
@@ -464,5 +468,5 @@ class CloudVodView(View):
             vod_play_url = '{url_start}?{url_end}'.format(url_start=url_start, url_end=url_end)
             thumb = bucket.sign_url('GET', ts, 3600,
                                     params={'x-oss-process': 'video/snapshot,t_10000,m_fast,w_300'})
-            vod_play_list.append({'name': vod['time'], 'sign_url': vod_play_url, 'thumb': thumb})
+            vod_play_list.append({'name': vod['time'], 'sign_url': vod_play_url, 'thumb': thumb, 'sec': vod['sec']})
         return response.json(0, vod_play_list)

Controller/MealManage.py

@@ -135,25 +135,23 @@ class MealManage(View):
             if param_flag is True:
                 try:
                     store_meal = Store_Meal.objects.get(id=id)
+                    now_time = timezone.localtime(timezone.now())
+                    print(now_time)
+                    store_meal.title = title
+                    store_meal.price = price
+                    store_meal.content = content
+                    store_meal.day = day
+                    if bucketID:
+                        store_meal.bucket_id = bucketID
+                    if currency:
+                        store_meal.currency = currency
+                    store_meal.save()
                 except Exception:
                     errorInfo = traceback.format_exc()
                     print(errorInfo)
                     return response.json(424, {'details': errorInfo})
                 else:
-                    if store_meal.id:
-                        now_time = timezone.localtime(timezone.now())
-                        print(now_time)
-                        store_meal.title = title
-                        store_meal.price = price
-                        store_meal.content = content
-                        store_meal.day = day
-                        if bucketID:
-                            store_meal.bucket_id = bucketID
-                        if currency:
-                            store_meal.currency = currency
-                        store_meal.save()
-                        return response.json(0, {'update_id': store_meal.id,
-                                                 'update_time': str(now_time)})
+                    return response.json(0, {'update_id': store_meal.id, 'update_time': str(now_time)})
             else:
                 return response.json(444)
         else:

Controller/OrderContrller.py

@@ -69,9 +69,9 @@ class OrderView(View):
         omqs = Order_Model.objects.filter(userID_id=userID)
         if not omqs.exists():
             return response.json(10, '订单不存在')
-        count= omqs.count()
+        count = omqs.count()
         order_ql = omqs[(page - 1) * line:page * line].values("orderID", "UID", "channel", "desc", "price", "addTime",
                                                               "updTime", "paypal", "rank__day", "rank__price",
                                                               "rank__content", "rank__title")
         data = list(order_ql)
-        return response.json(0, {'data':data,'count':count})
+        return response.json(0, {'data': data, 'count': count})