|
|
@@ -533,7 +533,11 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin):
|
533
|
533
|
'coupon_expire_at': '',
|
534
|
534
|
'coupon_value': 0,
|
535
|
535
|
'coupon_has_expired': True,
|
536
|
|
- },
|
|
536
|
+ }
|
|
537
|
+
|
|
538
|
+ @property
|
|
539
|
+ def coupon_info2(self):
|
|
540
|
+ return self.coupon_info,
|
537
|
541
|
|
538
|
542
|
@property
|
539
|
543
|
def data(self):
|
|
|
@@ -555,7 +559,7 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin):
|
555
|
559
|
'serialNo': self.serialNo,
|
556
|
560
|
'verifyResult': self.verifyResult,
|
557
|
561
|
'submit_during_activity': self.submit_during_activity,
|
558
|
|
- 'coupon_info': act.coupon_info(created_at=self.created_at) if act else self.coupon_info,
|
|
562
|
+ 'coupon_info': act.coupon_info2(created_at=self.created_at) if act else self.coupon_info2,
|
559
|
563
|
'has_used': self.has_used,
|
560
|
564
|
'used_at': self.used_at,
|
561
|
565
|
}
|
|
|
@@ -611,4 +615,7 @@ class ActivityInfo(BaseModelMixin):
|
611
|
615
|
'coupon_expire_at': self.final_coupon_expire_at(created_at=created_at),
|
612
|
616
|
'coupon_value': self.coupon_value,
|
613
|
617
|
'coupon_has_expired': tc.utc_datetime() >= self.final_expire_at(created_at=created_at),
|
614
|
|
- },
|
|
618
|
+ }
|
|
619
|
+
|
|
620
|
+ def coupon_info2(self, created_at=None):
|
|
621
|
+ return self.coupon_info(created_at=created_at),
|