diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index 6a90611..230b49f 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -160,18 +160,14 @@ def findHouse(query, fields=None): seawater105 = get_collection("fangjia", "seawater", config.get_seawater_host(), 27777) for err_count in range(0, 10): try: -<<<<<<< HEAD + lt = 100 # seawater.find(query,{"p_date":-1}).sort([("p_date",-1)]) pos = list(seawater105.find(query, fields).sort([("p_date",-1)]).limit(lt)) #pos = list(seawater105.find(query, fields).limit(lt)) -======= - lt = 100 - # seawater.find(query,{"p_date":-1}).sort([("p_date",-1)]) - pos = list(seawater105.find(query, fields).sort([("p_date",-1)]).limit(lt)) ->>>>>>> d253c17cae80aab0340965a2bd161f1aea95d180 + data = pandas.DataFrame(pos) del pos # print("==================>", time.time() - s) diff --git a/PriceSystem/fix/__pycache__/price_fix.cpython-36.pyc b/PriceSystem/fix/__pycache__/price_fix.cpython-36.pyc index be76a2d..f0ad062 100644 Binary files a/PriceSystem/fix/__pycache__/price_fix.cpython-36.pyc and b/PriceSystem/fix/__pycache__/price_fix.cpython-36.pyc differ diff --git a/PriceSystem/fix/price_fix.py b/PriceSystem/fix/price_fix.py index 519f44d..9102098 100644 --- a/PriceSystem/fix/price_fix.py +++ b/PriceSystem/fix/price_fix.py @@ -192,7 +192,7 @@ def out_price(ct,rl,lk,calc): def update(ct,rl,lk,calc): - dd= out_price(ct,rl,lk,calc) + dd= out_price(ct,rl,lk,calc) return dd[0] ''' print(dd) diff --git a/PriceSystem/test.py b/PriceSystem/test.py index 48162e3..a47a46a 100644 --- a/PriceSystem/test.py +++ b/PriceSystem/test.py @@ -18,9 +18,9 @@ weekend = get_weekend('20180415') s = time.time() -ct='深圳' -rl='福田' -lk='世纪豪庭' +ct='嘉兴' +rl='海盐' +lk='保利壹品'