From 638df286acb81bb358b55faa4dac628e6c45741b Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Tue, 23 Jul 2019 13:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=87=BA=E7=A5=A8=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84=E8=87=AA=E5=8A=A8=E5=8F=91=E9=80=81=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/trainsystem/controllers/api.php      | 5 +++--
 .../third_party/trainsystem/models/BIZ_train_model.php       | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index 6527a8d4..861acefc 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -45,6 +45,7 @@ class api extends CI_Controller{
 	public function send_confirmmail(){
 		//log_message('error','auto sendmail');
 		$mailarr = $this->BIZ_train_model->auto_sendmail();
+		print_r($mailarr);die();
 		foreach($mailarr as $obj){
 			$coli_id = $this->BIZ_train_model->cold_sn_get_coli_id($obj->ts_cold_sn);
 			$coli_id = $coli_id[0]->COLI_ID;
@@ -87,14 +88,14 @@ class api extends CI_Controller{
 			$flag = $this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body);
 			$this->BIZ_train_model->update_biz_jol(array("ts_ordernumber"=>$jh_order),array("ts_sendmail"=>1,"ts_m_sn"=>$flag));
 		}else if($status == '1'){
-			/*$subject = "The train ticket(s) will be issued manually, Order No $coli_id";
+			$subject = "The train ticket(s) will be issued manually, Order No $coli_id";
 			$body = $this->load->view('email_fault',$data,true);
 			$this->send_mail_to_wl("订单:{$coli_id} 出票失败","翰特订单号:{$coli_id};聚合订单号:{$jh_order}",$coli_id);
 			//测试阶段，将失败邮件发送一份给操作外联。
 			$flag = $this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$fromName,$fromEmail,$subject,$body);
 			//测试阶段，将失败邮件发送一份给操作外联。
 			$this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body);
-			$this->BIZ_train_model->update_biz_jol(array("ts_ordernumber"=>$jh_order),array("ts_sendmail"=>1,"ts_m_sn"=>$flag));*/
+			$this->BIZ_train_model->update_biz_jol(array("ts_ordernumber"=>$jh_order),array("ts_sendmail"=>1,"ts_m_sn"=>$flag));
 		}
 		
     }
diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php
index ebd389d0..f525d375 100644
--- a/application/third_party/trainsystem/models/BIZ_train_model.php
+++ b/application/third_party/trainsystem/models/BIZ_train_model.php
@@ -286,6 +286,7 @@ class BIZ_train_model extends CI_Model {
 	 
 	//筛选符合发送邮件的订单
 	public function auto_sendmail(){
+		$time = date('Y-m-d',time());
 		$sql = "SELECT 
 					ts_cold_sn,
 					ts_ordernumber,
@@ -311,6 +312,8 @@ class BIZ_train_model extends CI_Model {
 					ts_status != 'e'
 				AND
 					ts_status != '2'
+				AND 
+					ts_subtime > '{$time}'
 				AND 
 					bcli.COLI_WebCode in ('cht','WebMob-biz','WeChat-biz')
 					";