diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php index eea8021e..94e085c1 100644 --- a/application/third_party/trainsystem/controllers/api.php +++ b/application/third_party/trainsystem/controllers/api.php @@ -77,9 +77,9 @@ class api extends CI_Controller{ $orderInfo = new stdCLass(); $doTicketsNum = 0; $orderInfo->coliId = $itemId; - $flag = $this->BIZ_train_model->get_paypal($itemId); + $priceInfo = $this->BIZ_train_model->get_paypal($itemId); + $orderInfo->totalPrice = $priceInfo->COLI_Price; - $orderInfo->ispay = $flag; $orderInfo->itinerary = array(); $coldSnArr = $this->BIZ_train_model->getAllColdSn($itemId); $itineraryNums = count($coldSnArr); @@ -94,7 +94,6 @@ class api extends CI_Controller{ $orderInfo->itinerary[$keyColdSn]->departureTime = date('H:i',strtotime($train_info->DepartureTime)); $orderInfo->itinerary[$keyColdSn]->arrivalTime = date('H:i',strtotime($train_info->ArrivalTime)); $orderInfo->itinerary[$keyColdSn]->Cabin = $train_info->Cabin; - $orderInfo->itinerary[$keyColdSn]->price = $train_info->adultprice; $ticketinfo = $this->train_system_model->get_tickets_info($itemColdSn->cold_sn); if(!empty($ticketinfo)){ diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php index 041e4d98..be7d4f72 100644 --- a/application/third_party/trainsystem/models/BIZ_train_model.php +++ b/application/third_party/trainsystem/models/BIZ_train_model.php @@ -337,10 +337,10 @@ class BIZ_train_model extends CI_Model { //获取paypal付款记录 function get_paypal($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); + $sql = " select GAI_SQJE,GAI_SQJECurrency,COLI_Price from BIZ_ConfirmLineInfo left join BIZ_GroupAccountInfo on COLI_ID = GAI_COLI_ID where COLI_ID = ?"; + $query = $query = $this->HT->query($sql, $coli_id); if ($query->num_rows() > 0) { - return true; + return $query->row(); } else { return false; } @@ -458,7 +458,7 @@ class BIZ_train_model extends CI_Model { //根据订单号获取所有子订单号 public function getAllColdSn($coliId){ - $sql = "select cold_sn,coli_price from BIZ_ConfirmLineInfo left join BIZ_ConfirmLineDetail on coli_sn = cold_coli_sn where coli_id = ? and COLI_servicetype = '2'"; + $sql = "select cold_sn from BIZ_ConfirmLineInfo left join BIZ_ConfirmLineDetail on coli_sn = cold_coli_sn where coli_id = ? and COLI_servicetype = '2'"; $query = $this->HT->query($sql, array($coliId)); return $query->result(); }