Commit 1266a54b authored by hujun's avatar hujun

alias

parent 66163a77
......@@ -2600,12 +2600,12 @@ class OfficePayLog extends Basic
//提交人所在门店
if (!empty($this->params['store_id'])) {
$where['e.store_id'] = $this->params['store_id'];
$where['c.store_id'] = $this->params['store_id'];
}
//提交人所在部门
if (!empty($this->params['district_id'])) {
$where['e.district_id'] = $this->params['district_id'];
$where['c.district_id'] = $this->params['district_id'];
}
//提交人姓名
......
......@@ -86,7 +86,7 @@ class PayLog extends Basic
try {
$order = new OPayLogModel();
$field = 'a.create_time,a.id,a.order_id,a.bargain_id,a.income_time,c.name,a.real_money';
$field = 'a.create_time,a.id,a.order_id,a.bargain_id,a.income_time,e.name,a.real_money';
$list = $order->getPayLogOrderListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
$data['total'] = $order->getPayLogOrderListLimitTotal($where);
$data['list'] = $list;
......
......@@ -756,7 +756,7 @@ class OPayLogModel extends Model
return $this->db_->field($field)
->alias("a")
->join("o_order b", "a.order_id = b.id", "left")
->join('a_agents c', 'a.agent_id=c.id', 'left')
->join('a_agents e', 'a.agent_id=e.id', 'left')
->limit($pageSize)
->page($pageNo)
->order($order_)
......@@ -775,7 +775,7 @@ class OPayLogModel extends Model
return $this->db_->field($field)
->alias("a")
->join("o_order b", "a.order_id = b.id", "left")
->join('a_agents c', 'a.agent_id=c.id', 'left')
->join('a_agents e', 'a.agent_id=e.id', 'left')
->where($params)
->count($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