Merge branch 'master' of http://git.zzliaoyuan.com:4000/wushaodong/decorate

apps/customer/serializers.py

@@ -127,10 +127,10 @@ class ReviewSerializer(serializers.ModelSerializer):
     next_time_f = TimeCharField(source='next_time', read_only=True)
     is_giveup_text = BooleanCharField(source='is_giveup', read_only=True)
 
-    name = serializers.CharField(source='customer.name', read_only=True)
-    tel = serializers.CharField(source='customer.tel', read_only=True)
-    village = serializers.CharField(source='customer.village', read_only=True)
-    address = serializers.CharField(source='customer.address', read_only=True)
+    name = serializers.CharField(source='customer.report_customer.name', read_only=True)
+    tel = serializers.CharField(source='customer.report_customer.tel', read_only=True)
+    village = serializers.CharField(source='customer.report_customer.village', read_only=True)
+    address = serializers.CharField(source='customer.report_customer.address', read_only=True)
     track_user_text = serializers.CharField(source='customer.track_user.name', read_only=True)
     project_text = serializers.SerializerMethodField()
 

apps/customer/views.py

@@ -215,12 +215,20 @@ class ReviewViewSet(CustomModelViewSet):
         next_time = request.POST.get('next_time')
         try:
             instance = Review.objects.filter(id=pk).first()
-            instance.check_user = request.user
-            instance.check_status = check_status
-            instance.check_comment = check_comment
-            instance.next_time = next_time
-            instance.check_time = timezone.now()
-            instance.save()
+            if check_status == Review.KEEPUP:
+                instance.check_user = request.user
+                instance.check_status = check_status
+                instance.check_comment = check_comment
+                instance.next_time = next_time
+                instance.check_time = timezone.now()
+                instance.save()
+            if check_status == Review.ABANDON:
+                instance.check_user = request.user
+                instance.check_status = check_status
+                instance.check_comment = check_comment
+                instance.check_time = timezone.now()
+                instance.is_giveup = True
+                instance.save()
         except CustomError as e:
             return response_error(e.get_error_msg())
         except Exception as e: