From 1187e1dcdfa00d0dd35bc6f298f1d4600d72ec9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E7=BA=AF=E5=87=80?= <1113655791@qq.com>
Date: Mon, 9 Jun 2025 22:26:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96PullTrade?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/PullTrade/main.go | 2 +-
 extend/pull-trade.go      | 6 ++----
 protocol/model_trade.go   | 4 ++++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/example/PullTrade/main.go b/example/PullTrade/main.go
index f722fd3..ce88e43 100644
--- a/example/PullTrade/main.go
+++ b/example/PullTrade/main.go
@@ -13,7 +13,7 @@ func main() {
 	m, err := tdx.NewManage(nil)
 	logs.PanicErr(err)
 
-	err = pt.Pull(m, 2024, "sz000001")
+	err = pt.Pull(m, 2025, "sz000001")
 	logs.Err(err)
 
 }
diff --git a/extend/pull-trade.go b/extend/pull-trade.go
index 98a6f73..371b940 100644
--- a/extend/pull-trade.go
+++ b/extend/pull-trade.go
@@ -106,7 +106,7 @@ func (this *PullTrade) Pull(m *tdx.Manage, year int, code string) (err error) {
 }
 
 func KlinesToCsv(filename string, code, name string, ks protocol.Klines) error {
-	data := [][]any{{"日期", "时间", "代码", "名称", "开盘", "最高", "最低", "收盘", "总手", "金额", "涨幅", "涨幅比"}}
+	data := [][]any{{"日期", "时间", "代码", "名称", "开盘", "最高", "最低", "收盘", "总手", "金额"}}
 	for _, v := range ks {
 		data = append(data, []any{
 			v.Time.Format("20060102"),
@@ -119,8 +119,6 @@ func KlinesToCsv(filename string, code, name string, ks protocol.Klines) error {
 			v.Close.Float64(),
 			v.Volume,
 			v.Amount.Float64(),
-			v.RisePrice().Float64(),
-			v.RiseRate(),
 		})
 	}
 
@@ -133,7 +131,7 @@ func KlinesToCsv(filename string, code, name string, ks protocol.Klines) error {
 }
 
 func TradeToCsv(filename string, ts protocol.Trades) error {
-	data := [][]any{{"日期", "时间", "价格", "成交量(手)", "成交额", "买卖方向"}}
+	data := [][]any{{"日期", "时间", "价格", "成交量(手)", "成交额", "方向(0买,1卖)"}}
 	for _, v := range ts {
 		data = append(data, []any{
 			v.Time.Format(time.DateOnly),
diff --git a/protocol/model_trade.go b/protocol/model_trade.go
index 45a9d4b..79ee9a4 100644
--- a/protocol/model_trade.go
+++ b/protocol/model_trade.go
@@ -150,6 +150,10 @@ func (this Trades) Klines1() (Klines, error) {
 		if v.Time.Hour() == 9 && v.Time.Minute() < 30 {
 			v.Time = time.Date(v.Time.Year(), v.Time.Month(), v.Time.Day(), 9, 30, 0, 0, v.Time.Location())
 		}
+		//15:00之前和11:30之前+1
+		if (v.Time.Hour() >= 13 && v.Time.Hour() < 15) || (v.Time.Hour() == 11 && v.Time.Minute() < 30) || v.Time.Hour() < 11 {
+			v.Time = v.Time.Add(time.Minute)
+		}
 		m[v.Time.Unix()] = append(m[v.Time.Unix()], v)
 	}