优化

application/model/OPayLogModel.php

@@ -690,8 +690,6 @@ 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);
     }
@@ -712,8 +710,6 @@ 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/ORefundModel.php

@@ -354,4 +354,15 @@ class ORefundModel extends BaseModel{
             ->where($where)
             ->find();
     }
+
+    /**
+     * @param $field
+     * @param $params
+     * @return int|mixed
+     */
+    public function getFieldColumn($field,$params) {
+        $params['is_del'] = 0;
+        return $this->db_->where($params)
+            ->column($field);
+    }
 }
\ No newline at end of file

application/task/controller/PushMessageTask.php

@@ -14,7 +14,9 @@ use app\api_broker\service\PushMessageService;
 use app\api_broker\service\RedisCacheService;
 use app\model\MPushCheckMessage;
 use app\model\OfficeOPayLogModel;
+use app\model\OPayLogAdjustment;
 use app\model\OPayLogModel;
+use app\model\ORefundModel;
 
 class PushMessageTask
 {
@@ -42,30 +44,48 @@ class PushMessageTask
     {
         set_time_limit(0);
         $m_pay = new OPayLogModel();
-        $m_push = new MPushCheckMessage();
-        $s_redis = new RedisCacheService();
-
         $where['a.is_del'] = 0;
         $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')];
+        $where['a.last_transfer_time'] = ['<', date('Y-m-d') . ' 23:59:59'];
         $total = $m_pay->getTotalJoinOrder($where);
         if (empty($total)) {
             return null;
         }
+        $m_push = new MPushCheckMessage();
+        $s_redis = new RedisCacheService();
+        $m_adjustment = new OPayLogAdjustment();
+        $m_refund = new ORefundModel();
 
         $page_size = 200;
         $page_total = ceil($total / $page_size);
         $field = 'a.id,a.agent_id,a.order_id,b.house_id,a.reckon_in_store,b.house_id';
         for ($i = 0; $i < $page_total; $i++) {
             $list = $m_pay->getListJoinOrder($i, $page_size, 'a.id asc', $field, $where);
+            foreach ($list as $key => $value) {
+                $check_pay_id[] = $value['id'];
+            }
+
+            if (empty($check_pay_id)) {
+                continue;
+            }
+
+            $adjustment_pay_id = $m_adjustment->getFieldColumn('paylog_id', ['id' => ['in', $check_pay_id]]);
+            $refund_pay_id = $m_refund->getFieldColumn('pay_log_id', ['id' => ['in', $check_pay_id]]);
 
             $save_data = $pay_log_id = $store_id = $pay_id = $pay_id_store = [];
             foreach ($list as $k => $v) {
                 $key = $v['id'];
+
+                if (is_array($adjustment_pay_id) && in_array($key, $adjustment_pay_id)) {
+                    continue;  //去除调整
+                }
+
+                if (is_array($refund_pay_id) && in_array($key, $refund_pay_id)) {
+                    continue; //去除退款
+                }
+
                 $save_data[$key]['order_id'] = $v['order_id'];
                 $save_data[$key]['house_id'] = $v['house_id'];
                 $save_data[$key]['addressee_id'] = $v['agent_id'];
@@ -126,7 +146,7 @@ class PushMessageTask
             }
         }
 
-        return ;
+        return;
     }
 
     /**
@@ -216,6 +236,6 @@ class PushMessageTask
             }
         }
 
-        return ;
+        return;
     }
 }
\ No newline at end of file