diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index e57a148e..5509160b 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -1266,7 +1266,7 @@ class Index extends CI_Controller { public function note_faillist() { $this->permission->is_admin(true); $data = array(); -//有关键词则不限制日期 + //有关键词则不限制日期 $data['search_key'] = $this->input->post('search_key'); $data['date'] = $this->input->get('date'); empty($data['date']) ? $data['date'] = date('Y-m-d') : false; @@ -1276,6 +1276,19 @@ class Index extends CI_Controller { $this->load->view('n-footer'); } + /** + * 按状态查找 + * @author LYT + */ + public function note_status_list($status) { + $this->permission->is_admin(true); + $data = array(); + $data['notelist'] = $this->Note_model->notestatus(200, $status); + $this->load->view('n-header', $data); + $this->load->view('note_list'); + $this->load->view('n-footer'); + } + //获取note详情，修改各项数据 public function note_modal($pn_txn_id, $pn_id=false, $pn_invoice=false) { $this->permission->is_admin(true); @@ -1287,15 +1300,15 @@ class Index extends CI_Controller { $orderid_info = $this->analysis_orderid($pn_invoice); } else { $orderid_info = $this->analysis_orderid($data['note']->pn_invoice); - } + } $data['pn_invoice'] = $pn_invoice ? $pn_invoice : $data['note']->pn_invoice; if (!empty($orderid_info)) { $orderid_info = json_decode($orderid_info); $data['order_info'] = $this->Paypal_model->get_order($orderid_info->orderid, true, $orderid_info->ordertype); } - + $order_sn = empty($data['order_info']) ? 0 : $data['order_info']->COLI_SN; - $data['group_accout_info'] = + $data['group_accout_info'] = $this->Paypal_model->get_group_accout_info($order_sn, $data['note']->pn_txn_id); echo json_encode($this->load->view('note_setting', $data, true)); return true; @@ -1573,7 +1586,7 @@ class Index extends CI_Controller { echo json_encode($this->load->view('gai_setting', $data, true)); } - /** 测试收款记录的是否已录入到订单 + /** 测试收款记录的是否已录入到订单 * 测试找不到订单信息使用 */ public function test_gai_modal($pn_txn_id=null, $pn_id = null, $neworder=null) diff --git a/webht/third_party/paypal/models/note_model.php b/webht/third_party/paypal/models/note_model.php index d7916cbe..75b336b1 100644 --- a/webht/third_party/paypal/models/note_model.php +++ b/webht/third_party/paypal/models/note_model.php @@ -44,6 +44,20 @@ class Note_model extends CI_Model { return $this->get_list(); } + public function notestatus($topnum = 2, $status = '') { + $this->init(); + $this->topnum = $topnum; + $x_status = strtolower($status) === 'reversal' ? 'revers' : $status; + $sql1 = in_array(strtolower($status), ["completed", 'pending']) ? " AND (pn_payment_status='$status' ) " : ""; + $sql2 = in_array(strtolower($status), ["refunded", "reversal"]) ? " AND (pn_payment_status like '%$x_status%' ) " : ""; + $sql3 = in_array(strtolower($status), ["others"]) ? " AND (pn_payment_status='failed' OR pn_payment_status='denied' ) " : ""; + $sql4 = in_array(strtolower($status), ["case"]) ? " AND (pn_memo like '{\"txn_type\":\"new_case\"%' AND pn_mc_gross = '0' ) " : ""; + $this->pn_send = $sql1 . $sql2 . $sql3 . $sql4; + // $this->orderby=" ORDER BY pn_payment_date DESC, pn.pn_sn ASC "; + $this->orderby=" ORDER BY CASE pn.pn_send WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.pn_sn DESC "; + return $this->get_list(); + } + public function search_date($date) { $this->init(); $search_sql = " AND (pn.pn_datetime BETWEEN '$date 00:00:00' AND '$date 23:59:59' OR isnull(pn_send,'') in ('sendfail','unsend','')) "; @@ -122,9 +136,9 @@ class Note_model extends CI_Model { $this->search ? $sql.=$this->search : false; $this->pn_txn_id ? $sql.=$this->pn_txn_id : false; $this->orderby ? $sql.=$this->orderby : false; -// log_message('error',$sql); + log_message('error',$sql); $query = $this->HT->query($sql); - //print_r($this->HT->queries); + // print_r($this->HT->queries); if ($this->topnum === 1) { if ($query->num_rows() > 0) { $row = $query->row(); @@ -200,7 +214,7 @@ class Note_model extends CI_Model { } $this->search = $search_sql; $this->orderby = " order by pn.pn_sn asc"; - + $filter_list = []; $txn_list = []; $query_list = $this->get_list(); diff --git a/webht/third_party/paypal/views/note_list.php b/webht/third_party/paypal/views/note_list.php index 2fa72dc9..431eb79f 100644 --- a/webht/third_party/paypal/views/note_list.php +++ b/webht/third_party/paypal/views/note_list.php @@ -160,10 +160,25 @@ echo "