Skip to content

Z
zhichan
Commit d9d7af7c by huangjing
Options

hj

parent d89ced12
Showing with 66 additions and 45 deletions
entprofile/.idea/workspace.xml
...@@ -158,18 +158,6 @@ ...@@ -158,18 +158,6 @@
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
<component name="ServiceViewManager">
<option name="viewStates">
<list>
<serviceView>
<treeState>
<expand />
<select />
</treeState>
</serviceView>
</list>
</option>
</component>
<component name="SvnConfiguration"> <component name="SvnConfiguration">
<configuration /> <configuration />
</component> </component>
...@@ -185,8 +173,6 @@ ...@@ -185,8 +173,6 @@
<workItem from="1587352427758" duration="7427000" /> <workItem from="1587352427758" duration="7427000" />
<workItem from="1587433007175" duration="571000" /> <workItem from="1587433007175" duration="571000" />
<workItem from="1587437264430" duration="2651000" /> <workItem from="1587437264430" duration="2651000" />
<workItem from="1588728490707" duration="79000" />
<workItem from="1588728913571" duration="5000" />
</task> </task>
<servers /> <servers />
</component> </component>
...@@ -308,10 +294,10 @@ ...@@ -308,10 +294,10 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="com.intellij.coverage.CoverageDataManagerImpl"> <component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/recommendation$mod_db.coverage" NAME="mod_db Coverage Results" MODIFIED="1587358120537" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/db" />
<SUITE FILE_PATH="coverage/recommendation$main.coverage" NAME="main Coverage Results" MODIFIED="1587437271477" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/recommendation$main.coverage" NAME="main Coverage Results" MODIFIED="1587437271477" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/recommendation$company_es.coverage" NAME="company_es Coverage Results" MODIFIED="1587358210574" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/dao" />
<SUITE FILE_PATH="coverage/recommendation$company_basic.coverage" NAME="company_basic Coverage Results" MODIFIED="1587363152092" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/service" /> <SUITE FILE_PATH="coverage/recommendation$company_basic.coverage" NAME="company_basic Coverage Results" MODIFIED="1587363152092" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/service" />
<SUITE FILE_PATH="coverage/recommendation$company_es.coverage" NAME="company_es Coverage Results" MODIFIED="1587358210574" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/dao" />
<SUITE FILE_PATH="coverage/recommendation$user_behavior.coverage" NAME="user_behavior Coverage Results" MODIFIED="1587456914187" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/user_behavior" /> <SUITE FILE_PATH="coverage/recommendation$user_behavior.coverage" NAME="user_behavior Coverage Results" MODIFIED="1587456914187" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/user_behavior" />
<SUITE FILE_PATH="coverage/recommendation$mod_db.coverage" NAME="mod_db Coverage Results" MODIFIED="1587358120537" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/db" />
</component> </component>
</project> </project>
\ No newline at end of file
entprofile/dao/tj_product_depth_dao.py
...@@ -12,5 +12,5 @@ class ProductDao: ...@@ -12,5 +12,5 @@ class ProductDao:
def select(self, company_name): def select(self, company_name):
return self.dataBase.fetch_all( return self.dataBase.fetch_all(
"select * from `tj_product_depth` where company_name = '%s'" % company_name) "select * from `tj_product_depth_final` where company_name = '%s'" % company_name)
entprofile/dao/tj_provide_company.py
...@@ -21,4 +21,4 @@ class ProvideDao: ...@@ -21,4 +21,4 @@ class ProvideDao:
def select_id(self, business_id): def select_id(self, business_id):
return self.dataBase.fetch_all( return self.dataBase.fetch_all(
"select * from `tj_provide_company` where serial_number = '%s'" % (business_id)) "select * from `tj_product_depth_final` where business_opportunity_id = '%s'" % (business_id))
\ No newline at end of file \ No newline at end of file
entprofile/dao/tj_purchase_original_dao.py
...@@ -12,4 +12,4 @@ class OriginalDao: ...@@ -12,4 +12,4 @@ class OriginalDao:
def select(self,company_name): def select(self,company_name):
return self.dataBase.fetch_all("select * from `tj_history_order` where account_company_name = '%s' order by order_add_time desc " % company_name) return self.dataBase.fetch_all("select * from `tj_standard_order` where standard_company_name = '%s' order by order_add_time desc " % company_name)
\ No newline at end of file \ No newline at end of file
entprofile/main.py
...@@ -77,7 +77,7 @@ def business_post(): ...@@ -77,7 +77,7 @@ def business_post():
def business_product_post(): def business_product_post():
if request.method == 'POST': if request.method == 'POST':
request_data = request.json request_data = request.json
if not request_data or not request_data.get('credit_code'): if not request_data or not request_data.get('bussines_id'):
return common_result.to_result(None, 300, "参数错误") return common_result.to_result(None, 300, "参数错误")
business_id = request_data.get('bussines_id') business_id = request_data.get('bussines_id')
business_product_result = recomm.business_product(business_id) business_product_result = recomm.business_product(business_id)
......
entprofile/service/company_30s.py
...@@ -62,7 +62,9 @@ def final_hx (company_industry,hx_info_dict): ...@@ -62,7 +62,9 @@ def final_hx (company_industry,hx_info_dict):
knowledgeData_dict ={} knowledgeData_dict ={}
branchLable_dict ={} branchLable_dict ={}
industryData_dict['label_data'] = company_industry company_industry_list =[]
company_industry_list.append(company_industry)
industryData_dict['label_data'] = company_industry_list
industryData_dict['label_type'] = '行业标签' industryData_dict['label_type'] = '行业标签'
data.append(industryData_dict) data.append(industryData_dict)
...@@ -87,11 +89,14 @@ def final_hx (company_industry,hx_info_dict): ...@@ -87,11 +89,14 @@ def final_hx (company_industry,hx_info_dict):
data.append(knowledgeData_dict) data.append(knowledgeData_dict)
baseData = hx_info_dict['company_base'].replace('[', '').replace(']', '').replace("'", '').replace(" ",'').split(',') baseData = hx_info_dict['company_base'].replace('[', '').replace(']', '').replace("'", '').replace(" ",'').split(',')
branchData_list = []
for base_item in baseData: for base_item in baseData:
base_item = eval(base_item) base_item = eval(base_item)
if '分公司数量' in base_item.keys(): if '分公司数量' in base_item.keys():
branchLable_dict['label_data'] = base_item['分公司数量'] branch_info = base_item['分公司数量']
branchLable_dict['label_type'] = '分公司标签' branchData_list.append(branch_info)
branchLable_dict['label_data'] = branchData_list
branchLable_dict['label_type'] = '分公司标签'
data.append(branchLable_dict) data.append(branchLable_dict)
return data return data
......
entprofile/service/user_behavior.py
...@@ -19,10 +19,10 @@ class Recom: ...@@ -19,10 +19,10 @@ class Recom:
# print(item) # print(item)
behavior_json = {} behavior_json = {}
behavior_json['num'] = num behavior_json['num'] = num
behavior_json['goods_name'] = item['product_name'] behavior_json['goods_name'] = item['merge_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'] = item['order_pay']
behavior_json['source'] = item['source'] behavior_json['source'] = item['order_channel']
behavior_json['company_name'] = company_name behavior_json['company_name'] = company_name
item['status'] = "已完成" item['status'] = "已完成"
company_purchase.append(behavior_json) company_purchase.append(behavior_json)
...@@ -162,8 +162,7 @@ class Recom: ...@@ -162,8 +162,7 @@ class Recom:
provide.update_status(company_list) provide.update_status(company_list)
return recommend_product_list return recommend_product_list
# 商机 # 商机
def business(self): def business(self):
business_list = [] business_list = []
company_list = [] company_list = []
...@@ -196,40 +195,72 @@ class Recom: ...@@ -196,40 +195,72 @@ class Recom:
product = ProductDao() product = ProductDao()
product_result = product.select(company_name) product_result = product.select(company_name)
for data in product_result: for data in product_result:
print(data,"======推荐产品")
if data['relational_product']: if data['relational_product']:
relational = eval(data['relational_product']) relational = eval(data['relational_product'])
for item in relational: for item in relational:
print(item,"====业务产品item")
item['productName'] = item['commodityName']
del item['commodityName']
item['typeCate'] = item['typeName'] item['typeCate'] = item['typeName']
item['typeName'] = "关联推荐" item['typeName'] = "关联推荐"
product_list.append(item) product_list.append(item)
print(product_list,"===========业务产品list")
if data['similar_product']: if data['similar_product']:
similar = eval(data['similar_product']) similar = eval(data['similar_product'])
for item in similar: for similaritem in similar:
item['typeCate'] = item['typeName'] similaritem['typeCate'] = similaritem['typeName']
item['typeName'] = "同类推荐" similaritem['productName'] = similaritem['commodityName']
product_list.append(item) similaritem['typeName'] = "同类推荐"
product_list.append(similaritem)
if data['cross_product']: if data['cross_product']:
cross = eval(data['cross_product']) cross = eval(data['cross_product'])
for item in cross: for crossitem in cross:
item['typeCate'] = item['typeName'] crossitem['typeCate'] = crossitem['typeName']
item['typeName'] = "交叉推荐" crossitem['productName'] = crossitem['commodityName']
product_list.append(item) crossitem['typeName'] = "交叉推荐"
product_list.append(crossitem)
print(product_list, "===========业务产品list1")
return product_list return product_list
# 商机推荐产品 # 商机推荐产品
def business_product(self, business_id): def business_product(self, business_id):
print("0000")
provide = ProvideDao() provide = ProvideDao()
product_list = []
company_result = provide.select_id(business_id) product_result = provide.select_id(business_id)
if company_result: print(product_result,"product_resultproduct_resultproduct_result")
company_name = company_result[0]['company_name'] for data in product_result:
product_list = self.product_fun(company_name) print(data, "======推荐产品")
if data['relational_product']:
relational = eval(data['relational_product'])
for item in relational:
print(item, "====业务产品item")
item['productName'] = item['commodityName']
del item['commodityName']
item['typeCate'] = item['typeName']
item['typeName'] = "关联推荐"
product_list.append(item)
print(product_list, "===========业务产品list")
if data['similar_product']:
similar = eval(data['similar_product'])
for similaritem in similar:
similaritem['typeCate'] = similaritem['typeName']
similaritem['productName'] = similaritem['commodityName']
similaritem['typeName'] = "同类推荐"
product_list.append(similaritem)
if data['cross_product']:
cross = eval(data['cross_product'])
for crossitem in cross:
crossitem['typeCate'] = crossitem['typeName']
crossitem['productName'] = crossitem['commodityName']
crossitem['typeName'] = "交叉推荐"
product_list.append(crossitem)
print(product_list, "===========业务产品list1")
return product_list return product_list
# 公司名推荐产品 # 公司名推荐产品
def company_product(self, company_name): def company_product(self, company_name):
product_list = self.product_fun(company_name) product_list = self.product_fun(company_name)
return product_list return product_list
......
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