Skip to content

Commit 2db9c23

Browse files
committed
improve trainCodeDetailParams
1 parent e77c930 commit 2db9c23

File tree

2 files changed

+29
-20
lines changed

2 files changed

+29
-20
lines changed

12306ForMac/Model/QueryByTrainCodeParam.swift

+13-9
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,24 @@
99
import Foundation
1010

1111
struct QueryTrainCodeParam {
12-
let train_no:String //6i000D232806"
13-
let from_station_telecode:String // "IOQ"
14-
let to_station_telecode:String //"FYS"
15-
let depart_date:String //2016-09-10 !!列车出发时间!!
12+
let _train_no:String //6i000D232806"
13+
let _from_station_telecode:String // "IOQ"
14+
let _to_station_telecode:String //"FYS"
15+
let _depart_date:String //2016-09-10 !!列车出发时间!!
1616

1717
init(_ ticket:QueryLeftNewDTO) {
18-
train_no = ticket.train_no
19-
from_station_telecode = ticket.FromStationCode!
20-
to_station_telecode = ticket.ToStationCode!
21-
depart_date = ticket.start_train_date_formatStr!
18+
self.init(train_no:ticket.train_no,from_station_telecode:ticket.FromStationCode!,to_station_telecode:ticket.ToStationCode!,depart_date:ticket.start_train_date_formatStr!)
19+
}
20+
21+
init(train_no:String,from_station_telecode:String,to_station_telecode:String,depart_date:String) {
22+
_train_no = train_no
23+
_from_station_telecode = from_station_telecode
24+
_to_station_telecode = to_station_telecode
25+
_depart_date = depart_date
2226
}
2327

2428
//train_no=6i000D232806&from_station_telecode=IOQ&to_station_telecode=FYS&depart_date=2016-06-12
2529
func ToGetParams()->String{
26-
return "train_no=\(train_no)&from_station_telecode=\(from_station_telecode)&to_station_telecode=\(to_station_telecode)&depart_date=\(depart_date)"
30+
return "train_no=\(_train_no)&from_station_telecode=\(_from_station_telecode)&to_station_telecode=\(_to_station_telecode)&depart_date=\(_depart_date)"
2731
}
2832
}

12306ForMac/Model/QueryTrainPriceParam.swift

+16-11
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,28 @@
99
import Foundation
1010

1111
struct QueryTrainPriceParam {
12-
let train_no:String // "6i000D232806"
13-
let from_station_no:String // "01"
14-
let to_station_no:String // "14"
15-
let seat_types:String // "OM9"
16-
let train_date:String // "2016-12-29"
12+
let _train_no:String // "6i000D232806"
13+
let _from_station_no:String // "01"
14+
let _to_station_no:String // "14"
15+
let _seat_types:String // "OM9"
16+
let _train_date:String // "2016-12-29"
1717

1818
init(_ ticket:QueryLeftNewDTO) {
19-
train_no = ticket.train_no
20-
from_station_no = ticket.from_station_no!
21-
to_station_no = ticket.to_station_no!
22-
seat_types = ticket.seat_types!
23-
train_date = ticket.trainDateStr
19+
self.init(train_no:ticket.train_no,from_station_no:ticket.from_station_no!,to_station_no:ticket.to_station_no!,seat_types:ticket.seat_types!,train_date:ticket.trainDateStr)
20+
}
21+
22+
23+
init(train_no:String,from_station_no:String,to_station_no:String,seat_types:String,train_date:String) {
24+
_train_no = train_no
25+
_from_station_no = from_station_no
26+
_to_station_no = to_station_no
27+
_seat_types = seat_types
28+
_train_date = train_date
2429
}
2530

2631
//?train_no=6i000G160202&from_station_no=01&to_station_no=14&seat_types=OM9&train_date=2016-12-2
2732
func ToGetParams()->String{
28-
return "train_no=\(train_no)&from_station_no=\(from_station_no)&to_station_no=\(to_station_no)&seat_types=\(seat_types)&train_date=\(train_date)"
33+
return "train_no=\(_train_no)&from_station_no=\(_from_station_no)&to_station_no=\(_to_station_no)&seat_types=\(_seat_types)&train_date=\(_train_date)"
2934
}
3035
}
3136

0 commit comments

Comments
 (0)