api/encrypt_views.py

@@ -15,7 +15,7 @@ from pywe_storage import RedisStorage

                 from account.models import UserInfo
              

                 from logs.models import MchInfoDecryptLogInfo, MchInfoEncryptLogInfo
              

                 from marketcode.models import MarketCodeInfo
              

                -from mch.models import ActivityInfo, BrandInfo, ConsumeShotUnbindingInfo, ModelInfo
              

                +from mch.models import ActivityInfo, BrandInfo, ConsumeShotUnbindingInfo, ModelInfo, ConsumeInfoSubmitLogInfo
              

                 from sales.models import LotteryCampaignInfo
              

                 from utils.algorithm.b64 import b64_decrypt, b64_encrypt
              

                 from utils.algorithm.caesar import caesar_decrypt, caesar_encrypt
              
@@ -257,6 +257,7 @@ def decrypt2(request, v='v2'):

                         mdli.save()
              

                 
              

                     unbound = ConsumeShotUnbindingInfo.objects.filter(model_id=model.model_id, sn=sn, status=True).exists()
              

                +    dupload = ConsumeInfoSubmitLogInfo.objects.filter(model_id=model.model_id, serialNo=sn, status=True).exists()
              

                 
              

                     if v == 'v1':
              

                         has_unexpired_activity = False
              
@@ -266,13 +267,15 @@ def decrypt2(request, v='v2'):

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

                         coupon_infos = [act.coupon_info3 for act in activities if act.has_unexpired_activity(model.model_name)]
              

                     
              

                -    lotterys = LotteryCampaignInfo.objects.filter(status=True)
              

                -   
              

                -    if lotterys.exists():
              

                -        active_lotterys = [lottery.data for lottery in lotterys if lottery.is_active() and model.model_uni_name in lottery.model_ids]
              

                +    if dupload or unbound:  
              

                +        lotterys = LotteryCampaignInfo.objects.filter(status=True)
              

                +        if lotterys.exists():
              

                +            active_lotterys = [lottery.data for lottery in lotterys if lottery.is_active() and model.model_uni_name in lottery.model_ids]
              

                +        else:
              

                +            active_lotterys = None
              

                     else:
              

                         active_lotterys = None
              

                -
              

                +    
              

                     return response(200, data={
              

                         'plaintext': plaintext,
              

                         'lotterys': active_lotterys,