Merge branch 'master' of ssh://git.usgamewin.com:22022/laoma/admin_api

app/Http/logic/admin/UserLogicController.php

@@ -11,8 +11,8 @@ class UserLogicController extends BaseLogicController
 {
     protected $switch = 1;  // 控制变化原因开关  1开启 -1关闭
 
-    protected $ids = [15, 39, 37, 33, 1, 46, 47, 48, 50, 53, 54, 21, 36, 42, 44, 45, 49, 51, 52, 58, 59, 70, 72];   // 总得变化原因
-    //全部彩金-- 21:绑定手机赠送 36:推广赚金(彩金) 42:邮件附件(彩金) 44:签到奖励 45:充值金额(彩金) 49:月卡(彩金) 51:首充礼包(彩金) 52:邮件附件（群发彩金）70:反水活动彩金
+    protected $ids = [13, 15, 39, 37, 33, 1, 46, 47, 48, 50, 53, 54, 21, 36, 42, 44, 45, 49, 51, 52, 58, 59, 70, 72, 90];   // 总得变化原因
+    //全部彩金-- 13: 救济金 21:绑定手机赠送 36:推广赚金(彩金) 42:邮件附件(彩金) 44:签到奖励 45:充值金额(彩金) 49:月卡(彩金) 51:首充礼包(彩金) 52:邮件附件（群发彩金）70:反水活动彩金, 90 superball奖金
     protected $LotteryMoney = [21, 33, 36, 37, 42, 44, 45, 49, 51, 52, 59, 70, 72];
 
     public function scoreChange($start_time, $end_time, $describe, $UserID, $ChangeScoreMin, $ChangeScoreMax, $ChangeScoreSort)
@@ -82,7 +82,7 @@ class UserLogicController extends BaseLogicController
             ->join('QPRecordDB.dbo.YN_RecordScoreConfig as sc', 'sc.Reason', '=', 'si.Reason')
             ->join('QPAccountsDB.dbo.AccountsInfo as ai', 'si.UserID', '=', 'ai.UserID')
             //->leftJoin('QPPlatformDB.dbo.GameRoomInfo as gi', 'gi.ServerID', 'si.ServerID')
-            ->select('si.UserID', 'ai.GameID', 'si.BeforeScore', 'si.ChangeScore', 'si.AfterScore', 'si.UpdateTime', 'sc.Describe')
+            ->select('si.UserID', 'ai.GameID', 'si.BeforeScore', 'si.ChangeScore', 'si.AfterScore', 'si.UpdateTime', 'si.Reason', 'sc.Describe')
             ->where($where)
             ->orderByRaw($sort)
             ->paginate(10);

resources/views/admin/user/score_change.blade.php

@@ -97,6 +97,9 @@
                                 </tr>
                                 </thead>
                                 <tbody>
+                                @php
+                                    $reasonMap = [13=>'救济金',21=>'绑定手机赠送',36=>'推广赚金(彩金)',42=>'邮件附件(彩金)',44=>'签到奖励',45=>'充值金额(彩金)',49=>'月卡(彩金)',51=>'首充礼包(彩金)',52=>'邮件附件（群发彩金）',70=>'反水活动彩金',90=>'superball奖金'];
+                                @endphp
                                 @foreach($list as $k=>$v)
                                     <tr>
                                         <td style="width: 13%">
@@ -107,7 +110,7 @@
                                         </td>
                                         <td style="width: 13%">{{ $v->UpdateTime }}</td>
                                         <td style="width: 10%">
-                                            {{ $v->Describe}} <br>
+                                            {{$v->Reason}} {{ $reasonMap[$v->Reason] ?? '' }} <br>
                                             {{$v->ServerName}}
                                         </td>