Skip to content

T
tl_estate
Commit bbd8e090 authored by hujun's avatar hujun
Browse files
Options

推送最好转定

parent 878f0f50
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 1 deletion
application/model/OPayLogModel.php
View file @ bbd8e090
...@@ -686,6 +686,8 @@ class OPayLogModel extends Model ...@@ -686,6 +686,8 @@ class OPayLogModel extends Model
{ {
return $this->db_->alias('a') return $this->db_->alias('a')
->join('o_order b', 'a.order_id = b.id', 'LEFT') ->join('o_order b', 'a.order_id = b.id', 'LEFT')
->join('o_paylog_adjustment c', 'a.id = c.paylog_id', 'LEFT')
->join('o_refund d', 'a.id = d.pay_log_id', 'LEFT')
->where($params) ->where($params)
->count($field); ->count($field);
} }
...@@ -706,6 +708,8 @@ class OPayLogModel extends Model ...@@ -706,6 +708,8 @@ class OPayLogModel extends Model
return $this->db_->field($field) return $this->db_->field($field)
->alias('a') ->alias('a')
->join('o_order b', 'a.order_id = b.id', 'LEFT') ->join('o_order b', 'a.order_id = b.id', 'LEFT')
->join('o_paylog_adjustment c', 'a.id = c.paylog_id', 'LEFT')
->join('o_refund d', 'a.id = d.pay_log_id', 'LEFT')
->where($params) ->where($params)
->order($order_) ->order($order_)
->limit($pageSize) ->limit($pageSize)
......
application/model/OfficeOPayLogModel.php
View file @ bbd8e090
...@@ -662,6 +662,8 @@ class OfficeOPayLogModel extends Model ...@@ -662,6 +662,8 @@ class OfficeOPayLogModel extends Model
return $this->db_->field($field) return $this->db_->field($field)
->alias('a') ->alias('a')
->join('o_order b', 'a.order_id = b.id', 'LEFT') ->join('o_order b', 'a.order_id = b.id', 'LEFT')
->join('o_paylog_adjustment c', 'a.id = c.paylog_id', 'LEFT')
->join('o_refund d', 'a.id = d.pay_log_id', 'LEFT')
->where($params) ->where($params)
->order($order_) ->order($order_)
->limit($pageSize) ->limit($pageSize)
...@@ -680,6 +682,8 @@ class OfficeOPayLogModel extends Model ...@@ -680,6 +682,8 @@ class OfficeOPayLogModel extends Model
{ {
return $this->db_->alias('a') return $this->db_->alias('a')
->join('o_order b', 'a.order_id = b.id', 'LEFT') ->join('o_order b', 'a.order_id = b.id', 'LEFT')
->join('o_paylog_adjustment c', 'a.id = c.paylog_id', 'LEFT')
->join('o_refund d', 'a.id = d.pay_log_id', 'LEFT')
->where($params) ->where($params)
->count($field); ->count($field);
} }
......
application/task/controller/PushMessageTask.php
View file @ bbd8e090
...@@ -49,9 +49,10 @@ class PushMessageTask ...@@ -49,9 +49,10 @@ class PushMessageTask
$where['a.is_transfer_msg'] = 0; $where['a.is_transfer_msg'] = 0;
$where['a.source'] = ['<', 2]; $where['a.source'] = ['<', 2];
$where['a.type'] = 10; $where['a.type'] = 10;
$where['c.id'] = ['null'];
$where['d.id'] = ['null'];
$where['a.last_transfer_time'] = ['<', date('Y-m-d H:i:s')]; $where['a.last_transfer_time'] = ['<', date('Y-m-d H:i:s')];
$total = $m_pay->getTotalJoinOrder($where); $total = $m_pay->getTotalJoinOrder($where);
if (empty($total)) { if (empty($total)) {
return null; return null;
} }
...@@ -142,6 +143,8 @@ class PushMessageTask ...@@ -142,6 +143,8 @@ class PushMessageTask
$where['a.is_transfer_msg'] = 0; $where['a.is_transfer_msg'] = 0;
$where['a.source'] = ['<', 2]; $where['a.source'] = ['<', 2];
$where['a.type'] = 10; $where['a.type'] = 10;
$where['c.id'] = ['null'];
$where['d.id'] = ['null'];
$where['a.last_transfer_time'] = ['<', date('Y-m-d H:i:s')]; $where['a.last_transfer_time'] = ['<', date('Y-m-d H:i:s')];
$total = $m_pay->getTotalJoinOrder($where); $total = $m_pay->getTotalJoinOrder($where);
......
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