account/models.py

@@ -375,9 +375,12 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                 
              

                     def brandata(self, brand_id=None):
              

                         if self.unionid:
              

                -            saleclerk = SaleclerkInfo.objects.filter(brand_id=brand_id, unionid=self.unionid, status=True).exists()
              

                +            try:
              

                +                saleclerk_info = SaleclerkInfo.objects.get(brand_id=brand_id, unionid=self.unionid, status=True).data
              

                +            except SaleclerkInfo.DoesNotExist:
              

                +                saleclerk_info = {}
              

                         else:
              

                -            saleclerk = False
              

                +            saleclerk_info = False
              

                         return {
              

                             'user_id': self.user_id,
              

                             'name': self.name,
              
@@ -387,7 +390,8 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                             'phone': self.phone,
              

                             # TODO: Diff for Brands
              

                             'has_membercard': self.has_membercard,
              

                -            'saleclerk': saleclerk,
              

                +            'saleclerk': bool(saleclerk_info),
              

                +            'saleclerk_info': saleclerk_info,
              

                         }
              

                 
              

                 
              

mch/models.py

@@ -327,6 +327,7 @@ class SaleclerkInfo(BaseModelMixin, SexModelMixin):

                             'clerk_sex': self.clerk_sex,
              

                             'clerk_phone': self.clerk_phone,
              

                             'integral': self.integral,
              

                +            'total_integral': self.total_integral,
              

                             'status': self.user_status,
              

                             'refused_reason': self.refused_reason,
              

                             'is_auth': self.is_auth,