activity_id
2 gewijzigde bestanden met toevoegingen van 24 en 4 verwijderingen
+ 1
- 0
api/mch_views.py
@@ -297,6 +297,7 @@ def consumer_info_api(request): |
||
| 297 | 297 |
verifyResult=verifyResult, |
| 298 | 298 |
dupload=dupload, |
| 299 | 299 |
submit_during_activity=during_activity, |
| 300 |
+ activity_id=act.pk if during_activity else 0, |
|
| 300 | 301 |
coupon_expire_at=act.coupon_expire_at if during_activity else None, |
| 301 | 302 |
coupon_value=act.coupon_value if during_activity else 0, |
| 302 | 303 |
test_user=user.test_user, |
+ 23
- 4
mch/models.py
@@ -493,6 +493,7 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin): |
||
| 493 | 493 |
dupload = models.BooleanField(_(u'dupload'), default=False, help_text=_(u'是否为重复提交'), db_index=True) |
| 494 | 494 |
|
| 495 | 495 |
submit_during_activity = models.BooleanField(_(u'submit_during_activity'), default=False, help_text=_(u'是否为活动期间上传'), db_index=True) |
| 496 |
+ activity_id = models.IntegerField(_(u'activity_id'), default=0, help_text=_(u'活动唯一标识')) |
|
| 496 | 497 |
coupon_expire_at = models.DateTimeField(_(u'coupon_expire_at'), blank=True, null=True, help_text=_(u'维修券过期时间')) |
| 497 | 498 |
coupon_value = models.IntegerField(_(u'coupon_value'), default=0, help_text=_(u'维修券金额（单位：分）')) |
| 498 | 499 |
|
@@ -523,7 +524,21 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin): |
||
| 523 | 524 |
return info |
| 524 | 525 |
|
| 525 | 526 |
@property |
| 527 |
+ def coupon_info(self): |
|
| 528 |
+ return {
|
|
| 529 |
+ 'coupon_expire_at': self.final_coupon_expire_at, |
|
| 530 |
+ 'coupon_value': self.coupon_value, |
|
| 531 |
+ } |
|
| 532 |
+ |
|
| 533 |
+ @property |
|
| 526 | 534 |
def data(self): |
| 535 |
+ if self.submit_during_activity: |
|
| 536 |
+ try: |
|
| 537 |
+ act = ActivityInfo.objects.get(pk=self.activity_id) |
|
| 538 |
+ except ActivityInfo.DoesNotExist: |
|
| 539 |
+ act = None |
|
| 540 |
+ else: |
|
| 541 |
+ act = None |
|
| 527 | 542 |
return {
|
| 528 | 543 |
'lat': self.lat, |
| 529 | 544 |
'lon': self.lon, |
@@ -535,10 +550,7 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin): |
||
| 535 | 550 |
'serialNo': self.serialNo, |
| 536 | 551 |
'verifyResult': self.verifyResult, |
| 537 | 552 |
'submit_during_activity': self.submit_during_activity, |
| 538 |
- 'coupon_info': {
|
|
| 539 |
- 'coupon_expire_at': self.final_coupon_expire_at, |
|
| 540 |
- 'coupon_value': self.coupon_value, |
|
| 541 |
- }, |
|
| 553 |
+ 'coupon_info': act.coupon_info if act else self.coupon_info, |
|
| 542 | 554 |
} |
| 543 | 555 |
|
| 544 | 556 |
|
@@ -571,3 +583,10 @@ class ActivityInfo(BaseModelMixin): |
||
| 571 | 583 |
|
| 572 | 584 |
def has_unexpired_activity(self, model_name): |
| 573 | 585 |
return (self.model_uni_names and model_name in self.model_uni_names) and (self.start_at <= tc.utc_datetime() < self.end_at) |
| 586 |
+ |
|
| 587 |
+ @property |
|
| 588 |
+ def coupon_info(self): |
|
| 589 |
+ return {
|
|
| 590 |
+ 'coupon_expire_at': self.final_coupon_expire_at, |
|
| 591 |
+ 'coupon_value': self.coupon_value, |
|
| 592 |
+ }, |