....

apps/activity/models.py

@@ -32,7 +32,7 @@ class Activity(models.Model):
     delete = models.BooleanField(verbose_name=u"删除", default=False)
 
     @staticmethod
-    def getById(id):
+    def getById1(id):
         try:
             id = int(id)
         except:

apps/activity/serializers.py

@@ -214,7 +214,7 @@ class ActivitySerializer(serializers.ModelSerializer):
     @staticmethod
     def factory(user, data, id=None):
         if id:
-            instance = Activity.getById(id)
+            instance = Activity.getById1(id)
             if not data['branch']:
                 data['branch'] = instance.branch_id
         else:

apps/activity/views.py

@@ -401,7 +401,7 @@ def activity_code(request):
     id = request.GET.get('id')
     try:
         with transaction.atomic():
-            order = Activity.getById(id)
+            order = Activity.getById1(id)
             if order.delete:
                 raise CustomError(u'该活动已删除')
 
@@ -459,7 +459,7 @@ def upload_image(request):
     try:
         if not poster:
             raise CustomError(u'未找到上传文件！')
-        activity = Activity.getById(id)
+        activity = Activity.getById1(id)
         if activity.delete:
             raise CustomError(u'该活动已删除')
         with transaction.atomic():