Merge branch 'master' of 192.168.0.27:dev0/PriceSystem
This commit is contained in:
Binary file not shown.
@@ -621,12 +621,14 @@ def common_rent_price(ct,rl,p,timd,timm,region_feature,mongodb):
|
|||||||
|
|
||||||
|
|
||||||
def rent_filter(ap,ook):
|
def rent_filter(ap,ook):
|
||||||
|
print('ook=',ook)
|
||||||
if ook>0:
|
if ook!=None:
|
||||||
rdd=ap[(ap['area']>ook*0.8)&(ap['area']<ook*1.2)]
|
if ook>0:
|
||||||
return rdd
|
rdd=ap[(ap['area']>ook*0.8)&(ap['area']<ook*1.2)]
|
||||||
else:
|
return rdd
|
||||||
return ap[ap['rent_type']=='整租']
|
else:
|
||||||
|
return ap[ap['rent_type']=='整租']
|
||||||
|
return ap[ap['rent_type']=='整租']
|
||||||
|
|
||||||
def time_filter_price(aw,day,nd):
|
def time_filter_price(aw,day,nd):
|
||||||
###print('aw=',aw)
|
###print('aw=',aw)
|
||||||
@@ -896,7 +898,7 @@ def save_to_mongo(ct,rl,lk,timd,timm):
|
|||||||
|
|
||||||
print(ppu,mm)
|
print(ppu,mm)
|
||||||
|
|
||||||
if ppu==None:
|
if ppu==None or type(mm)==str:
|
||||||
return 0
|
return 0
|
||||||
else:
|
else:
|
||||||
return int(10000*(mm-ppu)/ppu)
|
return int(10000*(mm-ppu)/ppu)
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ weekend = get_weekend('20180415')
|
|||||||
|
|
||||||
ct='北京'
|
ct='北京'
|
||||||
rl='东城'
|
rl='东城'
|
||||||
lk='左安漪园'#上海闵行闵浦新苑一村普陀曹杨一村上海北京东城左安漪园
|
lk='朝阳门内南小街小区'#上海闵行闵浦新苑一村普陀曹杨一村上海北京东城左安漪园
|
||||||
#黄浦伯爵居静安泰安里长宁新泾北苑
|
#黄浦伯爵居静安泰安里长宁新泾北苑
|
||||||
timm=20180430
|
timm=20180430
|
||||||
timd=20160603
|
timd=20160603
|
||||||
|
|||||||
Reference in New Issue
Block a user