api/mch_views.py

@@ -17,7 +17,7 @@ from TimeConvert import TimeConvert as tc

                 from account.models import UserInfo
              

                 from coupon.models import CouponInfo, UserCouponInfo
              

                 from integral.models import SaleclerkSubmitLogInfo
              

                -from logs.models import AdministratorLoginLogInfo, MchInfoEncryptLogInfo
              

                +from logs.models import AdministratorLoginLogInfo, MchInfoEncryptLogInfo, ComplementCodeLogInfo
              

                 from mch.models import (ActivityInfo, AdministratorInfo, BrandInfo, ConsumeInfoSubmitLogInfo, DistributorInfo,
              

                                         LatestAppInfo, LatestAppScreenInfo, ModelInfo, OperatorInfo, ConsumeShotUnbindingInfo)
              

                 from statistic.models import ConsumeModelSaleStatisticInfo, ConsumeSaleStatisticInfo, ConsumeUserStatisticInfo
              
@@ -302,7 +302,13 @@ def consumer_info_api(request):

                         status=True
              

                     ).exists()
              

                 
              

                -    if dupload or unbound:
              

                +    is_complement_code = ComplementCodeLogInfo.objects.filter(
              

                +        model_id=model.model_id,
              

                +        sn=serialNo,
              

                +        status=True
              

                +    ).exists()
              

                +
              

                +    if dupload or unbound or is_complement_code:
              

                         act = None
              

                         during_activity = False
              

                     else:
              
@@ -340,7 +346,7 @@ def consumer_info_api(request):

                         unbound=unbound
              

                     )
              

                 
              

                -    if not dupload and not unbound:
              

                +    if not dupload and not unbound and not is_complement_code:
              

                         for act in activities:
              

                             try:
              

                                 coupon = CouponInfo.objects.get(coupon_id=act['coupon_id'])