Merge branch 'hotfix/finance_game_name_change_2' of wmtx/platform into release

支付渠道统计bug修改

Application/Admin/Controller/PayChannelController.class.php

@@ -1377,18 +1377,31 @@ class PayChannelController extends ThinkController
 //                ->order('tab_spend.id DESC')
                 ->select(false);
 
-            if ($map['user_account']) {
-                $map['tab_deposit.user_account'] = $map['user_account'];
-            }
+//            if ($map['user_account']) {
+//                $map['tab_deposit.user_account'] = $map['user_account'];
+//            }
 
+            $map['user_account'] = $map['tab_spend.user_account'];
+            unset($map['tab_spend.user_account']);
 
             $coinMap = $map;
 
             $coinMap['tab_deposit.pay_status'] = 1;
             $coinMap['tab_deposit.pay_way'] = $map['pay_way'];
 
+
             unset($coinMap['pay_status']);
             unset($coinMap['pay_way']);
+            $coinMap['tab_deposit.user_account'] = $coinMap['user_account'];
+            unset($coinMap['user_account']);
+
+            if(!$coinMap['tab_deposit.user_account']) {
+                unset($coinMap['tab_deposit.user_account']);
+            }
+
+            if (!$map['user_account']) {
+                unset($map['user_account']);
+            }
 
             if($map['pay_time']) {
                 $coinMap['tab_deposit.create_time'] = $map['pay_time'];