|
@@ -418,7 +418,10 @@ def get_list_info(cls,**kwargs):
|
|
|
qset = qset.filter(name__icontains=kwargs.get("username"))
|
|
|
|
|
|
if model_name == "PlayerRecord":
|
|
|
- data = list(qset.order_by("-total_income").values())
|
|
|
+ if kwargs.get("username"):
|
|
|
+ data = list(qset.order_by("-stock_date").values())
|
|
|
+ else:
|
|
|
+ data = list(qset.order_by("-total_income").values())
|
|
|
else:
|
|
|
data = list(qset.order_by("-id").values())
|
|
|
page = int(kwargs.get("page",1))
|
|
@@ -779,6 +782,7 @@ def get_wanzhu_consult_list(**kwargs):
|
|
|
userinfo = get_user_info(user_id)
|
|
|
if userinfo:
|
|
|
item["user_code"] = userinfo.get("usercode")
|
|
|
+ item["phone"] = userinfo.get("phone")
|
|
|
|
|
|
#分页
|
|
|
page = int(kwargs.get("page",1))
|