api/mch_views.py

@@ -15,6 +15,7 @@ from account.models import UserInfo

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

                                         LatestAppInfo, LatestAppScreenInfo, ModelInfo, OperatorInfo)
              

                 from statistic.models import ConsumeModelSaleStatisticInfo, ConsumeSaleStatisticInfo, ConsumeUserStatisticInfo
              

                +from integral.models import SaleclerkSubmitLogInfo
              

                 from utils.error.errno_utils import (AdministratorStatusCode, OperatorStatusCode, ProductBrandStatusCode,
              

                                                      ProductModelStatusCode, UserStatusCode)
              

                 from utils.redis.connect import r
              
@@ -391,6 +392,12 @@ def consumer_info_api(request):

                             'ymd': ymd,
              

                         })
              

                 
              

                +    #更新销售员提交的表
              

                +    logs = SaleclerkSubmitLogInfo.objects.filter(code=serialNo, model_pk=model.pk)
              

                +    for log in logs:
              

                +        log.has_scan = True
              

                +        log.save()
              

                +
              

                     return response(200, 'Submit Consumer Info Success', u'提交消费者信息成功')
              

                 
              

                 
              

page/sale_views.py

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

                 
              

                 from account.models import UserInfo
              

                 from integral.models import SaleclerkIntegralIncomeExpensesInfo, SaleclerkSubmitLogInfo
              

                -from mch.models import BrandInfo, DistributorInfo, ModelInfo, SaleclerkInfo
              

                +from mch.models import BrandInfo, DistributorInfo, ModelInfo, SaleclerkInfo, ConsumeInfoSubmitLogInfo
              

                 from statistic.models import (DistributorSaleStatisticInfo, ModelSaleStatisticInfo, ProvinceSaleStatisticInfo,
              

                                               SaleclerkSaleStatisticInfo, SaleStatisticInfo)
              

                 from utils.error.errno_utils import (ProductBrandStatusCode, ProductDistributorStatusCode, ProductModelStatusCode,
              
@@ -88,6 +88,11 @@ def clerk_sale_submit_api(request):

                 
              

                     ymd = tc.local_string(format='%Y%m%d')
              

                 
              

                +    #是否被消费者扫过
              

                +    has_scan = ConsumeInfoSubmitLogInfo.objects.filter(
              

                +        model_id=model.model_id,
              

                +        serialNo=serialNo).exists()
              

                +
              

                     # 店员提交记录
              

                     ssli = SaleclerkSubmitLogInfo.objects.create(
              

                         brand_pk=brand.pk,
              
@@ -109,6 +114,7 @@ def clerk_sale_submit_api(request):

                         test_sn=test_sn,
              

                         ym=ymd[:6],
              

                         ymd=ymd,
              

                +        has_scan=has_scan,
              

                     )
              

                 
              

                     if test_sn: