中奖记录

app/admin/controller/Award.php

@@ -42,7 +42,8 @@ class Award extends Controller
             $query->alias('l')
                 ->leftJoin('awards_order o', 'o.uid = l.uid')
                 ->leftJoin('awards_user_info u', 'l.uid = u.uid')
-                ->field(['o.id', 'l.uid', 'u.nickname', 'o.name', 'o.mobile', 'o.address', 'g.name as giftName', 'FROM_UNIXTIME(o.create_at) as createAt'])
+                ->leftJoin('awards_gift g', 'o.gift_id = g.id')
+                ->field(['l.id', 'l.uid', 'u.nickname', 'o.name', 'o.mobile', 'o.address', 'g.name as giftName', 'FROM_UNIXTIME(o.create_at) as createAt'])
                 ->distinct('l.uid')
                 ->order('l.number', 'desc')
                 ->order('l.duration', 'asc')->limit(50);

app/index/controller/Index.php

@@ -569,11 +569,11 @@ class Index extends Controller
      * @throws DataNotFoundException
      * @return mixed
      */
-    public function getAwards()
+    public function getAwardLog()
     {
         $awards = Db::table('awards_order')->alias('o')
             ->leftJoin('awards_gift g', 'o.gift_id = g.id')
-            ->field(['g.name as giftName', 'o.type', 'o.create_at'])
+            ->field(['g.name as giftName', 'o.type', 'o.create_at', 'o.gift_id'])
             ->select();
 
         $res = [];
@@ -583,8 +583,10 @@ class Index extends Controller
                 $type = '排名奖';
             }
             $res[] = [
+                'giftId' => $val['gift_id'],
                 'giftName' => $val['giftName'],
-                'type' => $type,
+                'typeLabel' => $type,
+                'type' => $val['type'],
                 'createAt' => date('y-m-d h:i:s', $val['create_at'])
             ];
         }