@ -39,7 +39,7 @@ class Note_model extends CI_Model {
public function failnotec($topnum = 2) {
public function failnotec($topnum = 2) {
$this->init();
$this->init();
$this->topnum = $topnum;
$this->topnum = $topnum;
$this->pn_send = " AND (pn_send='sendfail' OR pn_send='') AND pn_payment_status='Completed' ";
$this->pn_send = " AND (pn_send='sendfail' OR pn_send='') AND pn_payment_status COLLATE SQL_Latin1_General_CP1_CI_AS ='Completed' ";
// 1小时前
// 1小时前
$date = date("Y-m-d H:i:s", time() - 1800);
$date = date("Y-m-d H:i:s", time() - 1800);
$this->search = " AND pn_datetime < '$date' " ;
$this->search = " AND pn_datetime < '$date' " ;
@ -95,10 +95,11 @@ class Note_model extends CI_Model {
public function search_date($date) {
public function search_date($date) {
$this->init();
$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','')) AND pn_memo NOT LIKE '{\"id\":\"WH-%' "; // {"id":"WH-
$search_sql = " AND (pn.pn_datetime BETWEEN '$date 00:00:00' AND '$date 23:59:59' OR isnull(pn_send,'') in ('sendfail','unsend','')) AND pn_send NOT LIKE 'send-wh%' "; // {"id":"WH-
// AND pn_memo NOT LIKE '{\"id\":\"WH-%'
$this->search = $search_sql;
$this->search = $search_sql;
// $this->orderby=" ORDER BY CASE pn.pn_send WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.pn_sn DESC ";
// $this->orderby=" ORDER BY CASE pn.pn_send WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.pn_sn DESC ";
$this->orderby=" ORDER BY CASE WHEN pn.pn_send='sendfail' AND pn.pn_payment_status='Completed' THEN 1 WHEN pn.pn_send = 'sendfail' THEN 2 ELSE 9 END, pn.pn_payment_date DESC ,pn.pn_sn DESC ";
$this->orderby=" ORDER BY CASE WHEN pn.pn_send='sendfail' AND pn.pn_payment_status COLLATE SQL_Latin1_General_CP1_CI_AS ='Completed' THEN 1 WHEN pn.pn_send = 'sendfail' THEN 2 ELSE 9 END, pn.pn_payment_date DESC ,pn.pn_sn DESC ";
// WHEN pn.pn_send = 'sendfail' THEN 2
// WHEN pn.pn_send = 'sendfail' THEN 2
return $this->get_list();
return $this->get_list();
@ -126,7 +127,8 @@ class Note_model extends CI_Model {