account/migrations/0036_auto_20190415_0225.py

@@ -0,0 +1,29 @@

                +# -*- coding: utf-8 -*-
              

                +# Generated by Django 1.11.20 on 2019-04-14 18:25
              

                +from __future__ import unicode_literals
              

                +
              

                +from django.db import migrations, models
              

                +
              

                +
              

                +class Migration(migrations.Migration):
              

                +
              

                +    dependencies = [
              

                +        ('account', '0035_auto_20181006_1142'),
              

                +    ]
              

                +
              

                +    operations = [
              

                +        migrations.AddField(
              

                +            model_name='userinfo',
              

                +            name='brand_id',
              

                +            field=models.CharField(blank=True, db_index=True, help_text='\u54c1\u724c\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='brand_id'),
              

                +        ),
              

                +        migrations.AlterField(
              

                +            model_name='userinfo',
              

                +            name='unionid',
              

                +            field=models.CharField(blank=True, db_index=True, help_text='\u5fae\u4fe1 Unionid', max_length=32, null=True, verbose_name='unionid'),
              

                +        ),
              

                +        migrations.AlterUniqueTogether(
              

                +            name='userinfo',
              

                +            unique_together=set([('brand_id', 'unionid')]),
              

                +        ),
              

                +    ]
              

account/models.py

@@ -289,6 +289,8 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                         (FEMALE, u'女'),
              

                     )
              

                 
              

                +    brand_id = models.CharField(_(u'brand_id'), max_length=32, blank=True, null=True, help_text=u'品牌唯一标识', db_index=True)
              

                +
              

                     user_id = models.CharField(_(u'user_id'), max_length=32, blank=True, null=True, help_text=u'用户唯一标识', db_index=True, unique=True)
              

                 
              

                     user_from = models.IntegerField(_(u'user_from'), choices=USER_FROM, default=APP_USER, help_text=u'用户来源')
              
@@ -297,7 +299,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                     username = models.CharField(_(u'username'), max_length=255, blank=True, null=True, help_text=u'用户用户名', db_index=True, unique=True)
              

                     password = models.CharField(_(u'password'), max_length=255, blank=True, null=True, help_text=u'用户密码')
              

                     # 微信授权用户
              

                -    unionid = models.CharField(_(u'unionid'), max_length=32, blank=True, null=True, help_text=u'微信 Unionid', db_index=True, unique=True)
              

                +    unionid = models.CharField(_(u'unionid'), max_length=32, blank=True, null=True, help_text=u'微信 Unionid', db_index=True)
              

                     openid = models.CharField(_(u'openid'), max_length=32, blank=True, null=True, help_text=u'微信 Openid，拍爱用户端', db_index=True, unique=True)
              

                     openid_lensman = models.CharField(_(u'openid_lensman'), max_length=32, blank=True, null=True, help_text=u'微信 Openid，拍爱摄影师端', db_index=True, unique=True)
              

                     openid_tourguide = models.CharField(_(u'openid_tourguide'), max_length=32, blank=True, null=True, help_text=u'微信 Openid，拍爱导游端', db_index=True, unique=True)
              
@@ -344,6 +346,10 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                         verbose_name = _(u'userinfo')
              

                         verbose_name_plural = _(u'userinfo')
              

                 
              

                +        unique_together = (
              

                +            ('brand_id', 'unionid')
              

                +        )
              

                +
              

                     def __unicode__(self):
              

                         return unicode(self.pk)
              

                 
              

miniapp/views.py

@@ -50,7 +50,7 @@ def get_userinfo_api(request):

                     userinfo = get_userinfo(appid=appid, secret=secret, code=code, session_key=session_key, encryptedData=encryptedData, iv=iv)
              

                 
              

                     # Get or Create User
              

                -    user, created = UserInfo.objects.select_for_update().get_or_create(unionid=userinfo.get('unionId', ''))
              

                +    user, created = UserInfo.objects.select_for_update().get_or_create(brand_id=brand_id, unionid=userinfo.get('unionId', ''))
              

                 
              

                     # Set User_id
              

                     if created:
              
@@ -124,7 +124,7 @@ def mini_login_api(request):

                     openid = session_info.get('openid', '')
              

                 
              

                     # Get or Create User
              

                -    user, created = UserInfo.objects.select_for_update().get_or_create(openid_miniapp=openid)
              

                +    user, created = UserInfo.objects.select_for_update().get_or_create(brand_id=brand_id, openid_miniapp=openid)
              

                 
              

                     # Set User_id
              

                     if created: