Commit 12e9ff38 authored by zhuwei's avatar zhuwei

收款总计

parent 3a76dc9a
......@@ -3021,11 +3021,24 @@ class Finance extends Basic
$data['list'] = $list;
//加时间条件
if ($is_show) {
$data['money_total'] = $order->getMoneyTotal($where, 'a.real_money'); //总额
$where['a.source'] = array('neq',2);
$data['money_total'] = $order->getMoneyTotal($where, 'a.money'); //收款总计(正常)
$where['a.source'] = 2;
$data['money_change_total'] = $order->getMoneyTotal($where, 'a.money'); //收款总计(调整)
$where['a.source'] = array('neq',2);
$data['real_money_total'] = $order->getMoneyTotal($where, 'a.real_money'); //实付总计(正常)
$where['a.source'] = 2;
$data['real_money_change_total'] = $order->getMoneyTotal($where, 'a.real_money'); //实付总计(调整)
} else {
$data['money_total'] = '';
$data['money_change_total'] = '';
$data['real_money_total'] = '';
$data['real_money_change_total'] = '';
}
$data['list'] = $this->numberTransitionString($data['list']);
} catch (\Exception $e) {
$msg = '内部错误:' . $e->getMessage();
if ($this->params['excel'] == 1) {
......
......@@ -396,6 +396,7 @@ class OPayLogModel extends Model
->sum($field);
}
big_log($this->getLastSql());
return $data;
}
......
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