判断用户是否开通云盘

Controller/IcloudService/IcloudMeal.py

@@ -158,14 +158,14 @@ class IcloudMeal(View):
             if pay_type == 1:  # PayPal支付
                 res_dict = cls.create_paypal_payment(lang, order_id, price, currency, content)
                 if not res_dict:
-                    return response.json(10, 'create ai order failed')
+                    return response.json(10, 'create icloud order failed')
                 order_dict['paymentID'], order_dict['pay_url'] = res_dict['payment_id'], res_dict['pay_url']
                 res_data = {'orderID': order_id, 'redirectUrl': order_dict['pay_url']}
 
             elif pay_type == 2:  # 支付宝支付
                 res_dict = cls.create_alipay_payment(lang, order_id, price, title, content)
                 if not res_dict:
-                    return response.json(10, 'create ai order failed')
+                    return response.json(10, 'create icloud order failed')
                 order_dict['pay_url'] = res_dict['pay_url']
                 res_data = {'orderID': order_id, 'redirectUrl': order_dict['pay_url']}
 
@@ -173,7 +173,7 @@ class IcloudMeal(View):
                 ip = CommonService.get_ip_address(request)
                 res_dict = cls.create_wechat_payment(lang, order_id, price, ip, content)
                 if not res_dict:
-                    return response.json(10, 'create ai order failed')
+                    return response.json(10, 'create icloud order failed')
                 order_dict['pay_url'], sign_params = res_dict['pay_url'], res_dict['sign_params']
                 res_data = {'orderID': order_id, 'redirectUrl': order_dict['pay_url'], 'result': sign_params}
             else:

Controller/UserManger.py

@@ -12,7 +12,8 @@ from django.views.generic import TemplateView, View
 
 from Ansjer.config import BASE_DIR, 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, CountryLanguageModel, LanguageModel, App_Info
+from Model.models import Role, Device_User, UserOauth2Model, UserExModel, CountryLanguageModel, LanguageModel, App_Info, \
+    IcloudUseDetails
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
@@ -74,6 +75,9 @@ class showUserMoreView(TemplateView):
                         userIconUrl = SERVER_DOMAIN + 'account/getAvatar/' + userIconPath
                         sqlDict['datas'][k]['fields']['userIconUrl'] = userIconUrl
 
+                # 判断用户是否开通云盘
+                icloud_user_qs = IcloudUseDetails.objects.filter(user_id=user_id)
+                v['fields']['is_cloudDrive'] = 1 if icloud_user_qs.exists() else 0
                 # 确认地区字段
                 sqlDict['datas'][k]['fields']['region_status'] = 1 if region_status else 0
 
@@ -111,7 +115,7 @@ class showUserMoreView(TemplateView):
                     region_country = sqlDict['datas'][k]['fields']['region_country']
                     language_qs = LanguageModel.objects.filter(lang=lang).values('id')
                     region_qs = CountryLanguageModel.objects.filter(country_id=region_country,
-                                                                    language_id=language_qs[0]['id']).\
+                                                                    language_id=language_qs[0]['id']). \
                         values('country_name')
                     sqlDict['datas'][k]['fields']['region'] = region_qs[0]['country_name'] if region_qs.exists() else ''
 

Model/models.py

@@ -173,7 +173,6 @@ class Device_User(AbstractBaseUser):
     language = models.CharField(blank=True, max_length=16, default='en', verbose_name=u'语言地区')
     # 手机注册增加字段
     phone = models.CharField(max_length=16, db_index=True, verbose_name=u'手机号', default='', blank=True)
-    is_cloudDrive = models.IntegerField(blank=True, default=0, verbose_name=u'用户是否开通云盘')  # 0：未开通， 1：已开通
     fingerprint_enable = models.SmallIntegerField(default=0, verbose_name=u'是否开启了指纹登录')  # 0：未开启，1：已开启
     fingerprint_key = models.CharField(max_length=128, default='', verbose_name=u'客户端用于解码的密钥等信息')
     is_local = models.BooleanField(blank=True, default=False, verbose_name=u'是否是本地登录用户')  # False：账号登录，1：本地登录