后台问卷调查

@@ -61,7 +61,7 @@ class LoadController extends HomeBaseController
             //$data['status'] eq 2 || $data['order_expire_time'] lt time() || ($data['order_about_time']+24*30*60*60) lt time()
             //$data['status'] eq 2 || $data['order_expire_time'] lt time() || ($data['order_about_time']+24*30*60*60) lt time()
 //            $where['o.status'] = ['eq',2];
 //            $where['o.status'] = ['eq',2];
             $where = [];
             $where = [];
-            $whereor = "(o.status = 2 and o.delete_time = 0) or (o.status = 1 and o.order_expire_time < $time and o.order_about_time < ".($time-24*30*60*60)." and o.delete_time = 0) or (o.status = 3 and o.order_expire_time < $time and o.delete_time = 0) or (o.status = 3 and o.order_about_time < ".($time-24*30*60*60)." and o.delete_time = 0)";
+            $whereor = "(o.status = 2 and o.delete_time = 0) or (o.order_expire_time < $time ) or (o.status = 1 and o.order_about_time < ".($time-24*30*60*60)." and o.delete_time = 0) or (o.status = 3 and o.delete_time = 0) or (o.status = 3 and o.order_about_time < ".($time-24*30*60*60)." and o.delete_time = 0)";
             $data = $orderInfoModel->selectData1($where,$whereor);
             $data = $orderInfoModel->selectData1($where,$whereor);
             dump($data);
             dump($data);
             foreach($data as $key1 => $vo){
             foreach($data as $key1 => $vo){

@@ -27,7 +27,7 @@ class OrderInfoModel extends Model
         return $data;
         return $data;
     }
     }
     public function selectData1($where1=null,$whereor=null){
     public function selectData1($where1=null,$whereor=null){
-        $where1['o.delete_time'] = ['eq',0];
+//        $where1['o.delete_time'] = ['eq',0];
         //$where1['c.expire_time'] = ['>',time()];//判断保单是否还在缴费期限内
         //$where1['c.expire_time'] = ['>',time()];//判断保单是否还在缴费期限内
         //$where1['o.order_expire_time'] = ['>',time()];//筛选出托管中状态
         //$where1['o.order_expire_time'] = ['>',time()];//筛选出托管中状态
         //$where1['o.status'] = ['eq',3];//筛选出托管中状态
         //$where1['o.status'] = ['eq',3];//筛选出托管中状态