From 4966d45f96797011f39f60d5118fe894439571c6 Mon Sep 17 00:00:00 2001 From: Jalin Date: Tue, 10 Sep 2019 22:15:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E5=8D=95=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=20#173?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- py12306/order/order.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/py12306/order/order.py b/py12306/order/order.py index 5b6c37b..e75b74a 100644 --- a/py12306/order/order.py +++ b/py12306/order/order.py @@ -63,10 +63,14 @@ class Order: return self.order_did_success() elif not order_request_res: return - if not self.user_ins.request_init_dc_page(): return - if not self.check_order_info(): return - if not self.get_queue_count(): return - if not self.confirm_single_for_queue(): return + if not self.user_ins.request_init_dc_page(): + return + if not self.check_order_info(): + return + if not self.get_queue_count(): + return + if not self.confirm_single_for_queue(): + return order_id = self.query_order_wait_time() if order_id: # 发送通知 self.order_id = order_id @@ -429,11 +433,12 @@ class Order: OrderLog.print_passenger_did_deleted(available_passengers) for passenger in available_passengers: - tmp_str = '{seat_type},0,{passenger_type},{passenger_name},{passenger_id_card_type},{passenger_id_card},{passenger_mobile},N_'.format( + tmp_str = '{seat_type},0,{passenger_type},{passenger_name},{passenger_id_card_type},{passenger_id_card},{passenger_mobile},N,{enc_str}_'.format( seat_type=self.query_ins.current_order_seat, passenger_type=passenger['type'], passenger_name=passenger['name'], passenger_id_card_type=passenger['id_card_type'], passenger_id_card=passenger['id_card'], - passenger_mobile=passenger['mobile'] + passenger_mobile=passenger['mobile'], + enc_str=passenger['enc_str'], ) passenger_tickets.append(tmp_str)