integral/models.py

@@ -66,29 +66,19 @@ class SaleclerkIntegralIncomeExpensesInfo(BaseModelMixin):

                     @property
              

                     def consumer_impression(self):
              

                         try:
              

                -            impression = ConsumeImpressionInfo.objects.get(clerk_id=self.clerk_id, brand_id=self.brand_id, model_id=self.clerk_id, serialNo=self.code)
              

                +            impression = ConsumeImpressionInfo.objects.get(clerk_id=self.clerk_id, brand_id=self.brand_id, model_id=self.model_id, serialNo=self.code)
              

                         except ConsumeImpressionInfo.DoesNotExist:
              

                             impression = None
              

                         return impression.data if impression else {}
              

                 
              

                     @property
              

                     def data(self):
              

                -        try:
              

                -            model = ModelInfo.objects.get(model_id=self.model_id)
              

                -        except ModelInfo.DoesNotExist:
              

                -            model = {}
              

                -
              

                -        try:
              

                -            impression = ConsumeImpressionInfo.objects.get(clerk_id=self.clerk_id, brand_id=self.brand_id, model_id=(model.pk if model else 0), serialNo=self.code)
              

                -        except ConsumeImpressionInfo.DoesNotExist:
              

                -            impression = None
              

                -
              

                         return {
              

                             'type': self.type,
              

                             'integral': self.integral,
              

                -            'model_info': model.fulldata if model else {},
              

                +            'model_info': self.model_info,
              

                             'modelName': self.model_name,
              

                -            'consumer_impression': impression.data if impression else {},
              

                +            'consumer_impression': self.consumer_impression,
              

                             'serialNo': self.code,
              

                             'created_at': self.created_at,
              

                         }