group

application/model/OPayLogModel.php

@@ -691,6 +691,7 @@ class OPayLogModel extends Model
         return  $this->db_->alias('a')
             ->join('o_order b', 'a.order_id = b.id', 'LEFT')
             ->where($params)
+            ->group('a.id')
             ->count($field);
     }
 
@@ -714,6 +715,7 @@ class OPayLogModel extends Model
             ->order($order_)
             ->limit($pageSize)
             ->page($pageNo)
+            ->group('a.id')
             ->select();
     }
 

application/model/OfficeOPayLogModel.php

@@ -672,6 +672,7 @@ class OfficeOPayLogModel extends Model
             ->order($order_)
             ->limit($pageSize)
             ->page($pageNo)
+            ->group('a.id')
             ->select();
     }
 
@@ -689,6 +690,7 @@ class OfficeOPayLogModel extends Model
             ->join('o_paylog_adjustment c', 'a.id = c.paylog_id', 'LEFT')
             ->join('o_refund d', 'a.id = d.pay_log_id', 'LEFT')
             ->where($params)
+            ->group('a.id')
             ->count($field);
     }
 

application/task/controller/PushMessageTask.php

@@ -126,7 +126,7 @@ class PushMessageTask
                         'order_id' => $save_data[$v2['pay_id']]['order_id'],
                         'house_id' => $save_data[$v2['pay_id']]['house_id'],
                         'addressee_id' => $v2['id'],
-                        'type' => 18,
+                        'type' => 17,
                         'status' => 0,
                         'message' => $save_data[$v2['pay_id']]['message'],
 //                        'title' => $save_data[$v2['pay_id']]['title']
@@ -187,7 +187,7 @@ class PushMessageTask
                 $save_data[$key]['addressee_id'] = $v['agent_id'];
                 $save_data[$key]['message'] = '[商铺编号:' . $v['house_id'] . ']的意向金到转定时间了，请抓紧时间转定哦！';
 //                $save_data[$key]['title'] = '意向金转定提醒';
-                $save_data[$key]['type'] = 17;
+                $save_data[$key]['type'] = 18;
                 $save_data[$key]['status'] = 0;
                 $pay_log_id[] = $v['id'];
 
@@ -217,7 +217,7 @@ class PushMessageTask
                         'order_id' => $save_data[$v2['pay_id']]['order_id'],
                         'house_id' => $save_data[$v2['pay_id']]['house_id'],
                         'addressee_id' => $v2['id'],
-                        'type' => 17,
+                        'type' => 18,
                         'status' => 0,
                         'message' => $save_data[$v2['pay_id']]['message'],
 //                        'title' => $save_data[$v2['pay_id']]['title']