@@ -15,6 +15,7 @@ from account.models import UserInfo  | 
            ||
| 15 | 15 | 
                from mch.models import (ActivityInfo, AdministratorInfo, BrandInfo, ConsumeInfoSubmitLogInfo, DistributorInfo,  | 
            
| 16 | 16 | 
                LatestAppInfo, LatestAppScreenInfo, ModelInfo, OperatorInfo)  | 
            
| 17 | 17 | 
                from statistic.models import ConsumeModelSaleStatisticInfo, ConsumeSaleStatisticInfo, ConsumeUserStatisticInfo  | 
            
| 18 | 
                +from integral.models import SaleclerkSubmitLogInfo  | 
            |
| 18 | 19 | 
                from utils.error.errno_utils import (AdministratorStatusCode, OperatorStatusCode, ProductBrandStatusCode,  | 
            
| 19 | 20 | 
                ProductModelStatusCode, UserStatusCode)  | 
            
| 20 | 21 | 
                from utils.redis.connect import r  | 
            
                @@ -391,6 +392,12 @@ def consumer_info_api(request):  | 
            ||
| 391 | 392 | 
                'ymd': ymd,  | 
            
| 392 | 393 | 
                })  | 
            
| 393 | 394 | 
                 | 
            
| 395 | 
                + #更新销售员提交的表  | 
            |
| 396 | 
                + logs = SaleclerkSubmitLogInfo.objects.filter(code=serialNo, model_pk=model.pk)  | 
            |
| 397 | 
                + for log in logs:  | 
            |
| 398 | 
                + log.has_scan = True  | 
            |
| 399 | 
                + log.save()  | 
            |
| 400 | 
                +  | 
            |
| 394 | 401 | 
                return response(200, 'Submit Consumer Info Success', u'提交消费者信息成功')  | 
            
| 395 | 402 | 
                 | 
            
| 396 | 403 | 
                 | 
            
                @@ -11,7 +11,7 @@ from TimeConvert import TimeConvert as tc  | 
            ||
| 11 | 11 | 
                 | 
            
| 12 | 12 | 
                from account.models import UserInfo  | 
            
| 13 | 13 | 
                from integral.models import SaleclerkIntegralIncomeExpensesInfo, SaleclerkSubmitLogInfo  | 
            
| 14 | 
                -from mch.models import BrandInfo, DistributorInfo, ModelInfo, SaleclerkInfo  | 
            |
| 14 | 
                +from mch.models import BrandInfo, DistributorInfo, ModelInfo, SaleclerkInfo, ConsumeInfoSubmitLogInfo  | 
            |
| 15 | 15 | 
                from statistic.models import (DistributorSaleStatisticInfo, ModelSaleStatisticInfo, ProvinceSaleStatisticInfo,  | 
            
| 16 | 16 | 
                SaleclerkSaleStatisticInfo, SaleStatisticInfo)  | 
            
| 17 | 17 | 
                from utils.error.errno_utils import (ProductBrandStatusCode, ProductDistributorStatusCode, ProductModelStatusCode,  | 
            
                @@ -88,6 +88,11 @@ def clerk_sale_submit_api(request):  | 
            ||
| 88 | 88 | 
                 | 
            
| 89 | 89 | 
                ymd = tc.local_string(format='%Y%m%d')  | 
            
| 90 | 90 | 
                 | 
            
| 91 | 
                + #是否被消费者扫过  | 
            |
| 92 | 
                + has_scan = ConsumeInfoSubmitLogInfo.objects.filter(  | 
            |
| 93 | 
                + model_id=model.model_id,  | 
            |
| 94 | 
                + serialNo=serialNo).exists()  | 
            |
| 95 | 
                +  | 
            |
| 91 | 96 | 
                # 店员提交记录  | 
            
| 92 | 97 | 
                ssli = SaleclerkSubmitLogInfo.objects.create(  | 
            
| 93 | 98 | 
                brand_pk=brand.pk,  | 
            
                @@ -109,6 +114,7 @@ def clerk_sale_submit_api(request):  | 
            ||
| 109 | 114 | 
                test_sn=test_sn,  | 
            
| 110 | 115 | 
                ym=ymd[:6],  | 
            
| 111 | 116 | 
                ymd=ymd,  | 
            
| 117 | 
                + has_scan=has_scan,  | 
            |
| 112 | 118 | 
                )  | 
            
| 113 | 119 | 
                 | 
            
| 114 | 120 | 
                if test_sn:  |