|
@@ -783,14 +783,15 @@ def get_wanzhu_consult_list(**kwargs):
|
|
|
if kwargs.get("content"):
|
|
if kwargs.get("content"):
|
|
|
qset = qset.filter(Q(content__icontains=kwargs.get("content"))|Q(reply_content__icontains=kwargs.get("content")))
|
|
qset = qset.filter(Q(content__icontains=kwargs.get("content"))|Q(reply_content__icontains=kwargs.get("content")))
|
|
|
data = list(qset.values())
|
|
data = list(qset.values())
|
|
|
-
|
|
|
|
|
for item in data:
|
|
for item in data:
|
|
|
user_id = item["user_id"]
|
|
user_id = item["user_id"]
|
|
|
userinfo = get_user_info(user_id)
|
|
userinfo = get_user_info(user_id)
|
|
|
|
|
+
|
|
|
if userinfo:
|
|
if userinfo:
|
|
|
item["user_code"] = userinfo.get("usercode")
|
|
item["user_code"] = userinfo.get("usercode")
|
|
|
item["phone"] = userinfo.get("phone")
|
|
item["phone"] = userinfo.get("phone")
|
|
|
|
|
|
|
|
|
|
+
|
|
|
#分页
|
|
#分页
|
|
|
page = int(kwargs.get("page",1))
|
|
page = int(kwargs.get("page",1))
|
|
|
page_size = int(kwargs.get("page_size",20))
|
|
page_size = int(kwargs.get("page_size",20))
|
|
@@ -1089,4 +1090,3 @@ def refund_out_trade_order(**kwargs):
|
|
|
raise ce.TipException(u"该订单不存在退款失败!")
|
|
raise ce.TipException(u"该订单不存在退款失败!")
|
|
|
|
|
|
|
|
|
|
|
|
|
-#test
|
|
|
xjc