diff --git a/PriceSystem/sell_price/zhuge0118A.py b/PriceSystem/sell_price/zhuge0118A.py index e8d2fe3..509d517 100644 --- a/PriceSystem/sell_price/zhuge0118A.py +++ b/PriceSystem/sell_price/zhuge0118A.py @@ -1438,7 +1438,10 @@ def ghhh(kkg): stat = fangjia.get_collection("fangjia", "district_stat", config.get_district_stat_host(), config.get_district_stat_port()) -pt = fangjia.get_collection("fangjia_log", "problem_command", config.get_log_mongodb_host(), config.get_log_mongodb_port()) +pt = fangjia.get_collection("fangjia_log", "calc_command", config.get_log_mongodb_host(), config.get_log_mongodb_port()) +#pt = fangjia.get_collection("fangjia_log", "problem_command", config.get_log_mongodb_host(), config.get_log_mongodb_port()) + + #stat = fangjia.get_collection("fangjia", "Copy_of_district_stat_shanghai_april_ten", '192.168.10.182', 27017) #stat = fangjia.get_collection("fangjia", config.get_save_db(), '192.168.10.182', 27017) @@ -1652,7 +1655,13 @@ def out_put_price(ct, rl, lk, weekend): else: return int(mm[0]) #s1=time.time() - avg=avg_compare(ct,rl,lk,mm,weekend) + + + #avg=avg_compare(ct,rl,lk,mm,weekend) + + avg=int(mm[0]) + + make_up = int(make_up(avg,last_sunday_price)) #print('s1_time=',time.time()-s1) #avg=mm[0] diff --git a/PriceSystem/test.py b/PriceSystem/test.py index d1072e5..a7be9d1 100644 --- a/PriceSystem/test.py +++ b/PriceSystem/test.py @@ -14,7 +14,7 @@ def get_weekend(tt): pacific = pytz.timezone('Asia/Shanghai') return pacific.localize(bb) -weekend = get_weekend('20180429') +weekend = get_weekend('20180401') s = time.time()