修正部分API中夜盘TradingDay的Bug

wukan1986 · wukan1986 · commit 7f79ba5936f3 · 2015-06-02T21:30:13.000+08:00
diff --git a/include/toolkit.cpp b/include/toolkit.cpp
@@ -256,21 +256,22 @@ void GetExchangeTime_CZCE(int iTradingDay, char* TradingDay, char* ActionDay, ch
 	// TradingDay处理
 	if (_TradingDay)
 	{
+		int tradingday = 0;
 		if ((HH > 18 || HH < 6))
 		{
-			*_TradingDay = iTradingDay;
+			tradingday = iTradingDay;
 		}
 		else
 		{
-			int tradingday = atoi(TradingDay);
-			if (tradingday == 0)
-			{
-				time_t now = time(0);
-				struct tm *ptmNow = localtime(&now);
-				tradingday = (ptmNow->tm_year + 1900) * 10000 + (ptmNow->tm_mon + 1) * 100 + ptmNow->tm_mday;
-			}
-			*_TradingDay = tradingday;
+			tradingday = atoi(TradingDay);
 		}
+		if (tradingday == 0)
+		{
+			time_t now = time(0);
+			struct tm *ptmNow = localtime(&now);
+			tradingday = (ptmNow->tm_year + 1900) * 10000 + (ptmNow->tm_mon + 1) * 100 + ptmNow->tm_mday;
+		}
+		*_TradingDay = tradingday;
 	}
 
 	if (_ActionDay == nullptr)
@@ -319,7 +320,7 @@ void GetExchangeTime_Undefined(int iTradingDay, char* TradingDay, char* ActionDa
 		int tradingday = 0;
 		if ((HH > 18 || HH < 6))
 		{
-			*_TradingDay = iTradingDay;
+			tradingday = iTradingDay;
 		}
 		else
 		{

Original file line number	Diff line number	Diff line change
`@@ -256,21 +256,22 @@ void GetExchangeTime_CZCE(int iTradingDay, char* TradingDay, char* ActionDay, ch`
`256`	`256`	`// TradingDay处理`
`257`	`257`	`if (_TradingDay)`
`258`	`258`	`{`
	`259`	`+ int tradingday = 0;`
`259`	`260`	`if ((HH > 18 \|\| HH < 6))`
`260`	`261`	`{`
`261`		`- *_TradingDay = iTradingDay;`
	`262`	`+ tradingday = iTradingDay;`
`262`	`263`	`}`
`263`	`264`	`else`
`264`	`265`	`{`
`265`		`- int tradingday = atoi(TradingDay);`
`266`		`- if (tradingday == 0)`
`267`		`- {`
`268`		`- time_t now = time(0);`
`269`		`- struct tm *ptmNow = localtime(&now);`
`270`		`- tradingday = (ptmNow->tm_year + 1900) * 10000 + (ptmNow->tm_mon + 1) * 100 + ptmNow->tm_mday;`
`271`		`- }`
`272`		`- *_TradingDay = tradingday;`
	`266`	`+ tradingday = atoi(TradingDay);`
`273`	`267`	`}`
	`268`	`+ if (tradingday == 0)`
	`269`	`+ {`
	`270`	`+ time_t now = time(0);`
	`271`	`+ struct tm *ptmNow = localtime(&now);`
	`272`	`+ tradingday = (ptmNow->tm_year + 1900) * 10000 + (ptmNow->tm_mon + 1) * 100 + ptmNow->tm_mday;`
	`273`	`+ }`
	`274`	`+ *_TradingDay = tradingday;`
`274`	`275`	`}`
`275`	`276`
`276`	`277`	`if (_ActionDay == nullptr)`
`@@ -319,7 +320,7 @@ void GetExchangeTime_Undefined(int iTradingDay, char* TradingDay, char* ActionDa`
`319`	`320`	`int tradingday = 0;`
`320`	`321`	`if ((HH > 18 \|\| HH < 6))`
`321`	`322`	`{`
`322`		`- *_TradingDay = iTradingDay;`
	`323`	`+ tradingday = iTradingDay;`
`323`	`324`	`}`
`324`	`325`	`else`
`325`	`326`	`{`