From 8ed02ea6251141b2b22982e949bfd236ec4734ac Mon Sep 17 00:00:00 2001 From: Breeze Chen Date: Sun, 27 Jan 2019 16:05:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=B6=88=E6=81=AF=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E4=B9=98=E8=BD=A6=E4=BA=BA=EF=BC=8C?= =?UTF-8?q?=E5=8F=91=E8=BD=A6=E6=97=B6=E9=97=B4=E3=80=81=E5=88=B0=E8=BE=BE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E8=B4=A6=E5=8F=B7=E7=AD=89=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- py12306/log/order_log.py | 17 +++++++++++------ py12306/order/order.py | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/py12306/log/order_log.py b/py12306/log/order_log.py index 0b4d55d..790693a 100644 --- a/py12306/log/order_log.py +++ b/py12306/log/order_log.py @@ -31,13 +31,13 @@ class OrderLog(BaseLog): MESSAGE_QUERY_ORDER_WAIT_TIME_INFO = '第 {} 次排队，请耐心等待' MESSAGE_ORDER_SUCCESS_NOTIFICATION_TITLE = '车票购买成功！' - MESSAGE_ORDER_SUCCESS_NOTIFICATION_CONTENT = '请及时登录12306，打开 \'未完成订单\'，在30分钟内完成支付!' - MESSAGE_ORDER_SUCCESS_NOTIFICATION_INFO = '\t\t车次信息：{} -> {} ( {} )，乘车日期 {}，席位：{}' + MESSAGE_ORDER_SUCCESS_NOTIFICATION_CONTENT = '请及时登录12306账号[{}]，打开 \'未完成订单\'，在30分钟内完成支付!' + MESSAGE_ORDER_SUCCESS_NOTIFICATION_INFO = '\t\t车次信息： {} {}[{}] -> {}[{}]，乘车日期 {}，席位：{}，乘车人：{}' MESSAGE_ORDER_SUCCESS_NOTIFICATION_OF_VOICE_CODE_START_SEND = '正在发送语音通知...' MESSAGE_ORDER_SUCCESS_NOTIFICATION_OF_VOICE_CODE_CONTENT = '你的车票 {} 到 {} 购买成功，请登录 12306 进行支付' - MESSAGE_ORDER_SUCCESS_NOTIFICATION_OF_EMAIL_CONTENT = '订单号 {}，请及时登录12306，打开 \'未完成订单\'，在30分钟内完成支付!' + MESSAGE_ORDER_SUCCESS_NOTIFICATION_OF_EMAIL_CONTENT = '订单号 {}，请及时登录12306账号[{}]，打开 \'未完成订单\'，在30分钟内完成支付!' MESSAGE_JOB_CLOSED = '当前任务已结束' @@ -60,8 +60,13 @@ class OrderLog(BaseLog): def get_order_success_notification_info(cls, query): from py12306.query.job import Job assert isinstance(query, Job) - return cls.MESSAGE_ORDER_SUCCESS_NOTIFICATION_INFO.format(query.get_info_of_left_station(), + passengers = [passenger.get( + 'name') + '(' + passenger.get('type_text') + ')' for passenger in query.passengers] + return cls.MESSAGE_ORDER_SUCCESS_NOTIFICATION_INFO.format(query.get_info_of_train_number(), + query.get_info_of_left_station(), + query.get_info_of_train_left_time(), query.get_info_of_arrive_station(), - query.get_info_of_train_number(), + query.get_info_of_train_arrive_time(), query.get_info_of_left_date(), - query.current_seat_name) + query.current_seat_name, + '，'.join(passengers)) diff --git a/py12306/order/order.py b/py12306/order/order.py index ff1da4a..c632c9e 100644 --- a/py12306/order/order.py +++ b/py12306/order/order.py @@ -77,7 +77,7 @@ class Order: def order_did_success(self): OrderLog.print_ticket_did_ordered(self.order_id) OrderLog.notification(OrderLog.MESSAGE_ORDER_SUCCESS_NOTIFICATION_TITLE, - OrderLog.MESSAGE_ORDER_SUCCESS_NOTIFICATION_CONTENT) + OrderLog.MESSAGE_ORDER_SUCCESS_NOTIFICATION_CONTENT.format(self.user_ins.user_name)) self.send_notification() return True @@ -85,7 +85,7 @@ class Order: # num = 0 # 通知次数 # sustain_time = self.notification_sustain_time info_message = OrderLog.get_order_success_notification_info(self.query_ins) - normal_message = OrderLog.MESSAGE_ORDER_SUCCESS_NOTIFICATION_OF_EMAIL_CONTENT.format(self.order_id) + normal_message = OrderLog.MESSAGE_ORDER_SUCCESS_NOTIFICATION_OF_EMAIL_CONTENT.format(self.order_id, self.user_ins.user_name) if Config().EMAIL_ENABLED: # 邮件通知 Notification.send_email(Config().EMAIL_RECEIVER, OrderLog.MESSAGE_ORDER_SUCCESS_NOTIFICATION_TITLE, normal_message + info_message)