From 7612eae804cdb921dfb5548f54518b698548e525 Mon Sep 17 00:00:00 2001 From: cyc Date: Tue, 8 Oct 2019 15:06:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=A8=A1=E6=9D=BF=EF=BC=8C=E8=B0=83=E7=94=A8=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84=E5=B8=81=E7=A7=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/trainsystem/controllers/api.php | 3 +++ application/third_party/trainsystem/models/BIZ_train_model.php | 2 +- application/third_party/trainsystem/views/email.php | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php index a60171fd..045d9f3b 100644 --- a/application/third_party/trainsystem/controllers/api.php +++ b/application/third_party/trainsystem/controllers/api.php @@ -108,6 +108,9 @@ class api extends CI_Controller{ $data['chlid'] = $info->COLD_ChildNum; $data['baby'] = $info->COLD_BabyNum; $data['price'] = $this->BIZ_train_model->get_paypal($coli_id); + if($data['price']->GAI_SQJECurrency == 'CNY'){ + $data['price']->GAI_SQJECurrency == 'RMB'; + } $data['allpeople'] = $this->BIZ_train_model->biz_people($info->COLD_SN); $data['train_info'] = $this->BIZ_train_model->get_biz_foi($info->COLD_SN); $differtime = (strtotime($data['train_info'][0]->DepartureTime) - time()) / 3600; diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php index eb952645..3620f3c1 100644 --- a/application/third_party/trainsystem/models/BIZ_train_model.php +++ b/application/third_party/trainsystem/models/BIZ_train_model.php @@ -369,7 +369,7 @@ class BIZ_train_model extends CI_Model { //获取paypal付款记录 function get_paypal($coli_id){ - $sql = "select top 1 GAI_SQJE from BIZ_GroupAccountInfo where GAI_COLI_ID = ?"; + $sql = "select top 1 GAI_SQJE,GAI_SQJECurrency from BIZ_GroupAccountInfo where GAI_COLI_ID = ?"; $query = $query = $this->HT->query($sql, $coli_id); if ($query->num_rows() > 0) { return $query->row(); diff --git a/application/third_party/trainsystem/views/email.php b/application/third_party/trainsystem/views/email.php index 7f9e5a4a..b46d3e0b 100644 --- a/application/third_party/trainsystem/views/email.php +++ b/application/third_party/trainsystem/views/email.php @@ -1,5 +1,5 @@ -China train ticket(s) confirmed, Booking Number <?php echo $coli_id;?>

China Highlights Booking Confirmation

Dear ,

Thank you for your payment of US$GAI_SQJE?> . Your train ticket(s) have already been issued.

This email is important so please read it carefully. To ensure you have a smooth trip, it is highly recommended that you read the confirmation letter carefully. A mistake with your name or passport number will mean that you may not be able to collect your ticket(s). Let us know immediately if you see any mistakes below.

You can collect your paper ticket(s) from now on at any train station in mainland China. If you booked multiple trains, you can collect all of your paper tickets at the same time. You can just send one person to collect all tickets with all passengers’ original passports.

Please note:

1.Present the original passport(s) of all the passenger(s) and the ticket pick-up number(s) at ticket collection counters. The counter will then issue your paper train ticket(s).

+China train ticket(s) confirmed, Booking Number <?php echo $coli_id;?>

China Highlights Booking Confirmation

Dear ,

Thank you for your payment of GAI_SQJECurrency.' '.$price->GAI_SQJE?> . Your train ticket(s) have already been issued.

This email is important so please read it carefully. To ensure you have a smooth trip, it is highly recommended that you read the confirmation letter carefully. A mistake with your name or passport number will mean that you may not be able to collect your ticket(s). Let us know immediately if you see any mistakes below.

You can collect your paper ticket(s) from now on at any train station in mainland China. If you booked multiple trains, you can collect all of your paper tickets at the same time. You can just send one person to collect all tickets with all passengers’ original passports.

Please note:

1.Present the original passport(s) of all the passenger(s) and the ticket pick-up number(s) at ticket collection counters. The counter will then issue your paper train ticket(s).

2.Watch the video about how to collect your ticket(s) in China.

Ticket collection sentences

The bilingual note below might help you collect your ticket(s) from the ticket collection counter more easily.

You can show this to ask for directions:

1.Excuse me, where is ** train station? 你好，请问**火车站怎么走？

2.Please show me which window is the one to collect my train ticket(s) from.你好，请问哪个是取票窗？

2.Please issue the paper ticket(s) for me. The following is/are the pick-up number(s).请帮我出票，电子取票号如下.