| @@ -0,0 +1,20 @@ | ||
| 1 | +# -*- coding: utf-8 -*- | |
| 2 | +# Generated by Django 1.11.27 on 2020-01-16 18:48 | |
| 3 | +from __future__ import unicode_literals | |
| 4 | + | |
| 5 | +from django.db import migrations, models | |
| 6 | + | |
| 7 | + | |
| 8 | +class Migration(migrations.Migration): | |
| 9 | + | |
| 10 | + dependencies = [ | |
| 11 | +        ('account', '0037_auto_20191119_1348'), | |
| 12 | + ] | |
| 13 | + | |
| 14 | + operations = [ | |
| 15 | + migrations.AddField( | |
| 16 | + model_name='userinfo', | |
| 17 | + name='subscribe', | |
| 18 | + field=models.IntegerField(db_index=True, default=1, help_text='\u662f\u5426\u5173\u6ce8', verbose_name='subscribe'), | |
| 19 | + ), | |
| 20 | + ] | 
| @@ -351,6 +351,8 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin): | ||
| 351 | 351 | login_ip = models.CharField(_(u'login_ip'), max_length=32, blank=True, null=True, help_text=_(u'登录IP')) | 
| 352 | 352 | login_at = models.DateTimeField(_(u'login_at'), blank=True, null=True, help_text=_(u'登录时间')) | 
| 353 | 353 |  | 
| 354 | + subscribe = models.IntegerField(_(u'subscribe'), default=1, help_text=u'是否关注', db_index=True) | |
| 355 | + | |
| 354 | 356 | has_membercard = models.BooleanField(_(u'has_membercard'), default=False, help_text=_(u'是否激活会员卡'), db_index=True) | 
| 355 | 357 | membercardid = models.CharField(_(u'membercardid'), max_length=32, blank=True, null=True, help_text=_(u'会员卡编号'), db_index=True) | 
| 356 | 358 | memberusercardcode = models.CharField(_(u'memberusercardcode'), max_length=32, blank=True, null=True, help_text=_(u'用户会员卡编号'), db_index=True) | 
| @@ -439,6 +441,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin): | ||
| 439 | 441 | 'nickname': self.nickname, | 
| 440 | 442 | 'avatar': self.avatar, | 
| 441 | 443 | 'phone': self.phone, | 
| 444 | + 'subscribe': self.subscribe, | |
| 442 | 445 | 're_membercard': True if self.has_membercard and not self.memberusercardcode else False, | 
| 443 | 446 | 'has_membercard': self.has_membercard, | 
| 444 | 447 | 'membercardid': self.membercardid, | 
| @@ -75,8 +75,8 @@ class Command(CompatibilityBaseCommand): | ||
| 75 | 75 |                          'language': userinfo.get('language', ''), | 
| 76 | 76 |                          'remark': userinfo.get('remark', ''), | 
| 77 | 77 | }) | 
| 78 | - UserInfo.objects.filter(unionid=unionid).update(openid=openid) | |
| 79 | 78 | else: | 
| 80 | 79 | SubscribeUserInfo.objects.filter(extraid=brand_id, openid=openid).update(subscribe=subscribe) | 
| 80 | + UserInfo.objects.filter(unionid=unionid).update(openid=openid, subscribe=subscribe) | |
| 81 | 81 |  | 
| 82 | 82 | close_old_connections() |