From fbfbbe25812f220b0f754c680301b8e89dcebf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Sat, 11 May 2024 10:51:55 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=87=BA=E7=A5=A8=E8=BF=90=E8=A1=8C=E6=97=B6=E9=97=B4=E4=B8=BA?= =?UTF-8?q?3=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/trainsystem/controllers/addorders.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php index a950b667..1819f223 100644 --- a/application/third_party/trainsystem/controllers/addorders.php +++ b/application/third_party/trainsystem/controllers/addorders.php @@ -170,6 +170,8 @@ class addorders extends CI_Controller{ public function auto_pay_ticket_2(){ date_default_timezone_set('Asia/Shanghai'); + set_time_limit(180); + //筛选出能自动出票的订单 $auto_pool = $this->BIZ_train_model->auto_check_ticket_2(); From de21b4e693eb2b950978ced719afc57b43f6969e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Sat, 11 May 2024 11:07:49 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E8=B6=85=E8=BF=8712=E4=B8=AA=E5=B0=8F?= =?UTF-8?q?=E6=97=B6=E6=89=8D=E5=81=9C=E6=AD=A2=E6=8A=A2=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/trainsystem/controllers/addorders.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php index 1819f223..c5bc55f0 100644 --- a/application/third_party/trainsystem/controllers/addorders.php +++ b/application/third_party/trainsystem/controllers/addorders.php @@ -258,7 +258,7 @@ class addorders extends CI_Controller{ } //echo $saletime; $sale_diff = (time() - $saletime) / 3600; - if($sale_diff > 1){ + if($sale_diff > 12){ $auto_flag = 0; $back_message .= '-超过抢票时间'; }else if($sale_diff <0){ From e36f5f885df70ba47ad67026137005b0cb0b05e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Sun, 12 May 2024 11:26:18 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=87=BA=E7=A5=A8?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=87=8D=E6=96=B0=E4=BF=AE=E6=94=B9=E3=80=82?= =?UTF-8?q?=EF=BC=88=E6=88=91=E8=AE=B0=E5=BE=97=E6=94=B9=E8=BF=87=E4=BA=86?= =?UTF-8?q?=E7=9A=84=EF=BC=8C=E4=B8=8D=E7=9F=A5=E9=81=93=E6=80=8E=E4=B9=88?= =?UTF-8?q?=E4=B8=8D=E8=A7=81=E4=BA=86=E3=80=82=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/trainsystem/models/BIZ_train_model.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php index 00970446..ba7b0477 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 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 + $sql = "SELECT 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 @@ -354,7 +354,12 @@ class BIZ_train_model extends CI_Model { 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') and isnull((select top 1 ts_autotimes from InfoManager.dbo.trainsystem where ts_cold_sn= bcld.cold_sn order by ts_id desc),0)<4 - order by COLD_StartDate + order by ISNULL(CAST((select TST_saletime from TrainSaleTime where TST_station_cn = ( + SELECT TOP 1 TRS_StationCN + FROM TrainStation + WHERE TRS_Code = (select top 1 DepartAirport from BIZ_FlightsOrderInfo where FOI_COLD_SN = cold_sn) + and ISNULL(TRS_StationCN,'')<>'' + )) as Time),'18:00') "; $query = $this->HT->query($sql); return $query->result(); From ecdbe13813eda92f607d925c7a8604f247a82678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Mon, 13 May 2024 16:09:56 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=87=BA=E7=A5=A8sql,=E5=85=BC=E5=AE=B9=E5=A4=9A=E6=9D=A1?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E8=AE=B0=E5=BD=95=E7=9A=84=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/trainsystem/models/BIZ_train_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php index ba7b0477..fa6c43f2 100644 --- a/application/third_party/trainsystem/models/BIZ_train_model.php +++ b/application/third_party/trainsystem/models/BIZ_train_model.php @@ -339,7 +339,7 @@ class BIZ_train_model extends CI_Model { INNER JOIN dbo.OperatorInfo ON OPI_SN=COLI_OPI_ID and OPI_DEI_SN=10 AND ISNULL(dbo.OperatorInfo.DeleteFlag,0)=0 WHERE bcli.COLI_ServiceType = '2' AND bcli.COLI_State in ('13','63') - AND EXISTS(SELECT GAI_SN FROM BIZ_GroupAccountInfo WHERE GAI_COLI_SN=bcli.COLI_SN AND (bcli.COLI_Price - GAI_SQJE) <= 20 AND (GAI_SQJE - bcli.COLI_Price) >= -20 AND isnull(DeleteFlag,0) = 0) + AND EXISTS(SELECT sum(GAI_SQJE) FROM BIZ_GroupAccountInfo WHERE GAI_COLI_SN=bcli.COLI_SN AND isnull(DeleteFlag,0) = 0 having (bcli.COLI_Price - Sum(GAI_SQJE)) <= 20 AND (Sum(GAI_SQJE) - bcli.COLI_Price) >= -20 ) AND isnull(bcli.DeleteFlag,0) = 0 AND isnull(bcld.DeleteFlag,0) = 0 AND COLD_SPFS < 2 From 176877615623753891465feb66fb2e9b721bae26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Mon, 13 May 2024 16:14:56 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=87=BA=E7=A5=A8?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=85=88=E6=8C=89=E6=97=A5=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E6=8C=89=E9=A2=84=E5=94=AE=E6=97=B6=E9=97=B4=E3=80=82?= =?UTF-8?q?=E8=BF=99=E6=A0=B7=E5=8F=AF=E4=BB=A5=E4=BC=98=E5=85=88=E9=A2=84?= =?UTF-8?q?=E5=94=AE=E6=9C=9F=E5=86=85=E7=9A=84=E5=85=88=E5=87=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/trainsystem/models/BIZ_train_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php index fa6c43f2..d16be8e2 100644 --- a/application/third_party/trainsystem/models/BIZ_train_model.php +++ b/application/third_party/trainsystem/models/BIZ_train_model.php @@ -354,7 +354,7 @@ class BIZ_train_model extends CI_Model { 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') and isnull((select top 1 ts_autotimes from InfoManager.dbo.trainsystem where ts_cold_sn= bcld.cold_sn order by ts_id desc),0)<4 - order by ISNULL(CAST((select TST_saletime from TrainSaleTime where TST_station_cn = ( + order by CONVERT(date,cold_startdate),ISNULL(CAST((select TST_saletime from TrainSaleTime where TST_station_cn = ( SELECT TOP 1 TRS_StationCN FROM TrainStation WHERE TRS_Code = (select top 1 DepartAirport from BIZ_FlightsOrderInfo where FOI_COLD_SN = cold_sn) From 1c80267de8dc2517c7bac727effc4f3793ea8511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Thu, 16 May 2024 09:25:26 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=84=E5=94=AE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=A1=A8=E6=9C=89=E9=87=8D=E5=A4=8D=E7=AB=99?= =?UTF-8?q?=E7=82=B9=E7=9A=84=E8=AF=9D=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/trainsystem/models/BIZ_train_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php index d16be8e2..1113e56f 100644 --- a/application/third_party/trainsystem/models/BIZ_train_model.php +++ b/application/third_party/trainsystem/models/BIZ_train_model.php @@ -354,7 +354,7 @@ class BIZ_train_model extends CI_Model { 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') and isnull((select top 1 ts_autotimes from InfoManager.dbo.trainsystem where ts_cold_sn= bcld.cold_sn order by ts_id desc),0)<4 - order by CONVERT(date,cold_startdate),ISNULL(CAST((select TST_saletime from TrainSaleTime where TST_station_cn = ( + order by CONVERT(date,cold_startdate),ISNULL(CAST((select TOP 1 TST_saletime from TrainSaleTime where TST_station_cn = ( SELECT TOP 1 TRS_StationCN FROM TrainStation WHERE TRS_Code = (select top 1 DepartAirport from BIZ_FlightsOrderInfo where FOI_COLD_SN = cold_sn) From 573e2a8a0149ef1b655babf61ab5dcee0cacb061 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Thu, 16 May 2024 10:16:50 +0800 Subject: [PATCH 07/23] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=BA=E7=A5=A8?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=AA=8C=E8=AF=81=E5=92=8C=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84jQuery=E6=97=A5=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/order/views/confirm_order.php | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php index 86f065d5..e2170383 100644 --- a/application/third_party/order/views/confirm_order.php +++ b/application/third_party/order/views/confirm_order.php @@ -6,7 +6,7 @@ Passport Information for All the Group Members - +