From 5bbc55ca4f6f8abc759eabe56575e3a170eec4c5 Mon Sep 17 00:00:00 2001 From: wenxianping <931128603@qq.com> Date: Sun, 7 Jan 2018 13:21:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E5=94=AE=E8=BD=A6?= =?UTF-8?q?=E6=AC=A1=E8=AE=A2=E7=A5=A8=E4=BC=91=E7=9C=A0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yixing/config/ticket_config.yaml | 8 +++++--- yixing/init/select_ticket_info.py | 19 +++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/yixing/config/ticket_config.yaml b/yixing/config/ticket_config.yaml index 74adab4..2f4c1ee 100644 --- a/yixing/config/ticket_config.yaml +++ b/yixing/config/ticket_config.yaml @@ -15,12 +15,13 @@ #to_station: 到达站 #set_type: 坐席(商务座,二等座,特等座,软卧,硬卧,硬座,无座) #is_more_ticket:余票不足是否自动提交 -#select_refresh_interval:刷新间隔时间，1为一秒，0.1为100毫秒，以此类推 +#select_refresh_interval:抢票刷新间隔时间，1为一秒，0.1为100毫秒，以此类推 +#expect_refresh_interval:售票未开始，等待刷新间隔时间，1为一秒，0.1为100毫秒，以此类推 #ticke_peoples: 乘客 -#damatu：打码图账号，用于自动登录 +#damatu：打码兔账号，用于自动登录 set: - station_date: "2018-02-03" + station_date: "2018-02-04" station_trains: - "G1353" - "G1329" @@ -39,6 +40,7 @@ set: # - "一等座" is_more_ticket: Ture select_refresh_interval: 0.1 + expect_refresh_interval: 0.1 ticke_peoples: - "文贤平" diff --git a/yixing/init/select_ticket_info.py b/yixing/init/select_ticket_info.py index ca9542e..682c978 100644 --- a/yixing/init/select_ticket_info.py +++ b/yixing/init/select_ticket_info.py @@ -19,7 +19,7 @@ sys.setdefaultencoding('utf-8') class select: def __init__(self): - self.from_station, self.to_station, self.station_date, self._station_seat, self.is_more_ticket, self.ticke_peoples, self.select_refresh_interval, self.station_trains = self.get_ticket_info() + self.from_station, self.to_station, self.station_date, self._station_seat, self.is_more_ticket, self.ticke_peoples, self.select_refresh_interval, self.station_trains, self.expect_refresh_interval = self.get_ticket_info() self.order_request_params = {} # 订单提交时的参数 self.ticketInfoForPassengerForm = {} # 初始化当前页面参数 self.current_seats = {} # 席别信息 @@ -42,8 +42,9 @@ class select: ticke_peoples = ticket_info_config["ticke_peoples"] select_refresh_interval = ticket_info_config["set"]["select_refresh_interval"] station_trains = ticket_info_config["set"]["station_trains"] + expect_refresh_interval = ticket_info_config["set"]["expect_refresh_interval"] print "*"*20 - print "当前配置：出发站：{0}\n到达站：{1}\n乘车日期：{2}\n坐席：{3}\n是否有票自动提交：{4}\n乘车人：{5}\n刷新间隔：{6}\n候选购买车次：{7}".format\ + print "当前配置：出发站：{0}\n到达站：{1}\n乘车日期：{2}\n坐席：{3}\n是否有票自动提交：{4}\n乘车人：{5}\n刷新间隔：{6}\n候选购买车次：{7}\n未开始刷票间隔时间：{8}".format\ ( from_station, to_station, @@ -52,9 +53,11 @@ class select: is_more_ticket, ",".join(ticke_peoples), select_refresh_interval, - ",".join(station_trains),) + ",".join(station_trains), + expect_refresh_interval, + ) print "*"*20 - return from_station, to_station, station_date, set_type, is_more_ticket, ticke_peoples, select_refresh_interval, station_trains + return from_station, to_station, station_date, set_type, is_more_ticket, ticke_peoples, select_refresh_interval, station_trains, expect_refresh_interval def get_order_request_params(self): return self.order_request_params @@ -191,7 +194,7 @@ class select: if value['result']: for i in value['result']: ticket_info = i.split('|') - if ticket_info[11] == "N" and ticket_info[1].encode("utf8") == "预订": + if ticket_info[11] == "N" and ticket_info[1] == "预订": # 筛选未在开始时间内的车次 for j in range(len(self._station_seat)): if ticket_info[self.station_seat(self._station_seat[j].encode("utf8"))] != '' \ and ticket_info[self.station_seat(self._station_seat[j].encode("utf8"))] != '无' \ @@ -208,7 +211,7 @@ class select: print "当前车次查询无符合条件坐席，正在重新查询" else: print("当前这次还处于待售状态，请耐心等待") - time.sleep(1) + time.sleep(self.expect_refresh_interval) else: raise ticketConfigException("车次配置信息有误，请检查") else: @@ -232,9 +235,9 @@ class select: return True else: if check_user['messages']: - print ('用户检查失败：%s' % check_user['messages'][0]) + print ('用户检查失败：%s，可能未登录，可能session已经失效' % check_user['messages'][0]) else: - print ('用户检查失败： %s' % check_user) + print ('用户检查失败： %s，可能未登录，可能session已经失效' % check_user) def submit_station(self): """