Merge remote-tracking branch 'origin/master'

apps/customer/serializers.py

@@ -177,7 +177,7 @@ class ReviewSerializer(serializers.ModelSerializer):
     check_time_f = serializers.DateTimeField(source='check_time', format=settings.SHORT_DATETIME_FORMAT,
                                              read_only=True)
 
-    next_time_f = DateCharField(source='next_time', read_only=True)
+    next_time_f = DateCharField(source='customer.next_time', read_only=True)
     is_giveup_text = BooleanCharField(source='is_giveup', read_only=True)
     is_copy_text = BooleanCharField(source='is_copy', read_only=True)
 

apps/customer/views.py

@@ -320,13 +320,12 @@ class NewCustomerViewSet(CustomModelViewSet):
                 'store': instance.store.id,
                 'create_user': request.user.id,
                 'description': description,
-                'next_time': next_time,
                 'is_copy': is_copy,
             }
             serializer = ReviewSerializer(data=data)
             if serializer.is_valid(raise_exception=True):
                 serializer.save()
-            NewCustomerRemind.objects.filter(customer=instance,remind_user=request.user).update(next_time=next_time)
+            NewCustomerRemind.objects.filter(customer=instance, remind_user=request.user).update(next_time=next_time)
 
         except ValidationError as e:
             traceback.print_exc()
@@ -424,7 +423,7 @@ class ReviewViewSet(CustomModelViewSet):
                 instance.customer.status = NewCustomer.ABANDONED
                 # TODO 如果客户已下单，把工单状态改成放弃
                 Order.objects.filter(customer=instance.customer).update(status=Order.ABANDONED)
-            NewCustomerRemind.filter(customer=instance.customer, remind_user=request.user).update(next_time=next_time)
+            NewCustomerRemind.filter(customer=instance.customer, remind_user=instance.customer.track_user).update(next_time=next_time)
         except CustomError as e:
             return response_error(e.get_error_msg())
         except Exception as e: