Merge branch 'test' of http://192.168.136.99:3000/servers/ASJServer into locky

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')

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,

Controller/CloudStorage.py

@@ -1156,7 +1156,7 @@ class CloudStorageView(View):
                 subInfo = Paypal.subscriptions(store_info=smqs[0], lang=lang, orderID=orderID, price=price)
                 if not subInfo:
                     return response.json(10048)
-                store_meal_qs = Store_Meal.objects.filter(id=rank, lang__lang='cn', is_show=1).values('lang__title',
+                store_meal_qs = Store_Meal.objects.filter(id=rank, lang__lang='cn', is_show=0).values('lang__title',
                                                                                                       'lang__content')
                 if store_meal_qs.exists():
                     store_meal_name = store_meal_qs[0]['lang__title'] + '-' + store_meal_qs[0]['lang__content']
@@ -1208,7 +1208,7 @@ class CloudStorageView(View):
                 if link.rel == "approval_url":
                     approval_url = str(link.href)
                     print("Redirect for approval: %s" % (approval_url))
-                    store_meal_qs = Store_Meal.objects.filter(id=rank, lang__lang='cn', is_show=1).values('lang__title',
+                    store_meal_qs = Store_Meal.objects.filter(id=rank, lang__lang='cn', is_show=0).values('lang__title',
                                                                                                           'lang__content')
                     if store_meal_qs.exists():
                         store_meal_name = store_meal_qs[0]['lang__title'] + '-' + store_meal_qs[0]['lang__content']
@@ -1258,7 +1258,7 @@ class CloudStorageView(View):
                     redirectUrl = aliPayObj.alipay_prefix + order_string
                     print('---------tttt')
                     print(redirectUrl)
-                    store_meal_qs = Store_Meal.objects.filter(id=rank, lang__lang='cn', is_show=1).values('lang__title',
+                    store_meal_qs = Store_Meal.objects.filter(id=rank, lang__lang='cn', is_show=0).values('lang__title',
                                                                                                           'lang__content')
                     if store_meal_qs.exists():
                         store_meal_name = store_meal_qs[0]['lang__title'] + '-' + store_meal_qs[0]['lang__content']
@@ -1294,7 +1294,7 @@ class CloudStorageView(View):
             if not response:
                 return response.json(10, '生成订单错误.')
             # 回调函数
-            store_meal_qs = Store_Meal.objects.filter(id=rank, lang__lang='cn', is_show=1).values('lang__title',
+            store_meal_qs = Store_Meal.objects.filter(id=rank, lang__lang='cn', is_show=0).values('lang__title',
                                                                                                   'lang__content')
             if store_meal_qs.exists():
                 store_meal_name = store_meal_qs[0]['lang__title'] + '-' + store_meal_qs[0]['lang__content']

Controller/PaymentCycle.py

@@ -502,7 +502,7 @@ class PaypalCycleNotify(View):
                 #     }
                 #     UIDMainUser.objects.create(**uid_main_dict)
                 orderID = CommonService.createOrderID()
-                store_meal_qs = Store_Meal.objects.filter(id=rank, lang__lang='cn', is_show=1).values('lang__title',
+                store_meal_qs = Store_Meal.objects.filter(id=rank, lang__lang='cn', is_show=0).values('lang__title',
                                                                                                       'lang__content')
                 if store_meal_qs.exists():
                     store_meal_name = store_meal_qs[0]['lang__title'] + '-' + store_meal_qs[0]['lang__content']

Controller/TestApi.py

@@ -825,7 +825,7 @@ class testView(View):
             return response.json(10, repr(e))
         if order_string:
             redirectUrl = aliPayObj.alipay_prefix + order_string
-            store_meal_qs = Store_Meal.objects.filter(id=rank, lang__lang='cn', is_show=1).values('lang__title',
+            store_meal_qs = Store_Meal.objects.filter(id=rank, lang__lang='cn', is_show=0).values('lang__title',
                                                                                                   'lang__content')
             if store_meal_qs.exists():
                 store_meal_name = store_meal_qs[0]['lang__title'] + '-' + store_meal_qs[0]['lang__content']

Controller/UserController.py

@@ -41,7 +41,7 @@ from Ansjer.config import BASE_DIR, CONFIG_US, CONFIG_EUR, CONFIG_INFO, SERVER_D
 from Controller.CheckUserData import DataValid, date_handler, RandomStr
 from Model.models import Device_User, Role, UidPushModel, UserOauth2Model, UserExModel, Device_Info, UidSetModel, \
     UserAppFrequencyModel, CountryIPModel, CountryModel, UidChannelSetModel, Order_Model, UID_Bucket, Unused_Uid_Meal, \
-    GatewayPush
+    GatewayPush, CountryLanguageModel, LanguageModel
 from Object.AWS.SesClassObject import SesClassObject
 from Object.AliSmsObject import AliSmsObject
 from Object.RedisObject import RedisObject
@@ -2046,6 +2046,7 @@ class v3LoginView(TemplateView):
 
         now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
         region_country = users['region_country']
+        lang_id = LanguageModel.objects.filter(lang=lang).values('id')
         if not number or number == '0':
             user_qs.update(last_login=now_time, language=response.lang)
         else:
@@ -2056,7 +2057,7 @@ class v3LoginView(TemplateView):
             else:
                 res['status'] = 0
                 user_qs.update(last_login=now_time, language=response.lang, region_country=number)
-        region_qs = CountryModel.objects.filter(id=region_country).values('country_name')
+        region_qs = CountryLanguageModel.objects.filter(country_id=region_country, language_id=lang_id[0]['id']).values('country_name')
 
         res['rid'] = users['role__rid']
         res['roleName'] = users['role__roleName']

Controller/UserManger.py

@@ -16,7 +16,7 @@ from django.views.generic import TemplateView, View
 
 from Ansjer.config import BASE_DIR, SERVER_TYPE, ACCESS_KEY_ID, SECRET_ACCESS_KEY, REGION_NAME, AVATAR_BUCKET
 from Ansjer.config import SERVER_DOMAIN
-from Model.models import Role, Device_User, UserOauth2Model, UserExModel
+from Model.models import Role, Device_User, UserOauth2Model, UserExModel, CountryLanguageModel
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
@@ -69,8 +69,16 @@ class showUserMoreView(TemplateView):
             if len(v['fields']['role']):
                 roleName = ModelService.getRole(rid=v['fields']['role'][0])
                 sqlDict["datas"][k]['fields']['rolename'] = roleName
+            region_country = sqlDict["datas"][k]['fields']['region_country']
+            if not region_country == 0:
+                country_qs = CountryLanguageModel.objects.filter(country_id=region_country).values(
+                    'country__region__push_api')
+                sqlDict["datas"][k]['fields']['api'] = country_qs[0]['country__region__push_api']
+            else:
+                sqlDict["datas"][k]['fields']['api'] = ''
+
         # 增加oauth2关联数据
-        ua_qs = UserOauth2Model.objects.filter(userID_id=userID).values_list('authType',flat=True)
+        ua_qs = UserOauth2Model.objects.filter(userID_id=userID).values_list('authType', flat=True)
         sqlDict["oauth2"] = list(ua_qs)
         return response.json(0, sqlDict)
 
@@ -207,7 +215,7 @@ class getAvatarView(TemplateView):
             except Exception as e:
                 print(e)
                 return response.json(500, repr(e))
-        
+
         fullPath = os.path.join(BASE_DIR, "static", filePath).replace('\\', '/')
         if os.path.isfile(fullPath):
             try: