update

app/Http/Controllers/Api/V1/DocterController.php

@@ -89,9 +89,11 @@ class DocterController extends AuthController
         }
 
         if ($list_type == 3) {
-            //查询我关注的医生
-            $docterIds3 = Collection::where('user_id', $user['id'])->where('docter_id', '>', 0)->pluck('docter_id')->toArray();
-            $builder->whereNotIn('id', $docterIds3);
+            if (!empty($user)) {
+                //查询我关注的医生
+                $docterIds3 = Collection::where('user_id', $user['id'])->where('docter_id', '>', 0)->pluck('docter_id')->toArray();
+                $builder->whereNotIn('id', $docterIds3);
+            }
         }
 
         if (!empty($req['is_pack_docter'])) {
@@ -130,7 +132,7 @@ class DocterController extends AuthController
 
         //组合我关注的医生，放在最前面
         $page = empty($req['page']) ? 1 : $req['page'];
-        if ($list_type == 3 && $page == 1) {
+        if ($list_type == 3 && $page == 1 && !empty($docterIds3)) {
             $builder2 = Docter::with('office', 'qualification')->select(['id', 'type', 'name', 'phone', 'sex', 'birthday', 'avatar', 'status', 'label', 'sign', 'intro', 'office_id', 'qualification_id', 'score', 'service_persons', 'eva_num', 'service_days', 'phone_minutes', 'chat_price', 'phone_price', 'appoint_price', 'is_chat', 'is_phone', 'is_appoint', 'latitude', 'longitude', DB::raw($distance_field)])->whereIn('id', $docterIds3)->where('status', 1)->where('is_then', 1)->where('phone', '<>', '')->where('is_appoint', 1);
             if (!empty($req['name'])) {
                 $builder2->where(function ($query) use($name, $orgDocterIds) {

app/Models/Order.php

@@ -142,12 +142,14 @@ class Order extends BaseModel
         $docter = Docter::where('id', $order['docter_id'])->first();
         if ($order['product_type'] == 1) {
             $official_arr = [$user['openid'], $docter['name'], date('Y-m-d H:i:s'), round($order['payment_amount']/100, 2)];
-            $subscribe_arr = [$user['openid'], $user['nickname'], date('Y-m-d H:i:s'), config('config.product_type_map')[$order['product_type']], round($order['payment_amount']/100, 2)];
+            $product_type_text = config('config.product_type_map')[$order['product_type']];
+            $subscribe_arr = [$user['openid'], $product_type_text, $user['nickname'], date('Y-m-d H:i:s'), $product_type_text, round($order['payment_amount']/100, 2)];
             send_wechat_message(1, $official_arr, $subscribe_arr);
         }
         elseif ($order['product_type'] == 2) {
             $official_arr = [$user['openid'], $docter['name'], $orderPatient['name'], $orderPatient['symptoms'], date('Y-m-d H:i:s'), round($order['payment_amount']/100, 2)];
-            $subscribe_arr = [$user['openid'], $user['nickname'], date('Y-m-d H:i:s'), config('config.product_type_map')[$order['product_type']], round($order['payment_amount']/100, 2)];
+            $product_type_text = config('config.product_type_map')[$order['product_type']];
+            $subscribe_arr = [$user['openid'], $product_type_text, $user['nickname'], date('Y-m-d H:i:s'), $product_type_text, round($order['payment_amount']/100, 2)];
             send_wechat_message(2, $official_arr, $subscribe_arr);
         }
         elseif ($order['product_type'] == 3) {