account/models.py

@@ -392,9 +392,10 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                             }
              

                         ]
              

                 
              

                -    def srinfo(self, brand_id=None):
              

                +    @property
              

                +    def srinfo(self):
              

                         try:
              

                -            sr = SalesResponsibilityInfo.objects.get(brand_id=brand_id, unionid=self.unionid, user_status=SalesResponsibilityInfo.ACTIVATED)
              

                +            sr = SalesResponsibilityInfo.objects.get(brand_id=self.brand_id, unionid=self.unionid, user_status=SalesResponsibilityInfo.ACTIVATED)
              

                         except SalesResponsibilityInfo.DoesNotExist:
              

                             sr = None
              

                         return sr.base_data if sr else {
              
@@ -403,7 +404,8 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                             'is_super_sr': False,
              

                         }
              

                 
              

                -    def brandata(self, brand_id=None):
              

                +    @property
              

                +    def brandata(self):
              

                         if self.clerk_id:
              

                             try:
              

                                 saleclerk = SaleclerkInfo.objects.get(clerk_id=self.clerk_id, status=True)
              
@@ -426,7 +428,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                             'cardList': self.cardList,
              

                             'saleclerk': bool(saleclerk_info),
              

                             'saleclerk_info': saleclerk_info,
              

                -            'sr_info': self.srinfo(brand_id),
              

                +            'sr_info': self.srinfo,
              

                         }
              

                 
              

                     @property
              

miniapp/views.py

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

                     # Just for compatible because of store session_key has changed
              

                     store_session_key(appid=appid, secret=secret, session_key=session_key, unid='', storage=RedisStorage(r))
              

                 
              

                -    return response(200, 'Mini App Login Success', u'微信小程序登录成功', user.brandata(brand_id=brand_id))
              

                +    return response(200, 'Mini App Login Success', u'微信小程序登录成功', user.brandata)
              

                 
              

                 
              

                 @logit(res=True)
              
@@ -161,7 +161,7 @@ def mini_login_api(request):

                     # Just for compatible because of store session_key has changed
              

                     store_session_key(appid=appid, secret=secret, session_key=session_key, unid='', storage=RedisStorage(r))
              

                 
              

                -    return response(200, 'Mini App Login Success', u'微信小程序登录成功', user.brandata(brand_id=brand_id))
              

                +    return response(200, 'Mini App Login Success', u'微信小程序登录成功', user.brandata)
              

                 
              

                 
              

                 @logit
              
@@ -211,7 +211,7 @@ def get_userinfo_api2(request):

                     # Store Userinfo
              

                     set_profile_info(user)
              

                 
              

                -    return response(200, 'Mini App Get Userinfo Success', u'微信小程序获取用户信息成功', user.brandata(brand_id=brand_id))
              

                +    return response(200, 'Mini App Get Userinfo Success', u'微信小程序获取用户信息成功', user.brandata)
              

                 
              

                 
              

                 @logit(res=True)