星科源

app/Service/U8ServerService.php

@@ -434,26 +434,33 @@ class U8ServerService extends Service
         return $list;
     }
 
-    private function fillDetail($list, $type, $login_type){
-        if(empty($list)) return $list;
+    private function fillDetail($list, $type, $login_type)
+    {
+        if (empty($list)) return $list;
 
-        $map = U8State::where('del_time', 0)
+        // 1. 从 U8State 表中查询 state 和 result
+        $u8Status = U8State::where('del_time', 0)
             ->where('type', $type)
             ->where('login_type', $login_type)
             ->where('order_number', $list['order_number'])
-            ->pluck('state', 'order_number')
-            ->toArray();
+            ->select('state', 'result') // 明确查询需要的字段
+            ->first();
 
-        if(isset($map[$list['order_number']])) {
-            $m = $map[$list['order_number']];
-            $state = $m;
-            $state_title = Record::state_name[$state];
-        }else{
+        // 2. 逻辑判断
+        if ($u8Status) {
+            $state = $u8Status->state;
+            $result = $u8Status->result; // 获取你想要的 result 字段
+            $state_title = Record::state_name[$state] ?? '';
+        } else {
             $state = Record::state_minus_one;
-            $state_title = Record::state_name[$state];
+            $result = ''; // 或者根据业务给个默认值，如 ''
+            $state_title = Record::state_name[$state] ?? '';
         }
+
+        // 3. 注入到 list 中
         $list['state'] = $state;
         $list['state_title'] = $state_title;
+        $list['result'] = $result; // 将 result 返回给前端或后续逻辑
 
         return $list;
     }