api/admin_views.py

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

                 from account.models import UserInfo
              

                 from coupon.models import UserCouponInfo
              

                 from integral.models import SaleclerkSubmitLogInfo
              

                -from mch.models import AdministratorInfo, ConsumeInfoSubmitLogInfo
              

                +from mch.models import AdministratorInfo, ConsumeInfoSubmitLogInfo, ModelInfo, DistributorInfo
              

                 from statistic.models import ConsumeModelSaleStatisticInfo, ConsumeSaleStatisticInfo, ConsumeUserStatisticInfo
              

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

                                                      ProductMachineStatusCode, UserStatusCode)
              
@@ -390,22 +390,21 @@ def statistic_distributor(request):

                     except AdministratorInfo.DoesNotExist:
              

                         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              

                 
              

                -    daily_sql = 'select id, ymd, Count(*) AS num, Count(code_version=1 or NULL) AS code1 , Count(code_version=2 or NULL) AS code2, Count((code_version=1 AND has_scan=True) or NULL) AS has_code1_scan_num, Count((code_version=2 AND has_scan=True) or NULL) AS has_code2_scan_num FROM integral_saleclerksubmitloginfo where ymd >= %s AND ymd <= %s AND test_user=False AND dupload=False AND test_sn=False AND status=True %s %s GROUP BY ymd;' % (start_time, end_time, ('AND model_uni_name = %s' ,(model_name)) if model_name else '', ('AND distributor_name = %s' ,(distributor_name)) if distributor_name else '')
              

                +    daily_sql = 'select id, Count(*) AS num, Count(code_version=1 or NULL) AS code1 , Count(code_version=2 or NULL) AS code2, Count((code_version=1 AND has_scan=True) or NULL) AS has_code1_scan_num, Count((code_version=2 AND has_scan=True) or NULL) AS has_code2_scan_num FROM integral_saleclerksubmitloginfo where ymd >= %s AND ymd <= %s AND test_user=False AND dupload=False AND test_sn=False AND status=True %s %s GROUP BY ymd;' % (start_time, end_time, ('AND model_uni_name="%s"' % (model_name)) if model_name else '', ('AND distributor_name="%s"' % (distributor_name)) if distributor_name else '')
              

                     daily_logs = SaleclerkSubmitLogInfo.objects.raw(daily_sql)
              

                -    print(daily_logs)
              

                 
              

                     daily_logs = [{'ymd': log.ymd, 'num': log.num, 'code1': log.code1, 'code2': log.code2, 'has_code1_scan_num': log.has_code1_scan_num, 'has_code2_scan_num': log.has_code2_scan_num} for log in daily_logs]
              

                 
              

                     model_logs = []
              

                     if model_name == '':
              

                -        model_sql = 'select id, model_uni_name, Count(*) AS num, Count(code_version=1 or NULL) AS code1 , Count(code_version=2 or NULL) AS code2, Count((code_version=1 AND has_scan=True) or NULL) AS has_code1_scan_num, Count((code_version=2 AND has_scan=True) or NULL) AS has_code2_scan_num FROM integral_saleclerksubmitloginfo where ymd >= %s AND ymd <= %s AND test_user=False AND dupload=False AND test_sn=False AND status=True %s GROUP BY model_uni_name;' % (start_time, end_time, ('AND distributor_name = %s' ,(distributor_name)) if distributor_name else '')
              

                +        model_sql = 'select id, model_uni_name, Count(*) AS num, Count(code_version=1 or NULL) AS code1 , Count(code_version=2 or NULL) AS code2, Count((code_version=1 AND has_scan=True) or NULL) AS has_code1_scan_num, Count((code_version=2 AND has_scan=True) or NULL) AS has_code2_scan_num FROM integral_saleclerksubmitloginfo where ymd >= %s AND ymd <= %s AND test_user=False AND dupload=False AND test_sn=False AND status=True %s GROUP BY model_uni_name;' % (start_time, end_time, ('AND distributor_name="%s"' % (distributor_name)) if distributor_name else '')
              

                 
              

                         model_logs = SaleclerkSubmitLogInfo.objects.raw(model_sql)
              

                         model_logs = [{'model_uni_name': log.model_uni_name, 'num': log.num, 'code1': log.code1, 'code2': log.code2, 'has_code1_scan_num': log.has_code1_scan_num, 'has_code2_scan_num': log.has_code2_scan_num} for log in model_logs]
              

                     
              

                     distributor_logs = []
              

                     if distributor_name == '':
              

                -        distributor_sql = 'select id, distributor_name, Count(*) AS num, Count(code_version=1 or NULL) AS code1 , Count(code_version=2 or NULL) AS code2, Count((code_version=1 AND has_scan=True) or NULL) AS has_code1_scan_num, Count((code_version=2 AND has_scan=True) or NULL) AS has_code2_scan_num FROM integral_saleclerksubmitloginfo where ymd >= %s AND ymd <= %s AND test_user=False AND dupload=False AND test_sn=False AND status=True %s GROUP BY distributor_name;' % (start_time, end_time, ('AND model_uni_name = %s' ,(model_name)) if model_name else '')
              

                +        distributor_sql = 'select id, distributor_name, Count(*) AS num, Count(code_version=1 or NULL) AS code1 , Count(code_version=2 or NULL) AS code2, Count((code_version=1 AND has_scan=True) or NULL) AS has_code1_scan_num, Count((code_version=2 AND has_scan=True) or NULL) AS has_code2_scan_num FROM integral_saleclerksubmitloginfo where ymd >= %s AND ymd <= %s AND test_user=False AND dupload=False AND test_sn=False AND status=True %s GROUP BY distributor_name;' % (start_time, end_time, ('AND model_uni_name="%s"' % (model_name)) if model_name else '')
              

                 
              

                         distributor_logs = SaleclerkSubmitLogInfo.objects.raw(distributor_sql)
              

                         distributor_logs = [{'distributor_name': log.distributor_name, 'num': log.num, 'code1': log.code1, 'code2': log.code2, 'has_code1_scan_num': log.has_code1_scan_num, 'has_code2_scan_num': log.has_code2_scan_num} for log in distributor_logs]
              
