推送最好转定

application/model/OPayLogModel.php

@@ -686,6 +686,8 @@ class OPayLogModel extends Model
     {
         return  $this->db_->alias('a')
             ->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)
             ->count($field);
     }
@@ -706,6 +708,8 @@ class OPayLogModel extends Model
         return $this->db_->field($field)
             ->alias('a')
             ->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)
             ->order($order_)
             ->limit($pageSize)

application/model/OfficeOPayLogModel.php

@@ -662,6 +662,8 @@ class OfficeOPayLogModel extends Model
         return $this->db_->field($field)
             ->alias('a')
             ->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)
             ->order($order_)
             ->limit($pageSize)
@@ -680,6 +682,8 @@ class OfficeOPayLogModel extends Model
     {
         return  $this->db_->alias('a')
             ->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)
             ->count($field);
     }

application/task/controller/PushMessageTask.php

@@ -49,9 +49,10 @@ class PushMessageTask
         $where['a.is_transfer_msg'] = 0;
         $where['a.source'] = ['<', 2];
         $where['a.type'] = 10;
+        $where['c.id'] = ['null'];
+        $where['d.id'] = ['null'];
         $where['a.last_transfer_time'] = ['<', date('Y-m-d H:i:s')];
         $total = $m_pay->getTotalJoinOrder($where);
-
         if (empty($total)) {
             return null;
         }
@@ -142,6 +143,8 @@ class PushMessageTask
         $where['a.is_transfer_msg'] = 0;
         $where['a.source'] = ['<', 2];
         $where['a.type'] = 10;
+        $where['c.id'] = ['null'];
+        $where['d.id'] = ['null'];
         $where['a.last_transfer_time'] = ['<', date('Y-m-d H:i:s')];
         $total = $m_pay->getTotalJoinOrder($where);