Merge branch 'master' of http://47.76.126.2:3000/seven/bot-28

app/Http/Controllers/admin/LhcOrder.php

@@ -64,7 +64,7 @@ class LhcOrder extends Controller
                 $query = $query->where('number', $params['number']);
             }
             $count = $query->count();
-            $list = $query
+            $list = $query->with(['lottery'])
                 ->forPage($page, $limit)
                 ->orderByDesc('created_at')
                 ->get();

app/Models/LhcLottery.php

@@ -6,6 +6,11 @@ class LhcLottery extends BaseModel
     protected $table = 'lhc_lottery';
     protected $fillable = ['issue', 'open_code','open_time','is_settlement','next_open_time'];
 
+    protected function getOpenTimeAttribute($value): string
+    {
+        return $value ? date('Y-m-d H:i:s', $value) : '';
+    }
+
     protected function getNextOpenTimeAttribute($value): string
     {
         return $value ? date('Y-m-d H:i:s', $value) : '';

app/Models/LhcOrder.php

@@ -1,6 +1,6 @@
 <?php
 namespace App\Models;
-
+use App\Models\LhcLottery;
 class LhcOrder extends BaseModel
 {
     protected $table = 'lhc_order';
@@ -10,5 +10,10 @@ class LhcOrder extends BaseModel
     public $timestamps = true;
     protected $dateFormat = 'U'; // U 代表 UNIX 时间戳（int）
 
+    public function lottery()
+    {
+        return $this->belongsTo(LhcLottery::class, 'issue', 'issue')
+            ->select('issue', 'type', 'open_code', 'open_time', 'is_settlement');
+    }
  
 }