wushaodong преди 4 години
родител
ревизия
cbf849fd07
променени са 2 файла, в които са добавени 9 реда и са изтрити 5 реда
  1. 5 3
      apps/tenant/models.py
  2. 4 2
      apps/wxapp/serializers.py

+ 5 - 3
apps/tenant/models.py

@@ -47,10 +47,12 @@ class Tenant(models.Model):
         return rows.count()
 
     @staticmethod
-    def check_validity(id):
-        if not id:
+    def check_validity(no):
+        if not no:
             return True
-        tenant = Tenant.objects.filter(id=id).first()
+        tenant = Tenant.objects.filter(company_no=no).first()
+        if not tenant:
+            raise CustomError('未找到该企业,请重新输入')
         if tenant.status == settings.OVERDUE:
             return False
         today = datetime.datetime.now().strftime('%Y-%m-%d')

+ 4 - 2
apps/wxapp/serializers.py

@@ -40,7 +40,8 @@ class WechatLoginSerializer(serializers.Serializer):
             payload = jwt_payload_handler(user)
             customer_log(customer_wechat.customer, BizLog.INSERT, u'用户微信登录,username=%s' % user.username)
             tenant_id = customer_wechat.customer.tenant and customer_wechat.customer.tenant.id or ''
-            is_validity = Tenant.check_validity(tenant_id)
+            company_no = customer_wechat.customer.tenant and customer_wechat.customer.tenant.company_no or ''
+            is_validity = Tenant.check_validity(company_no)
             return {
                 'bind': 1,
                 'user_id': user.id,
@@ -75,7 +76,8 @@ class WechatBindSerializer(serializers.Serializer):
             payload = jwt_payload_handler(user)
             customer_log(customer, BizLog.INSERT, u'用户微信登录,username=%s' % user.username)
             tenant_id = customer.tenant and customer.tenant.id or ''
-            is_validity = Tenant.check_validity(tenant_id)
+            company_no = customer.tenant and customer.tenant.company_no or ''
+            is_validity = Tenant.check_validity(company_no)
             return {
                 'token': jwt_encode_handler(payload),
                 'user_id': user.id,