From 9717853aeb2adc4e8845873ea8781540dd6e78df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Thu, 27 Apr 2023 11:50:36 +0800 Subject: [PATCH] fix --- .../third_party/trainsystem/controllers/callback.php | 2 +- .../third_party/trainsystem/controllers/pages.php | 12 ++++++------ .../trainsystem/models/BIZ_train_model.php | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/application/third_party/trainsystem/controllers/callback.php b/application/third_party/trainsystem/controllers/callback.php index 55eaed3b..8871b39c 100644 --- a/application/third_party/trainsystem/controllers/callback.php +++ b/application/third_party/trainsystem/controllers/callback.php @@ -326,7 +326,7 @@ class callback extends CI_Controller{ $add_train_payment_data->TOC_TrainNumber = $update_data->trainNo; $add_train_payment_data->TOC_DepartureDate = date('Y-m-d',strtotime($update_data->departTime )); $add_train_payment_data->TOC_TicketCost = $update_data->OrderTotleFee; - $add_train_payment_data->poundage = ""; + $add_train_payment_data->poundage = "0"; $add_train_payment_data->FOI_TrainNetOrderNo = $update_data->ElectronicOrderNumber; //电子票号 //print_r($add_train_order_data);die(); $this->BIZ_train_model->add_train_payment($add_train_payment_data); diff --git a/application/third_party/trainsystem/controllers/pages.php b/application/third_party/trainsystem/controllers/pages.php index fcf5de72..b203968f 100644 --- a/application/third_party/trainsystem/controllers/pages.php +++ b/application/third_party/trainsystem/controllers/pages.php @@ -57,9 +57,9 @@ class pages extends CI_Controller{ //系统列表页面 public function order_list(){ - if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){ - redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/'); - } + // if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){ + // redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/'); + // } $page_size = 10; $page = $this->input->get("page"); @@ -114,9 +114,9 @@ class pages extends CI_Controller{ //订单详情页面 public function order(){ - if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){ - redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/'); - } + // if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){ + // redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/'); + // } $ordernumber = $order=$this->input->get("order"); if(empty($ordernumber)){ diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php index 44af8b0a..321e6e49 100644 --- a/application/third_party/trainsystem/models/BIZ_train_model.php +++ b/application/third_party/trainsystem/models/BIZ_train_model.php @@ -227,7 +227,8 @@ class BIZ_train_model extends CI_Model { VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),null,?)"; //,(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),1,?) - $query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%",$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost,$data->TOC_VEI_SN,$data->TOC_Memo." 手续费",$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->poundage,$data->TOC_VEI_SN)); + + $query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%",$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost,$data->TOC_VEI_SN)); //,$data->TOC_Memo." 手续费",$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->poundage,$data->TOC_VEI_SN return $query; }