modelpk vs. model_id

Kimi.Huang 5 gadi atpakaļ
vecāks
revīzija
833897fd99
1 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 2 2
      integral/models.py

+ 2 - 2
integral/models.py

@@ -79,14 +79,14 @@ class SaleclerkIntegralIncomeExpensesInfo(BaseModelMixin):
79 79
             model = {}
80 80
 
81 81
         try:
82
-            impression = ConsumeImpressionInfo.objects.get(clerk_id=self.clerk_id, brand_id=self.brand_id, model_id=model.pk, serialNo=self.code)
82
+            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)
83 83
         except ConsumeImpressionInfo.DoesNotExist:
84 84
             impression = None
85 85
 
86 86
         return {
87 87
             'type': self.type,
88 88
             'integral': self.integral,
89
-            'model_info': self.model.fulldata if model else {},
89
+            'model_info': model.fulldata if model else {},
90 90
             'modelName': self.model_name,
91 91
             'consumer_impression': impression.data if impression else {},
92 92
             'serialNo': self.code,