Merge branch 'zjl_self_refund_20190605'

app/Http/Controllers/OrderController.php

@@ -107,12 +107,11 @@ function getOperatorName($uid, $type)
     $name = '';
     $name = '';
 
 
     if ($type == 1) {
     if ($type == 1) {
-        $user = DB::connection('order')->table('lie_user_main')->where('user_id', $uid)->select('user_name')->first();
-
-        $name = !empty($user->user_name) ? $user->user_name : '客户';
+        // $user = DB::connection('order')->table('lie_user_main')->where('user_id', $uid)->select('user_name')->first();
+        // $name = !empty($user->user_name) ? $user->user_name : '客户';
+        $name = '客户';
     } else if ($type == 2)  {
     } else if ($type == 2)  {
         $user = DB::table('user_info')->where('userId', $uid)->select('name')->first();
         $user = DB::table('user_info')->where('userId', $uid)->select('name')->first();
-
         $name = isset($user->name) ? $user->name : '未知';
         $name = isset($user->name) ? $user->name : '未知';
     } else if ($type == 3) {
     } else if ($type == 3) {
         $name = '系统定时任务';
         $name = '系统定时任务';