From 09e547096f031787828d5b26c69228c5f8e3b7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Thu, 25 Apr 2024 15:42:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E6=B5=B7=E7=AB=99=E9=9D=99?= =?UTF-8?q?=E6=80=81=E8=AF=9Dfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 4236b5c9..644e188e 100644 --- a/application/controllers/information.php +++ b/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; //调取模板 From 8a65396a3570db4e661e0ab5d4fbeaaaf5ae9570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Fri, 26 Apr 2024 10:06:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=87=BA=E7=A5=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/trainsystem/controllers/addorders.php | 6 +++++- .../third_party/trainsystem/models/BIZ_train_model.php | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php index b55013ff..78869822 100644 --- a/application/third_party/trainsystem/controllers/addorders.php +++ b/application/third_party/trainsystem/controllers/addorders.php @@ -285,8 +285,12 @@ class addorders extends CI_Controller{ if($auto_flag == 0){ $string .= '汉特订单号：'.$coli_id.'('.$cold_sn.')'.$back_message.''; + if($depart_diff==14){ - log_message('error','自动出票错误信息：'.''.$string.'
'); + }else{ + log_message('error','自动出票错误信息：'.''.$string.'
'); + } + }else{ //单个订单提交 echo $cold_sn.'
'; diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php index b1a52da6..304b3c57 100644 --- a/application/third_party/trainsystem/models/BIZ_train_model.php +++ b/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();