Merge branch 'master' of http://47.118.43.255:3000/jjhc/jucai

app/Admin/Controllers/Lottery/WinController.php

@@ -45,7 +45,7 @@ class WinController extends Controller
         $grid->id('ID');
         $grid->column('member.mobile', '手机号');
         $grid->column('member.email', '邮箱号');
-        $grid->column('prize.prize_name', '奖品名称');
+        $grid->column('prize_name', '奖品名称');
         $grid->created_at('中奖时间');
         $grid->out_at('核销时间');
         $grid->status('状态')->display(function () use ($status) {

app/Http/Controllers/Mobile/Lottery/LotteryController.php

@@ -172,9 +172,11 @@ class LotteryController extends MobileBaseController
             Session::put('prize_id', $rid);
             Session::save();
         } else {
+            $prize           = LotteryPrize::where('id', $rid)->first();
             $win             = new LotteryWin();
             $win->member_id  = $user->id;
             $win->prize_id   = $rid;
+            $win->prize_name = $prize->prize_name;
             $win->created_at = date('Y-m-d H:i:s');
             $win->save();
         }