Commit 2fbddba4 by 黄静

hj

parent fb8f5ea4
...@@ -86,7 +86,6 @@ def select_info(label_list): ...@@ -86,7 +86,6 @@ def select_info(label_list):
data_list1.append(data_list1_dict) data_list1.append(data_list1_dict)
print(len(data_list1)) print(len(data_list1))
try: try:
return json.dumps({"status": 200, "msg": "成功", "type": "select", "data": data_list1}, return json.dumps({"status": 200, "msg": "成功", "type": "select", "data": data_list1},
ensure_ascii=False) ensure_ascii=False)
except: except:
......
...@@ -278,7 +278,10 @@ def hx_company_dict(server): ...@@ -278,7 +278,10 @@ def hx_company_dict(server):
try: try:
base_result = companybase.companyinfo(company_name) base_result = companybase.companyinfo(company_name)
logo_url = hx.select_url(company_name) logo_url = hx.select_url(company_name)
if base_result:
base_result['logo'] = logo_url base_result['logo'] = logo_url
else:
base_result = "暂无符合条件的商机,请您修改条件进行检索!"
return {"status": 200, "msg": "成功", "data": base_result} return {"status": 200, "msg": "成功", "data": base_result}
except: except:
return {"status": 404, "msg": "成功", "data": "暂无符合条件的商机,请您修改条件进行检索!"} return {"status": 404, "msg": "成功", "data": "暂无符合条件的商机,请您修改条件进行检索!"}
...@@ -309,19 +312,26 @@ def hx_company_list(server): ...@@ -309,19 +312,26 @@ def hx_company_list(server):
for company_name in es_company_info['company_hx_list']: for company_name in es_company_info['company_hx_list']:
base_result = companybase.companyinfo(company_name) base_result = companybase.companyinfo(company_name)
logo_url = hx.select_url(company_name) logo_url = hx.select_url(company_name)
if base_result:
base_result['logo'] = logo_url base_result['logo'] = logo_url
base_result_list.append(base_result) base_result_list.append(base_result)
total = es_company_info['total'] total = es_company_info['total']
print("len_result",len(base_result_list)) print("len_result",len(base_result_list))
else: else:
base_result_list = "暂无该检索信息,请您修改条件进行检索!"
else:
es_company_info = hx.hxsearch(select_filter,pagesize,currentpage) es_company_info = hx.hxsearch(select_filter,pagesize,currentpage)
for company_name in es_company_info['company_hx_list']: for company_name in es_company_info['company_hx_list']:
base_result = companybase.companyinfo(company_name) base_result = companybase.companyinfo(company_name)
if base_result:
logo_url = hx.select_url(company_name) logo_url = hx.select_url(company_name)
base_result['logo'] = logo_url base_result['logo'] = logo_url
base_result_list.append(base_result) base_result_list.append(base_result)
total = es_company_info['total'] total = es_company_info['total']
print("len_result", len(base_result_list)) print("len_result", len(base_result_list))
else:
base_result_list = "暂无该检索信息,请您修改条件进行检索!"
except: except:
base_result_list = "暂无该检索信息,请您修改条件进行检索!" base_result_list = "暂无该检索信息,请您修改条件进行检索!"
return {"status": 200, "msg": "成功", "data": base_result_list,"total":total} return {"status": 200, "msg": "成功", "data": base_result_list,"total":total}
...@@ -24,7 +24,7 @@ class Recom: ...@@ -24,7 +24,7 @@ class Recom:
else: else:
behavior_json['goods_name'] = item['product_name'] behavior_json['goods_name'] = item['product_name']
behavior_json['purchase_date'] = str(item['order_add_time']) behavior_json['purchase_date'] = str(item['order_add_time'])
behavior_json['contract_amount'] = item['order_pay'] behavior_json['contract_amount'] = int(item['order_pay']/100)
behavior_json['source'] = item['order_channel'] behavior_json['source'] = item['order_channel']
behavior_json['company_name'] = company_name behavior_json['company_name'] = company_name
item['status'] = "已完成" item['status'] = "已完成"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment