hujingpei 4 ani în urmă
părinte
comite
f8baea4990
2 a modificat fișierele cu 6 adăugiri și 0 ștergeri
  1. 5 0
      apps/account/views.py
  2. 1 0
      apps/customer/views.py

+ 5 - 0
apps/account/views.py

@@ -11,6 +11,7 @@ from django.contrib.auth.models import Group, Permission
 from rest_framework_jwt.views import ObtainJSONWebToken, VerifyJSONWebToken, RefreshJSONWebToken
 from utils import response_error, response_ok
 from django.contrib.auth import get_user_model
+from django.utils import timezone
 
 User = get_user_model()
 from apps.account.serializers import JWTSerializer, EmployeeSerializer, GroupDictSerializer, GroupSerializer
@@ -32,6 +33,10 @@ class LoginView(ObtainJSONWebToken):
             ser.request = request
             # TODO 判断门店是否在用、在有效期内
             if ser.is_valid(raise_exception=True):
+                user = User.objects.filter(id=ser.validated_data['user_id']).first()
+                store = Store.objects.filter(id=user.store_id).first()
+                if store.enable == False or (store.end_date.strftime('%Y-%m-%d')) < (timezone.now().strftime('%Y-%m-%d')):
+                    raise CustomError(u'当前帐号不可用,请联系管理员!')
                 return response_ok(ser.validated_data)
         except ValidationError as e:
             return response_error(e.detail['error'][0])

+ 1 - 0
apps/customer/views.py

@@ -99,6 +99,7 @@ class ReportCustomerViewSet(CustomModelViewSet):
                 # 根据分配人所在店面,创建内部跟踪提醒
                 remind_users = request.user.get_remind_users()
                 # TODO 把next_time用当前日期加上5天
+                next_time = (timezone.now() + datetime.timedelta(days=5)).strftime('%Y-%m-%d')
                 for remind_user in remind_users:
                     NewCustomerRemind.objects.create(customer=customer, next_time=next_time, remind_user_id=remind_user,
                                                      is_employee=False)