From 2bd0aa4040fbd462cd29cf03fee03863c940dc4d Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Mon, 9 Jan 2023 16:37:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8C=87=E5=AF=BC=E4=BB=B7?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/business/business/community/price.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dags/business/business/community/price.py b/dags/business/business/community/price.py index a6f1b49..71024cd 100644 --- a/dags/business/business/community/price.py +++ b/dags/business/business/community/price.py @@ -54,14 +54,12 @@ def sync_by_city(city, total_seaweed_df): region_price_df = region_price_df[['city', 'region', 'avg_price']] region_price_df = region_price_df.rename(columns={'avg_price': 'region_avg_price'}) seaweed_df = pd.merge(seaweed_df, region_price_df, how='left', on=['city', 'region']) - log.info('小区所在区域均价导出完毕') # 小区均价 avg_price_df = commutils.get_avg_price(city=city) avg_price_df = avg_price_df[['city', 'district_name', 'region', 'avg_price']] avg_price_df = avg_price_df.rename(columns={'district_name': 'name'}) seaweed_df = pd.merge(seaweed_df, avg_price_df, how='left', on=['city', 'region', 'name']) - log.info('小区均价导出完毕') # 小区均价区域排名 seaweed_df['avg_price_region_ranking'] = \ @@ -91,10 +89,11 @@ def sync_by_city(city, total_seaweed_df): seaweed_df = pd.merge(seaweed_df, rent_price_df, how='left', on=['city', 'region', 'name']) # 政府指导价 - gov_price_df = commutils.get_gov_guide_price() - gov_price_df = gov_price_df[['city', 'region', 'name', 'avg_price']] - gov_price_df = gov_price_df.rename(columns={'avg_price': 'guide_price'}) - seaweed_df = pd.merge(seaweed_df, gov_price_df, how='left', on=['city', 'region', 'name']) + gov_price_df = commutils.get_gov_guide_price(city=city) + if len(gov_price_df) > 0: + gov_price_df = gov_price_df[['city', 'region', 'name', 'avg_price']] + gov_price_df = gov_price_df.rename(columns={'avg_price': 'guide_price'}) + seaweed_df = pd.merge(seaweed_df, gov_price_df, how='left', on=['city', 'region', 'name']) actions = list() count = 0