diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index 1e7dd6d6..343f558a 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -1321,6 +1321,13 @@ class Index extends CI_Controller { echo json_encode('没找到数据!'); } + public function get_export_record_currency($currency) + { + // $currency = $this->input->get_post('currency'); + $records = $this->Note_model->list_export_record(0, $currency); + return $this->output->set_content_type('application/json')->set_output(json_encode($records)); + } + public function export_list() { $from_date = $this->input->post("from_date"); diff --git a/webht/third_party/paypal/models/note_model.php b/webht/third_party/paypal/models/note_model.php index 109bad65..c601f348 100644 --- a/webht/third_party/paypal/models/note_model.php +++ b/webht/third_party/paypal/models/note_model.php @@ -185,10 +185,11 @@ class Note_model extends CI_Model { $this->info->insert('Transaction_Export_Log', $db); } - public function list_export_record($sn=0) + public function list_export_record($sn=0, $currency=null) { $this->info = $this->load->database('INFO', TRUE); - $search_sql = $sn===0 ? "" : " and TEL_SN=$sn "; + $search_sql = $sn===0 ? "" : " AND TEL_SN=$sn "; + $search_sql .= $currency===null ? "" : " AND TEL_transactionCurrency='" . $currency . "'"; $sql = "SELECT TOP 10 * FROM [InfoManager].[dbo].[Transaction_Export_Log] WHERE 1=1 diff --git a/webht/third_party/paypal/views/note_list.php b/webht/third_party/paypal/views/note_list.php index c40e675e..f599f74a 100644 --- a/webht/third_party/paypal/views/note_list.php +++ b/webht/third_party/paypal/views/note_list.php @@ -65,6 +65,23 @@