Browse Source

后台AI用户信息增加设备版本号,优化AI订单页面

zhangdongming 3 years ago
parent
commit
322cb76e86
2 changed files with 16 additions and 4 deletions
  1. 13 2
      AdminController/AiServeController.py
  2. 3 2
      Controller/AiController.py

+ 13 - 2
AdminController/AiServeController.py

@@ -3,7 +3,7 @@
 import time
 
 from django.views.generic.base import View
-from Model.models import Lang, AiStoreMeal, AiService, Order_Model
+from Model.models import Lang, AiStoreMeal, AiService, Order_Model, Device_User, CountryModel, UidSetModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
@@ -392,7 +392,7 @@ class AiServeView(View):
                 'status',
                 'refunded_amount',
                 'addTime',
-                'updTime',
+                'updTime', 'userID_id',
             )[(page - 1) * line:page * line]
             data_list = []
             for order in order_qs:
@@ -410,6 +410,17 @@ class AiServeView(View):
                     'addTime': order['addTime'],
                     'updTime': order['updTime'],
                 }
+                dev_user_qs = Device_User.objects.filter(userID=order['userID_id']).values('region_country')
+                region_country = dev_user_qs.first()['region_country']
+                country = '未知国家'
+                if region_country > 0:
+                    country = '未知国家'
+                country_qs = CountryModel.objects.filter(id=region_country).values('country_name')
+                if country_qs.exists():
+                    country = country_qs.first()['country_name']
+                data_dict['country'] = country
+                uid_set_qs = UidSetModel.objects.filter(uid=order['UID']).values('version')
+                data_dict['version'] = uid_set_qs.first()['version'] if uid_set_qs.exists() else ''
                 ai_service_qs = AiService.objects.filter(
                     orders_id=order['orderID']).values(
                     'endTime', 'use_status')

+ 3 - 2
Controller/AiController.py

@@ -381,6 +381,7 @@ class AiView(View):
     # 体验AI套餐
     @staticmethod
     def experience_order(request_dict, userID, response):
+        logger = logging.getLogger('info')
         uid = request_dict.get('uid', None)
         channel = request_dict.get('channel', None)
         pay_type = int(request_dict.get('pay_type', None))
@@ -448,12 +449,12 @@ class AiView(View):
                                            desc=ai_store_meal_qs[0]['lang__content'], payType=pay_type, payTime=nowTime,
                                            price=ai_store_meal_qs[0]['price'], currency=ai_store_meal_qs[0]['currency'],
                                            addTime=nowTime, updTime=nowTime, pay_url='AI体验',
-                                           store_meal_name=store_meal_name,
+                                           store_meal_name=store_meal_name, order_type=1,
                                            rank_id=1, ai_rank_id=rank, status=1)
                 # ai服务表创建数据
                 AiService.objects.create(uid=uid, channel=channel, orders_id=orderID, detect_status=1, endTime=endTime,
                                          addTime=nowTime, updTime=nowTime, use_status=1)
-
+                logger.info('{}成功开通AI体验,结束时间{}'.format(uid, endTime))
                 if pay_type == 10:
                     ExperienceAiModel.objects.create(
                         experience_type=0,