diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index dfb6b2a4c..c893201f0 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -569,3 +569,12 @@ function getTopPromote($promote_id) return M('promote', 'tab_')->where(['id' => $topPromoteId])->find(); } } + +function arrayPromoteWithdrawStatus($status, $param, $array = array()) { + foreach ($array as $key => $value) { + if($value[$status] == -1){ + unset($array[$key]); + } + } + return $array; +} \ No newline at end of file diff --git a/Application/Admin/Controller/QueryController.class.php b/Application/Admin/Controller/QueryController.class.php index 83d911277..811ef56b4 100644 --- a/Application/Admin/Controller/QueryController.class.php +++ b/Application/Admin/Controller/QueryController.class.php @@ -682,16 +682,15 @@ class QueryController extends ThinkController 'title' => '渠道提现', 'template_list' => 'withdraw', ); - $map1 = array('status' => 1); + $map1 = array('status' => ['neq', -1]); $total = null_to_0(D('withdraw')->where($map1)->sum('sum_money')); - $ttotal = null_to_0(D('withdraw')->where('end_time' . total(1))->where($map1)->sum('sum_money')); - $ytotal = null_to_0(D('withdraw')->where('end_time' . total(5))->where($map1)->sum('sum_money')); + $ttotal = null_to_0(D('withdraw')->where('create_time' . total(1))->where($map1)->sum('sum_money')); + $ytotal = null_to_0(D('withdraw')->where('create_time' . total(5))->where($map1)->sum('sum_money')); $this->assign('total', $total); $this->assign('ttotal', $ttotal); $this->assign('ytotal', $ytotal); $user = A('Bill', 'Event'); - $this->m_title = '推广提现'; $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Query/withdraw', 'status' => 1])->find()); diff --git a/Application/Admin/View/Query/withdraw.html b/Application/Admin/View/Query/withdraw.html index e4d233f10..164fd02da 100644 --- a/Application/Admin/View/Query/withdraw.html +++ b/Application/Admin/View/Query/withdraw.html @@ -155,7 +155,7 @@