jinql
/
12306
mirror of https://github.com/testerSunshine/12306
1
0
Fork 0
Code Issues Releases Wiki Activity

修复跨天时间计算问题 #256

pull/259/head
wenxianping 2019-04-07 22:30:28 +08:00
parent 370bc161ec
commit 5f4f5d0fd5
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
inter/Query.py
View File

@ -58,7 +58,13 @@ class query:
return seat[index]
def check_time_interval(self, ticket_info):
return self.departure_time <= time_to_minutes(ticket_info[8]) and \
"""
判断日期是否符合当前设置时间
fix: https://github.com/testerSunshine/12306/issues/256
:param ticket_info:
:return:
"""
return self.departure_time <= time_to_minutes(ticket_info[8]) <= self.arrival_time and \
time_to_minutes(ticket_info[9]) <= self.arrival_time and \
time_to_minutes(ticket_info[10]) <= self.take_time
@ -95,9 +101,10 @@ class query:
continue
value = station_ticket.get("data", "")
if not value:
print(u'{0}-{1} 车次坐席查询为空,ip网络异常，可能是时间配置未正确，查询url: https://kyfw.12306.cn{2}, 可以手动查询是否有票'.format(self.from_station_h,
self.to_station_h,
select_url["req_url"]))
print(u'{0}-{1} 车次坐席查询为空,ip网络异常，可能是时间配置未正确，查询url: https://kyfw.12306.cn{2}, 可以手动查询是否有票'.format(
self.from_station_h,
self.to_station_h,
select_url["req_url"]))
else:
result = value.get('result', [])
if result:
@ -124,11 +131,11 @@ class query:
ticket_num = int(ticket_info[j])
except ValueError:
ticket_num = "有"
print (u'车次: {0} 始发车站: {1} 终点站: {2} {3}: {4}'.format(ticket_info[3],
self.from_station_h,
self.to_station_h,
seat_conf_2[j],
ticket_num))
print(u'车次: {0} 始发车站: {1} 终点站: {2} {3}: {4}'.format(ticket_info[3],
self.from_station_h,
self.to_station_h,
seat_conf_2[j],
ticket_num))
if wrapcache.get(train_no):
print(ticket.QUERY_IN_BLACK_LIST.format(train_no))
continue
@ -162,7 +169,7 @@ class query:
}
else:
print(u"车次配置信息有误，或者返回数据异常，请检查 {}".format(station_ticket))
return {"code": ticket.FAIL_CODE, "status": False, "cdn": self.httpClint.cdn,}
return {"code": ticket.FAIL_CODE, "status": False, "cdn": self.httpClint.cdn, }
if __name__ == "__main__":