优化查询套餐明细

Controller/IcloudService/IcloudMeal.py

@@ -494,7 +494,6 @@ class IcloudMeal(View):
         if not cloud_use_qs.exists():
             return response.json(0)
         try:
-            data = {}
             cloud_service_list = []
             count = cloud_service_qs.count()
             cloud_service_qs = cloud_service_qs.values('use_status', 'type', 'order_id', 'add_time',
@@ -502,18 +501,21 @@ class IcloudMeal(View):
                 '-add_time')[(page - 1) * line:page * line]
             # 获取套餐明细
             for service in cloud_service_qs:
-                data['use_status'] = service['use_status']
-                data['type'] = service['type']
-                data['order_id'] = service['order_id']
-                data['add_time'] = service['add_time']
-                data['end_time'] = service['end_time']
+                data = {
+                    'use_status': service['use_status'],
+                    'type': service['type'],
+                    'order_id': service['order_id'],
+                    'add_time': service['add_time'],
+                    'end_time': service['end_time'],
+                }
+                # 注册永久送
                 if service['type'] == 0:
-                    if lang == 'cn':
-                        data['title'] = '1G永久套餐'
-                        data['note'] = '赠送'
-                    if lang == 'en':
-                        data['title'] = '1G Permanent Package'
-                        data['note'] = 'Gift'
+                    icloud_meal_qs = ICloudStoreMeal.objects.filter(price=0, expire=0, is_show=0, size=1, pay_type=10,
+                                                                    lang__lang=lang).values('lang__title',
+                                                                                            'lang__content')
+                    data['title'] = icloud_meal_qs[0]['lang__title']
+                    data['note'] = icloud_meal_qs[0]['lang__content']
+                # 购买云存附送
                 if service['type'] == 1:
                     orders_qs = Order_Model.objects.filter(orderID=service['order_id'], order_type=0). \
                         values('desc', 'unify_combo_id')
@@ -522,6 +524,7 @@ class IcloudMeal(View):
                                                                     lang__lang=lang).values(
                         'lang__title')
                     data['title'] = cloud_store_qs[0]['lang__title']
+                # 单独购买套餐
                 if service['type'] == 2:
                     orders_qs = Order_Model.objects.filter(orderID=service['order_id']).values('desc', 'price',
                                                                                                'currency')