api/encrypt_views.py

@@ -6,7 +6,6 @@ import random

                 
              

                 from django_logit import logit
              

                 from django_response import response
              

                -from TimeConvert import TimeConvert as tc
              

                 
              

                 from logs.models import MchInfoDecryptLogInfo, MchInfoEncryptLogInfo
              

                 from mch.models import ActivityInfo, BrandInfo, ModelInfo
              
@@ -109,8 +108,7 @@ def decrypt(request):

                         mdli.decrypt_count += 1
              

                         mdli.save()
              

                 
              

                -    act = ActivityInfo.objects.filter(status=True).order_by('-pk').first()
              

                -    has_unexpired_activity = True if act and act.has_unexpired_activity else False
              

                +    act = ActivityInfo.objects.filter(brand_id=brand.brand_id, status=True).order_by('-pk').first()
              

                 
              

                     return response(200, data={
              

                         'plaintext': plaintext,
              
@@ -124,5 +122,5 @@ def decrypt(request):

                             'DistributorID': distributor_pk,
              

                             'SerialNo': sn,
              

                         },
              

                -        'has_unexpired_activity': has_unexpired_activity,
              

                +        'has_unexpired_activity': True if act and act.has_unexpired_activity else False,
              

                     })
              

mch/models.py

@@ -531,6 +531,8 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin):

                 
              

                 
              

                 class ActivityInfo(BaseModelMixin):
              

                +    brand_id = models.CharField(_(u'brand_id'), max_length=32, blank=True, null=True, help_text=u'品牌唯一标识', db_index=True)
              

                +
              

                     activity_name = models.CharField(_(u'activity_name'), max_length=255, blank=True, null=True, help_text=u'活动名称')
              

                 
              

                     start_at = models.DateTimeField(_(u'start_at'), help_text=_(u'start_at'))