From e1c47616dde03cd3d4290a23b0c11d7b375f9607 Mon Sep 17 00:00:00 2001
From: Qihang Zhang <zqh6200@qq.com>
Date: Sun, 6 Apr 2025 00:26:40 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20fix(data=5Fdownloader):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E7=BC=BA=E5=A4=B1=E7=9A=84?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A=EF=BC=8C=E7=A1=AE=E4=BF=9Ddaily=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AE=8C=E6=95=B4=E5=90=8E=E5=86=8D=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data_downloader.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/data_downloader.py b/data_downloader.py
index d99f0dd..aa57fbc 100644
--- a/data_downloader.py
+++ b/data_downloader.py
@@ -217,9 +217,6 @@ def download_stock_data(pro, ts_code, start_date, end_date):
     """下载股票的所有类型数据并合并"""
     # 下载daily价格数据
     daily_df = pro.daily(ts_code=ts_code, start_date=start_date, end_date=end_date)
-    if daily_df.empty:
-        print(f"警告：{ts_code}没有找到daily数据")
-        return pd.DataFrame()
 
     # 下载daily_basic数据
     daily_basic_df = pro.daily_basic(ts_code=ts_code, start_date=start_date, end_date=end_date)
@@ -227,6 +224,10 @@ def download_stock_data(pro, ts_code, start_date, end_date):
     # 下载moneyflow数据
     moneyflow_df = pro.moneyflow(ts_code=ts_code, start_date=start_date, end_date=end_date)
 
+    if daily_df.empty or daily_basic_df.empty or moneyflow_df.empty:
+        print(f"警告：{ts_code}daily数据不全，无法合并")
+        return pd.DataFrame()
+
     # 确保每个DataFrame都有trade_date列作为合并键
     if 'trade_date' not in daily_df.columns:
         print(f"错误：{ts_code}的daily数据缺少trade_date列")