@@ -774,3 +773,41 @@ def record_sale(request):

                         'count': count,
              

                         'left': left
              

                     })
              

                +
              

                +def model_list(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                +    admin_id = request.POST.get('admin_id', '')
              

                +
              

                +    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
              

                +        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
              

                +
              

                +    try:
              

                +        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
              

                +    except AdministratorInfo.DoesNotExist:
              

                +        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              

                +
              

                +    infos = list(ModelInfo.objects.filter(status=True).values_list('model_uni_name', flat=True).distinct().order_by('model_uni_name'))
              

                +
              

                +    return response(200, 'Get Model List Success', u'获取型号列表成功', data={
              

                +        'models': infos
              

                +    })
              

                +    
              

                +def distributor_list(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                +    admin_id = request.POST.get('admin_id', '')
              

                +
              

                +    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
              

                +        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
              

                +
              

                +    try:
              

                +        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
              

                +    except AdministratorInfo.DoesNotExist:
              

                +        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              

                +
              

                +    infos = list(DistributorInfo.objects.filter(status=True).values_list('distributor_name', flat=True).distinct().order_by('distributor_name'))
              

                +
              

                +    return response(200, 'Get Model List Success', u'获取型号列表成功', data={
              

                +        'distributors': infos
              

                +    })
              

                +    
              

                +    
              

api/urls.py

@@ -319,6 +319,9 @@ urlpatterns += [

                 
              

                     url(r'^admin/record/consumer$', admin_views.record_consumer, name='record_consumer'),
              

                     url(r'^admin/record/sale$', admin_views.record_sale, name='record_sale'),
              

                +
              

                +    url(r'^admin/list/model$', admin_views.model_list, name='model_list'),
              

                +    url(r'^admin/list/distributor$', admin_views.distributor_list, name='distributor_list'),
              

                 ]
              

                 
              

                 urlpatterns += [