Commit 7e7c49b3 authored by hujun's avatar hujun

字段修改

parent 5088377d
...@@ -3503,8 +3503,8 @@ class Finance extends Basic ...@@ -3503,8 +3503,8 @@ class Finance extends Basic
$where['source'] = 2; $where['source'] = 2;
$price = $m_pay->sumAdjustment('b.money', $where, $is_adjustment); $price = $m_pay->sumAdjustment('b.money', $where, $is_adjustment);
} else { } else {
$where['a.type'] = $type; $where['type'] = $type;
$price = $m_pay->sumAdjustment('a.money', $where, $is_adjustment); $price = $m_pay->sumAdjustment('real_money', $where, $is_adjustment);
} }
return empty($price) ? '' : $price; return empty($price) ? '' : $price;
} }
......
...@@ -549,9 +549,7 @@ class OPayLogModel extends Model ...@@ -549,9 +549,7 @@ class OPayLogModel extends Model
->where($where) ->where($where)
->sum($field); ->sum($field);
} else { } else {
$field = $this->db_->alias('a') $field = $this->db_->where($where)
->join('o_paylog_adjustment b','a.id=b.new_paylog_id')
->where($where)
->sum($field); ->sum($field);
} }
......
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