Commit 0040a887 authored by hujun's avatar hujun

收款列表增加时间计算总佣金

parent b814511b
......@@ -98,8 +98,27 @@ class Collection extends Basic
c.report_agent_name,f.store_name,g.district_name';
$data['data']['list'] = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
$data['data']['total'] = $order->getAddPayLogOrderListLmitTotal($where);
$data['data']['money_total'] = $order->getMoneyTotal(); //总额
//加时间条件
if ($where['a.create_time']) {
if (!empty($this->params['start_time']) && empty($this->params['end_time'])) {
$pay_where['create_time'] = ['> time',$this->params['start_time'] . ' 00:00:00'];
}
if (!empty($this->params['end_time']) && empty($this->params['start_time'])) {
$pay_where['create_time'] = ['< time',$this->params['end_time'] . ' 23:59:59'];
}
if (!empty($this->params['end_time']) && !empty($this->params['start_time'])) {
$pay_where['create_time'] = ['between time', [
$this->params['start_time']. ' 00:00:00',$this->params['end_time']. ' 23:59:59'
]];
}
$data['data']['money_total'] = $order->getMoneyTotal($pay_where); //总额
} else {
$data['data']['money_total'] = '';
}
foreach ($data['data']['list'] as $k=>$v) {
if (!empty($v['user_phone'])) {
$data['data']['list'][$k]['user_phone'] = substr_replace($v['user_phone'],'****',3,4);
......
......@@ -376,10 +376,11 @@ class OPayLogModel extends Model
/**
* 订单总额
*
* @param $where
* @return float|int
*/
public function getMoneyTotal() {
return $this->sum('money');
public function getMoneyTotal($where) {
return $this->where($where)->sum('money');
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment