Merge branch 'master' of gitee.com:hainatravel/information-system

application/third_party/trainsystem/controllers/api.php

@@ -87,14 +87,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));
 		}
 		
     }

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')
 					";