....

apps/customer/tool.py

@@ -19,11 +19,14 @@ class WechatHandel(object):
     def login(code, appid, activity_id):
         app = WechatApplet.getByAppid(appid)
         if activity_id:
-            activity = Activity.objects.filter(id=activity_id).first()
+            activity = Activity.objects.filter(id=activity_id, delete=False, check_status=settings.PASS).first()
             if not activity:
-                activity = Activity.objects.filter().order_by('-create_time').first()
+                activity = Activity.objects.filter(delete=False, check_status=settings.PASS).order_by('-create_time').first()
         else:
-            activity = Activity.objects.filter().order_by('-create_time').first()
+            activity = Activity.objects.filter(delete=False, check_status=settings.PASS).order_by('-create_time').first()
+
+        if not activity:
+            raise CustomError(u'未找到活动！')
 
         res = WeChat.code2Session(appid, app.secret, code)
         instance = CustomerWechat.objects.filter(openid=res['openid'], branch=activity.branch).first()