|
|
@@ -3827,7 +3827,11 @@ def get_user_markscore_week_avg(request):
|
|
|
# qset = cm.UserMarkScore.objects.filter(stock_date=now_str).aggregate(avg_score=Avg("score"))
|
|
|
# item_list.append({"stock_date":now_str,"avg_score":qset.get("avg_score",0)})
|
|
|
# data.append(item_list)
|
|
|
- count = (len(data)%5) + 30
|
|
|
+ #count = (len(data)%5) + 30
|
|
|
+ if datetime.datetime.now().weekday() in [5,6]:
|
|
|
+ count = 35
|
|
|
+ else:
|
|
|
+ count = (datetime.datetime.now().weekday()+1) + 30
|
|
|
return data[:count]
|
|
|
|
|
|
|
|
|
@@ -3968,6 +3972,9 @@ def delete_user_stock(request):
|
|
|
player_id = player.id
|
|
|
#删除今日作业数据
|
|
|
cm.PlayerRecord.get_db_model(match_id).objects.filter(user_id=user_id,stock_date=stock_date).delete()
|
|
|
+ #删除今日作业缓存数据
|
|
|
+ del_key = "%s_%s_%s_%s" % (user_id,match_id,player.match_group,stock_date)
|
|
|
+ ccc.del_cache(del_key)
|
|
|
|
|
|
#删除今日持仓数据
|
|
|
month = "%s%s" % (stock_date.split("-")[0],stock_date.split("-")[1])
|
|
|
@@ -4042,7 +4049,7 @@ def get_match_cangwei_avg_allday(**qdata):
|
|
|
|
|
|
allday_cangwei_avg_list = []
|
|
|
prset = cm.PlayerRecord.get_db_model(match_id).objects.filter(match_id=match_id).values("stock_date")\
|
|
|
- .annotate(cnt=Count("stock_date"),total=Sum("today_cangwei"))
|
|
|
+ .annotate(cnt=Count("stock_date"),total=Sum("today_cangwei")).order_by("-stock_date")
|
|
|
for item in prset:
|
|
|
stock_date = item["stock_date"]
|
|
|
cnt = item["cnt"]
|
|
|
@@ -4056,6 +4063,6 @@ def get_match_cangwei_avg_allday(**qdata):
|
|
|
"today_cangwei_avg":today_cangwei_avg
|
|
|
})
|
|
|
|
|
|
- allday_cangwei_avg_list = sorted(allday_cangwei_avg_list,key=lambda x:x["stock_date"],reverse=True)
|
|
|
+ #allday_cangwei_avg_list = sorted(allday_cangwei_avg_list,key=lambda x:x["stock_date"],reverse=True)
|
|
|
rst = {"list":allday_cangwei_avg_list}
|
|
|
return rst
|