activity_id
променени са 2 файла, в които са добавени 24 реда и са изтрити 4 реда
+ 1
- 0
api/mch_views.py
@@ -291,6 +291,7 @@ def consumer_info_api(request): |
||
| 291 | 291 |
verifyResult=verifyResult, |
| 292 | 292 |
dupload=dupload, |
| 293 | 293 |
submit_during_activity=during_activity, |
| 294 |
+ activity_id=act.pk if during_activity else 0, |
|
| 294 | 295 |
coupon_expire_at=act.coupon_expire_at if during_activity else None, |
| 295 | 296 |
coupon_value=act.coupon_value if during_activity else 0, |
| 296 | 297 |
test_user=user.test_user, |
+ 23
- 4
mch/models.py
@@ -499,6 +499,7 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin): |
||
| 499 | 499 |
dupload = models.BooleanField(_(u'dupload'), default=False, help_text=_(u'是否为重复提交'), db_index=True) |
| 500 | 500 |
|
| 501 | 501 |
submit_during_activity = models.BooleanField(_(u'submit_during_activity'), default=False, help_text=_(u'是否为活动期间上传'), db_index=True) |
| 502 |
+ activity_id = models.IntegerField(_(u'activity_id'), default=0, help_text=_(u'活动唯一标识')) |
|
| 502 | 503 |
coupon_expire_at = models.DateTimeField(_(u'coupon_expire_at'), blank=True, null=True, help_text=_(u'维修券过期时间')) |
| 503 | 504 |
coupon_value = models.IntegerField(_(u'coupon_value'), default=0, help_text=_(u'维修券金额（单位：分）')) |
| 504 | 505 |
|
@@ -529,7 +530,21 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin): |
||
| 529 | 530 |
return info |
| 530 | 531 |
|
| 531 | 532 |
@property |
| 533 |
+ def coupon_info(self): |
|
| 534 |
+ return {
|
|
| 535 |
+ 'coupon_expire_at': self.final_coupon_expire_at, |
|
| 536 |
+ 'coupon_value': self.coupon_value, |
|
| 537 |
+ } |
|
| 538 |
+ |
|
| 539 |
+ @property |
|
| 532 | 540 |
def data(self): |
| 541 |
+ if self.submit_during_activity: |
|
| 542 |
+ try: |
|
| 543 |
+ act = ActivityInfo.objects.get(pk=self.activity_id) |
|
| 544 |
+ except ActivityInfo.DoesNotExist: |
|
| 545 |
+ act = None |
|
| 546 |
+ else: |
|
| 547 |
+ act = None |
|
| 533 | 548 |
return {
|
| 534 | 549 |
'lat': self.lat, |
| 535 | 550 |
'lon': self.lon, |
@@ -541,10 +556,7 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin): |
||
| 541 | 556 |
'serialNo': self.serialNo, |
| 542 | 557 |
'verifyResult': self.verifyResult, |
| 543 | 558 |
'submit_during_activity': self.submit_during_activity, |
| 544 |
- 'coupon_info': {
|
|
| 545 |
- 'coupon_expire_at': self.final_coupon_expire_at, |
|
| 546 |
- 'coupon_value': self.coupon_value, |
|
| 547 |
- }, |
|
| 559 |
+ 'coupon_info': act.coupon_info if act else self.coupon_info, |
|
| 548 | 560 |
} |
| 549 | 561 |
|
| 550 | 562 |
|
@@ -579,3 +591,10 @@ class ActivityInfo(BaseModelMixin): |
||
| 579 | 591 |
|
| 580 | 592 |
def has_unexpired_activity(self, model_name): |
| 581 | 593 |
return (self.model_uni_names and model_name in self.model_uni_names) and (self.start_at <= tc.utc_datetime() < self.end_at) |
| 594 |
+ |
|
| 595 |
+ @property |
|
| 596 |
+ def coupon_info(self): |
|
| 597 |
+ return {
|
|
| 598 |
+ 'coupon_expire_at': self.final_coupon_expire_at, |
|
| 599 |
+ 'coupon_value': self.coupon_value, |
|
| 600 |
+ }, |