修改套餐名

Controller/CloudStorage.py

@@ -245,14 +245,10 @@ class CloudStorageView(View):
                     CloudStorageView.check_user_coupon_is_available(coupon_qs, item['id'])
                 for each in item['pay_type']:
                     if each['id'] == 10 and CONFIG_INFO != CONFIG_CN:
-                        if pixel_level == 0 and is_ai == 0:
+                        if is_ai == 0:
                             item['content'] = item['new_title'].get('1', '')
-                        elif pixel_level == 1 and is_ai == 0:
+                        elif is_ai == 1:
                             item['content'] = item['new_title'].get('2', '')
-                        elif pixel_level == 0 and is_ai == 1:
-                            item['content'] = item['new_title'].get('3', '')
-                        elif pixel_level == 1 and is_ai == 1:
-                            item['content'] = item['new_title'].get('4', '')
             res_c = {'area': area, 'items': items_list}
             res.append(res_c)
         # 是否促销
@@ -1702,7 +1698,7 @@ class CloudStorageView(View):
         for index, value in enumerate(store_list):
             if value['orderId'] and CONFIG_INFO != CONFIG_CN:
                 order_qs = Order_Model.objects.filter(orderID=value['orderId'], rank__lang__lang=lang).values('payType',
-                                                                                                              'price',
+                                                                                                              'rank__pay_type__id',
                                                                                                               'order_type',
                                                                                                               'rank__is_ai',
                                                                                                               'rank__pixel_level',
@@ -1731,21 +1727,12 @@ class CloudStorageView(View):
                             else:
                                 value['bucket__content'] = order_qs[0]['rank__lang__new_title'].get('4', '')
                     elif order_qs[0]['payType'] == 10:  # 免费套餐
-                        uid_set_qs = UidSetModel.objects.filter(uid=value['uid']).values('ucode')
-                        if not uid_set_qs.exists():
-                            return response.json(173)
-                        ucode = uid_set_qs[0]['ucode']
-                        pixel_level = 1 if ucode and int(ucode[-5]) >= 8 else 0
-                        if pixel_level == 0 and order_qs[0]['order_type'] == 0:
+                        if order_qs[0]['order_type'] == 0:
                             value['bucket__content'] = order_qs[0]['rank__lang__new_title'].get('1', '')
-                        elif pixel_level == 1 and order_qs[0]['order_type'] == 0:
+                        elif order_qs[0]['order_type'] == 1:
                             value['bucket__content'] = order_qs[0]['rank__lang__new_title'].get('2', '')
-                        elif pixel_level == 0 and order_qs[0]['order_type'] == 1:
-                            value['bucket__content'] = order_qs[0]['rank__lang__new_title'].get('3', '')
-                        elif pixel_level == 1 and order_qs[0]['order_type'] == 1:
-                            value['bucket__content'] = order_qs[0]['rank__lang__new_title'].get('4', '')
                     else:  # cdk套餐
-                        if order_qs[0]['price'] != '0.00':
+                        if order_qs[0]['rank__pay_type__id'] != 11:
                             if order_qs[0]['rank__pixel_level'] == 0 and order_qs[0]['rank__is_ai'] == 0:
                                 value['bucket__content'] = order_qs[0]['rank__lang__new_title'].get('1', '')
                             elif order_qs[0]['rank__pixel_level'] == 1 and order_qs[0]['rank__is_ai'] == 0:

Controller/OrderContrller.py

@@ -108,7 +108,7 @@ class OrderView(View):
         order_ql = omqs.values("orderID", "UID", "channel", "desc", "price", "currency",
                                "addTime", "rank__lang__new_title", "rank__pixel_level", "rank__commodity_code",
                                "updTime", "paypal", "rank__day", "payType",
-                               "rank__price", "status", "rank__is_ai",
+                               "rank__price", "status", "rank__is_ai", "rank__pay_type__id",
                                "rank__content", "rank__title", "rank__currency",
                                "rank_id", "rank__expire", 'store_meal_name', 'order_type')[
                    (page - 1) * line:page * line]
@@ -160,23 +160,12 @@ class OrderView(View):
                             else:
                                 d['rank__title'] = d['rank__lang__new_title'].get('4', '')
                     elif d['payType'] == 10:  # 免费套餐
-                        # 查询设备像素
-                        uid_set_qs = UidSetModel.objects.filter(uid=d['UID']).values('ucode')
-                        if not uid_set_qs.exists():
-                            pixel_level = 0
-                        else:
-                            ucode = uid_set_qs[0]['ucode']
-                            pixel_level = 1 if ucode and int(ucode[-5]) >= 8 else 0
-                        if pixel_level == 0 and d['order_type'] == 0:
+                        if d['order_type'] == 0:
                             d['rank__title'] = d['rank__lang__new_title'].get('1', '')
-                        elif pixel_level == 1 and d['order_type'] == 0:
+                        elif d['order_type'] == 1:
                             d['rank__title'] = d['rank__lang__new_title'].get('2', '')
-                        elif pixel_level == 0 and d['order_type'] == 1:
-                            d['rank__title'] = d['rank__lang__new_title'].get('3', '')
-                        elif pixel_level == 1 and d['order_type'] == 1:
-                            d['rank__title'] = d['rank__lang__new_title'].get('4', '')
                     else:  # cdk套餐
-                        if d['price'] != '0.00':
+                        if d['rank__pay_type__id'] != 11:
                             if d['rank__pixel_level'] == 0 and d['rank__is_ai'] == 0:
                                 d['rank__title'] = d['rank__lang__new_title'].get('1', '')
                             elif d['rank__pixel_level'] == 1 and d['rank__is_ai'] == 0: