diff --git a/app/data/controller/api/auth/Rebate.php b/app/data/controller/api/auth/Rebate.php index 38e3902f6..0ea38ead8 100644 --- a/app/data/controller/api/auth/Rebate.php +++ b/app/data/controller/api/auth/Rebate.php @@ -26,17 +26,15 @@ class Rebate extends Auth */ public function get() { - $date = input('date', date('Y-m')); - $year = substr($date, 0, 4); - - $map = ['uid' => $this->uuid]; - $query = $this->_query($this->table)->where($map)->equal('type,status'); - $result = $query->whereLike('date', "{$date}-%")->order('id desc')->page(true, false, false, 15); - $result['total'] = [ - '年度' => $this->_query($this->table)->where($map)->equal('type,status')->whereLike('date', "{$year}-%")->db()->sum('amount'), - '月度' => $this->_query($this->table)->where($map)->equal('type,status')->whereLike('date', "{$date}-%")->db()->sum('amount'), - ]; - $this->success('获取返利统计', $result); + $date = trim(input('date', date('Y-m')), '-'); + [$map, $year] = [['uid' => $this->uuid], substr($date, 0, 4)]; + $query = $this->_query($this->table)->where($map)->equal('type,status')->whereLike('date', "{$date}%"); + $this->success('获取返利统计', array_merge($query->order('id desc')->page(true, false, false, 10), [ + 'total' => [ + '年度' => $this->_query($this->table)->where($map)->equal('type,status')->whereLike('date', "{$year}%")->db()->sum('amount'), + '月度' => $this->_query($this->table)->where($map)->equal('type,status')->whereLike('date', "{$date}%")->db()->sum('amount'), + ], + ])); } /**