statistic/views.py

@@ -6,8 +6,10 @@ from django_logit import logit

                 from django_response import response
              

                 from TimeConvert import TimeConvert as tc
              

                 
              

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

                -                              RegisterStatisticInfo, SaleStatisticInfo)
              

                +from statistic.models import (ConsumeDistributorSaleStatisticInfo, ConsumeModelSaleStatisticInfo,
              

                +                              ConsumeProvinceSaleStatisticInfo, ConsumeSaleStatisticInfo, DistributorSaleStatisticInfo,
              

                +                              ModelSaleStatisticInfo, ProvinceSaleStatisticInfo, RegisterStatisticInfo,
              

                +                              SaleStatisticInfo)
              

                 from utils.rdm_utils import randnum
              

                 
              

                 
              
@@ -76,24 +78,24 @@ def tj_consumer(request):

                 
              

                     # 销量统计 & 今日销量
              

                     try:
              

                -        sale_num = SaleStatisticInfo.objects.get(ymd=ymd).num
              

                -    except SaleStatisticInfo.DoesNotExist:
              

                +        sale_num = ConsumeSaleStatisticInfo.objects.get(ymd=ymd).num
              

                +    except ConsumeSaleStatisticInfo.DoesNotExist:
              

                         sale_num = 0
              

                 
              

                     # 商品销量趋势
              

                -    sale_trends = SaleStatisticInfo.objects.filter(status=True).order_by('-ymd')
              

                +    sale_trends = ConsumeSaleStatisticInfo.objects.filter(status=True).order_by('-ymd')
              

                     sale_trends = [s.data for s in sale_trends]
              

                 
              

                     # 型号销量统计 & 热销商品榜
              

                -    model_sales = ModelSaleStatisticInfo.objects.filter(ymd=0, status=True).order_by('-num')
              

                +    model_sales = ConsumeModelSaleStatisticInfo.objects.filter(ymd=0, status=True).order_by('-num')
              

                     model_sales = [m.data for m in model_sales]
              

                 
              

                     # 经销商销量统计 & 经销商榜
              

                -    distributor_sales = DistributorSaleStatisticInfo.objects.filter(ymd=0, status=True).order_by('-num')
              

                +    distributor_sales = ConsumeDistributorSaleStatisticInfo.objects.filter(ymd=0, status=True).order_by('-num')
              

                     distributor_sales = [d.data for d in distributor_sales]
              

                 
              

                     # 各地区实时销量
              

                -    province_sales = ProvinceSaleStatisticInfo.objects.filter(ymd=0, status=True).order_by('position')
              

                +    province_sales = ConsumeProvinceSaleStatisticInfo.objects.filter(ymd=0, status=True).order_by('position')
              

                     province_sales = [p.data for p in province_sales]
              

                 
              

                     return response(200, 'Get TJ Data Success', u'获取统计数据成功', {