定时订单超时

app/Console/Commands/overTimeOrder.php

@@ -90,20 +90,20 @@ class overTimeOrder extends Command
 //            $endToday=mktime(0,0,0,date('m'),date('d')+1,date('Y'))-1;
             $Order = Order::with(['orderPatient','docter','user'])->where(['order_status'=>7,'payment_status'=>2])->orWhere(function ($query){
                 $query->where(['order_status'=>3,'payment_status'=>2]);
-            })->get();
+            })->where('appoint_end_time','<',time())->get();
             foreach ($Order as $k=>$v){
-                if($v['product_type']==3 || $v['product_type']==4 || $v['product_type']==5|| $v['product_type']==7){
-                    if (time() > $v['appoint_end_time']){
+                if($v['product_type']==3 || $v['product_type']==4 || $v['product_type']==5){
+//                    if (time() > $v['appoint_end_time']){
                         if ($v['docter']['openid']){
                             $menNewIds[$k] = $v['id'];
                             $send = send_wechatSubscription_message('appoint_reminder',[$v['docter']['openid'], "pages/index/index",$v['order_sn'],$v['user']['nickname'],$v['user']['phone'],$v['created_at']]);
                         }
-                    }
+//                    }
                 }
             }
+            order_trace(['订单类型'=>'预约订单','订单id组'=>$menNewIds,'超时时间'=>date('Ymd His',time())],'info');
             if ($menNewIds){
                 // 操作门诊订单为已超时
-                order_trace(['订单类型'=>'预约订单','订单id组'=>$menNewIds,'超时时间'=>date('Ymd His',time())],'info');
                 Order::whereIn('id',$menNewIds)->update(['order_status'=>6,'order_notes'=>'医生确认超时']);
             }
         }
@@ -218,19 +218,20 @@ class overTimeOrder extends Command
     public function clinicOverTimeOrders(){
         $inOrder = Order::with('orderPatient')->where(['order_status'=>7,'payment_status'=>2])->orWhere(function ($query){
             $query->where(['order_status'=>3,'payment_status'=>2]);
-        })->get();
+        })->where('appoint_end_time','<',time())->get();
         $menNewIds = [];
         foreach ($inOrder as $k=>$v){
-            if($v['product_type']==3 || $v['product_type']==4 || $v['product_type']==5|| $v['product_type']==7){
-                if (time() > $v['appoint_end_time']){
+            if($v['product_type']==3 || $v['product_type']==4 || $v['product_type']==5){
+//                if (time() > $v['appoint_end_time']){
                     $menNewIds[$k] = $v['id'];
                     $this->AppointReminder($v['id']);
-                }
+//                }
             }
         }
+        order_trace(['订单类型'=>'门诊订单','订单id组'=>$menNewIds,'超时时间'=>date('Ymd His',time())],'info');
+
         if ($menNewIds){
             // 操作门诊订单为已超时
-            order_trace(['订单类型'=>'门诊订单','订单id组'=>$menNewIds,'超时时间'=>date('Ymd His',time())],'info');
             Order::whereIn('id',$menNewIds)->update(['order_status'=>6,'order_notes'=>'医生确认超时']);
         }
     }