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

application/controllers/information.php

@@ -2976,7 +2976,7 @@ class Information extends CI_Controller
       }
 
       //获取cli_sn
-      $tourdata = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/api/getCliSn/?param=" . $productCode));
+      $tourdata = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/apish/getCliSn/?param=" . $productCode));
       $data["clisn"] = $tourdata->clisn;
 
       //调取模板

application/third_party/trainsystem/controllers/addorders.php

@@ -285,8 +285,12 @@ class addorders extends CI_Controller{
 			
 			if($auto_flag == 0){
 				$string .= '<tr><td>汉特订单号：'.$coli_id.'('.$cold_sn.')'.$back_message.'</td></tr>';
+				if($depart_diff==14){
 
-				log_message('error','自动出票错误信息：'.'<table border="1">'.$string.'</table>');
+				}else{
+					log_message('error','自动出票错误信息：'.'<table border="1">'.$string.'</table>');
+				}
+				
 			}else{
 				//单个订单提交
 				echo $cold_sn.'<br>';

application/third_party/trainsystem/models/BIZ_train_model.php

@@ -330,7 +330,7 @@ class BIZ_train_model extends CI_Model {
 
 	//获取能够自动出票的订单列表2.0版本 20240130 zp  (coli_state 11	我的订单 8	已收款 63 出票中 13 新订单（已支付))
 	function auto_check_ticket_2(){
-		$sql = "SELECT distinct top 2 COLD_SN ,coli_id,COLD_SPFS,COLI_State,(SELECT TOP 1 GAI_Type FROM BIZ_GroupAccountInfo WHERE GAI_COLI_SN=bcli.COLI_SN AND ISNULL(DeleteFlag,0)=0) as GAI_Type
+		$sql = "SELECT distinct top 10 COLD_SN ,coli_id,COLD_SPFS,COLI_State,(SELECT TOP 1 GAI_Type FROM BIZ_GroupAccountInfo WHERE GAI_COLI_SN=bcli.COLI_SN AND ISNULL(DeleteFlag,0)=0) as GAI_Type
 		,cold_startdate
 		,isnull((select top 1 ts_autotimes from InfoManager.dbo.trainsystem where ts_cold_sn= bcld.cold_sn order by ts_id desc),0) as  ts_autotimes
 		,(select top 1 ts_autolasttime from InfoManager.dbo.trainsystem where ts_cold_sn= bcld.cold_sn order by ts_id desc) as ts_autolasttime
@@ -353,6 +353,7 @@ class BIZ_train_model extends CI_Model {
                 where (ts_status='4' or ts_status='3' or ts_status='10') and ts_cold_sn = COLD_SN) ))
 			AND COLD_SN NOT IN ( select FOI_COLD_SN from BIZ_FlightsOrderInfo where FOI_COLD_SN=COLD_SN and FOI_TrainNetOrderNo>'')
             and (COLD_StartDate between GETDATE() and CONVERT(varchar(100),GETDATE()+14,23)+' 23:59')
+			order by COLD_StartDate
 		   ";
 		$query = $this->HT->query($sql);
 		return $query->result();