增加region

Controller/SysMsg.py

@@ -87,7 +87,7 @@ class SysMsgView(View):
             if app_list:
                 ue_filter = ue_filter.filter(appBundleId__in=app_list)
             if region:
-                ue_filter.filter(userID__language__in=region)
+                ue_filter.filter(region__in=region)
             ue_count = ue_filter.count()
             range_count = math.ceil(ue_count / 5000)
             SysMassModel.objects.create(

Controller/UserController.py

@@ -1266,7 +1266,7 @@ class InitInfoView(View):
         push_type = request_dict.get('push_type', None)
         appBundleId = request_dict.get('appBundleId', None)
         tz = request_dict.get('tz', None)
-        is_cn = request_dict.get('is_cn', None)
+        region = request_dict.get('region', '')  # 语言区域
         nowTime = int(time.time())
         if all([token_val, push_type, appBundleId]):
             if push_type == 0:
@@ -1288,7 +1288,8 @@ class InitInfoView(View):
                     update_dict = {
                         'token_val': token_val,
                         'push_type': push_type,
-                        'tz': tz
+                        'tz': tz,
+                        '': region
                     }
                     UidPushModel.objects.filter(userID_id=userID, m_code=m_code, uid_set_id__in=uid_set_id_list). \
                         update(**update_dict)
@@ -1298,6 +1299,7 @@ class InitInfoView(View):
                     update_dict = {
                         'updTime': nowTime,
                         'appBundleId': appBundleId,
+                        'region': region
                         # 'is_cn':
                     }
                     user_extend_qs.update(**update_dict)
@@ -1306,7 +1308,8 @@ class InitInfoView(View):
                         'addTime': nowTime,
                         'updTime': nowTime,
                         'appBundleId': appBundleId,
-                        'userID_id': userID
+                        'userID_id': userID,
+                        'region': region
                     }
                     UserExtendModel.objects.create(**create_dict)
         res = {
@@ -1425,7 +1428,7 @@ class wxAuthSignView(TemplateView):
                 access_token = res_json['access_token']
                 openid = res_json['openid']
                 if access_token and openid:
-                    user_extend_qs = UserExtendModel.objects.filter(authOpenID=openid,authType=1)
+                    user_extend_qs = UserExtendModel.objects.filter(authOpenID=openid, authType=1)
                     if user_extend_qs.exists():
                         # 如果用户绑定过则直接登录
                         userID = user_extend_qs[0].userID

Model/models.py

@@ -712,6 +712,7 @@ class UserExtendModel(models.Model):
     appBundleId = models.CharField(default='', max_length=32, verbose_name=u'appID')
     authType = models.SmallIntegerField(default=0, verbose_name=0)  # 授权类型 0 非授权，1 微信授权
     authOpenID = models.CharField(default='', max_length=64, verbose_name='唯一标记')  # 绑定唯一标记
+    region = models.CharField(default='', max_length=16, verbose_name='区域语言')
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
 
@@ -735,4 +736,4 @@ class SysMassModel(models.Model):
         db_table = 'sys_mass'
         verbose_name = '群发消息记录表'
         verbose_name_plural = verbose_name
-        ordering = ('-id',)
+        ordering = ('-id',)