Commit 23c1c9f9 authored by hujun's avatar hujun

//

parent 53b2f73e
......@@ -1495,7 +1495,7 @@ class OfficePayLog extends Basic
} else {
$list[$k]['bargain_id'] = '';
}
die('111');
$list[$k]['current_agent_name'] = $list[$k]['store_name'] = "";
if ($v['type'] == 92) {
$is_exclusive_type = $m_room->getFieldOneValue('is_exclusive_type', ['id'=>$v['house_id']]);
......
......@@ -229,7 +229,7 @@ class OfficeORefundModel extends Model{
return $this->db_->alias('a')
->field($field)
->join('office_o_order b', 'a.order_id = b.id', 'left')
->join('office_a_agents c', 'a.agent_id = c.id', 'left')
->join('a_agents c', 'a.agent_id = c.id', 'left')
->join('office_o_paylog d', 'a.pay_log_id = d.id', 'left')
->join('office_o_refund_log e', 'a.id = e.refund_id', 'left')
->join('office_o_bargain f', 'd.bargain_id = f.id', 'left')
......@@ -264,7 +264,7 @@ class OfficeORefundModel extends Model{
public function getCheckRefundListTotal($params) {
return $this->db_->alias('a')
->join('office_o_order b', 'a.order_id = b.id', 'left')
->join('office_a_agents c', 'a.agent_id = c.id', 'left')
->join('a_agents c', 'a.agent_id = c.id', 'left')
->join('office_o_paylog d', 'a.pay_log_id = d.id', 'left')
->join('office_o_refund_log e', 'a.id = e.refund_id', 'left')
->join('office_o_bargain f', 'd.bargain_id = f.id', 'left')
......@@ -306,7 +306,7 @@ class OfficeORefundModel extends Model{
$refund_money = $this->db_->alias('a')
->field('a.refund_money')
->join('office_o_order b', 'a.order_id = b.id', 'left')
->join('office_a_agents c', 'a.agent_id = c.id', 'left')
->join('a_agents c', 'a.agent_id = c.id', 'left')
->join('office_o_paylog d', 'a.pay_log_id = d.id', 'left')
->join('office_o_refund_log e', 'a.id = e.refund_id', 'left')
->join('office_o_bargain f', 'd.bargain_id = f.id', 'left')
......
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