2
1

3 Ревизии 4944f092a1 ... 6053cd0501

Автор SHA1 Съобщение Дата
  zilong 6053cd0501 Merge branch 'develop' преди 4 години
  liuyuanhang 0af528085e 图文电话自动完成修改完成时间 преди 4 години
  liuyuanhang cab6a5a0fc 患者详情只查询已完成订单 преди 4 години
променени са 2 файла, в които са добавени 5 реда и са изтрити 3 реда
  1. 2 2
      app/Console/Commands/overTimeOrder.php
  2. 3 1
      app/Http/Controllers/Api/V2/DoctorController.php

+ 2 - 2
app/Console/Commands/overTimeOrder.php

xqd xqd
@@ -152,7 +152,7 @@ class overTimeOrder extends Command
                         order_trace(['类型'=>'认证到期提醒','医生openid'=>$v['docter']['openid'],'记录时间'=>date('Ymd His',time())],'info');
                         $send = send_wechatSubscription_message('out_then_reminder',[$v['docter']['openid'],  "pages/index/index", $v['organization']['name'],date('Y-m-d',strtotime($v['authentication_end_time']))]);
                         if ($send){
-                            \Cache::forever($v['id'].'-OutThenReminder',$v['id']); 
+                            \Cache::forever($v['id'].'-OutThenReminder',$v['id']);
                         }else{
                             order_trace(['公共方法发送微信模板消息失败', '请求类型' => 'OutThenReminder' ?? '', '返回数据' => $send ?? ''], 'error');
                         }
@@ -220,7 +220,7 @@ class overTimeOrder extends Command
         }
         if ($catNewIds){
             // 操作图文和电话订单为已完成
-            Order::whereIn('id',$catNewIds)->update(['order_status'=>4]);
+            Order::whereIn('id',$catNewIds)->update(['order_status'=>4,'end_time'=>time()]);
         }
     }
 

+ 3 - 1
app/Http/Controllers/Api/V2/DoctorController.php

xqd
@@ -1335,7 +1335,9 @@ class DoctorController extends AuthController
         $remarks = UserDocter::where('user_id', '=', $req['user_id'])->first();
 
 
-        $finds_order = Order::with('orderPatient')->where('user_id', '=', $req['user_id'])->orderBy('created_at', 'desc')->limit(3)->get();
+        $find_wheres['order_status'] = 4;
+        $find_wheres['user_id'] = $req['user_id'];
+        $finds_order = Order::with('orderPatient')->where($find_wheres)->orderBy('created_at', 'desc')->limit(3)->get();
         if ($finds_order) {
             $finds_order = $finds_order->toArray();
         }