mch/models.py

@@ -266,8 +266,8 @@ class ModelInfo(BaseModelMixin):

                     @property
              

                     def member_shot_data(self):
              

                         return {
              

                -            'shot_id': self.model_id,
              

                -            'shot_name': self.shot_member_name,
              

                +            'shot_id': self.shot_type_id,
              

                +            'shot_name': self.model_uni_name,
              

                             'shot_image': self.image2_url,
              

                             'integral': self.shot_member_integral,
              

                         }
              

member/models.py

@@ -348,15 +348,19 @@ class ShotTypeInfo(BaseModelMixin, BrandInfoMixin):

                 
              

                     @property
              

                     def shots(self):
              

                -        models = ModelInfo.objects.filter(shot_type_id=self.shot_type_id, status=True, is_show_shot=True).order_by('-pk')
              

                +        models = ModelInfo.objects.filter(shot_type_id=self.shot_type_id, status=True).order_by('-pk')
              

                +
              

                         return [model.member_shot_data for model in models]
              

                 
              

                     @property
              

                     def data(self):
              

                +        key = 'model_uni_name'
              

                +        seen = set()
              

                +        shots = [item for item in self.shots if not (item[key] in seen or seen.add(item[key]))]
              

                         return {
              

                             'type_id': self.shot_type_id,
              

                             'type_name': self.shot_type_name,
              

                -            'shots': self.shots,
              

                +            'shots': shots,
              

                         }