diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 72e6bee61..76b31514d 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -1019,10 +1019,8 @@ class FinanceController extends ThinkController 'pay_source' => 2, 'tab_deposit.pay_status' => 1, 'tab_deposit.pay_way' => ['gt', 0], - 'extend'=>['eq',''] - ,'tab_deposit.create_time'=>$time, + 'tab_deposit.create_time'=>$time, ])->field('tab_deposit.pay_way,"" as pay_type, SUM(tab_deposit.pay_amount) AS balance') - ->join("inner join tab_pay_info on tab_pay_info.order_id=tab_deposit.pay_order_number") ->group('tab_deposit.pay_way') ->select(); foreach ($deposit as $key => $value) { @@ -1076,7 +1074,7 @@ class FinanceController extends ThinkController $cashStatistics[$value['pay_way']]['pay_amount'] = '0.00'; $cashStatistics[$value['pay_way']]['balance'] = 0;//别表的平台币充值 } - $cashStatistics[$value['pay_way']]['pay_amount'] += $value['pay_amount'];//别表的平台币充值 + $cashStatistics[$value['pay_way']]['balance'] += $value['pay_amount'];//别表的平台币充值 } //推广后台 @@ -1101,7 +1099,7 @@ class FinanceController extends ThinkController $cashStatistics[$value['pay_way']]['pay_amount'] = '0.00'; $cashStatistics[$value['pay_way']]['balance'] = 0;//别表的平台币充值 } - $cashStatistics[$value['pay_way']]['pay_amount'] += $value['pay_amount'];//别表的平台币充值 + $cashStatistics[$value['pay_way']]['balance'] += $value['pay_amount'];//别表的平台币充值 } //官网充值 $offcialmap['pay_status'] = 1; @@ -1131,7 +1129,7 @@ class FinanceController extends ThinkController $cashStatistics[$value['pay_way']]['pay_amount'] = '0.00'; $cashStatistics[$value['pay_way']]['balance'] = 0;//别表的平台币充值 } - $cashStatistics[$value['pay_way']]['pay_amount'] += $value['pay_amount'];//别表的平台币充值 + $cashStatistics[$value['pay_way']]['balance'] += $value['pay_amount'];//别表的平台币充值 } foreach ($cashStatistics as $key => $value) { diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php index 842b87773..2faa1d9e2 100644 --- a/Application/Admin/Controller/GameController.class.php +++ b/Application/Admin/Controller/GameController.class.php @@ -298,6 +298,10 @@ class GameController extends ThinkController $this->error('一句话简介不能超过30个字！'); exit; } + + if ($_POST['beta_status'] == 1 && empty($_POST['beta_url'])) { + return $this->error("请在Beta按钮开启的情况填写Beta链接"); + } if (!empty($_POST['beta_url']) && !preg_match("/^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/i", $_POST['beta_url'])) { return $this->error("请填写正确的Beta链接"); } @@ -316,6 +320,7 @@ class GameController extends ThinkController $game = D(self::model_name);//M('$this->$model_name','tab_'); $_POST['discount'] == '' ? $_POST['discount'] = 10 : $_POST['discount']; $_POST['detail_content'] = $content; + $_POST['pay_config'] = json_encode($_POST['pay_config']); $res = $game->update(); $id = $res["id"]; $sibling = D("Game")->find($id); @@ -371,6 +376,7 @@ class GameController extends ThinkController } else { $id || $this->error('id不能为空'); $data = D(self::model_name)->detailback($id); + $data['pay_config'] = json_decode($data['pay_config'],true); $data || $this->error('数据不存在！'); if (!empty($data['and_dow_address'])) { $data['and_dow_address'] = ltrim($data['and_dow_address'], '.'); diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index 5396be178..0e704efb2 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -80,7 +80,6 @@ class PayChannelController extends ThinkController ->where($coinMap) ->sum('tab_deposit.pay_amount'); // var_dump($coinSum);die(); - $this->assign('coinSum',$coinSum); $data = array_merge($data,$coinData); $data = $this->unique_multi_array($data,'game_id'); @@ -251,9 +250,9 @@ class PayChannelController extends ThinkController } //汇总数据 - $sumData['pay_amount'] = $sumData['pay_amount'] + $superSignData['pay_amount'] + - $offcialData['pay_amount'] + $bindRechargeData['pay_amount'] + $spreadData['pay_amount']; - $sumData['platform_coin'] = $sumData['platform_coin'] - $sumData['test_platform_coin']; + $sumData['pay_amount'] = $sumData['pay_amount'] + $superSignData['pay_amount'] + $bindRechargeData['pay_amount']; + $sumData['platform_coin'] = $sumData['platform_coin'] - $sumData['test_platform_coin'] + + $offcialData['pay_amount'] + $spreadData['pay_amount']; $sumData['test_coin'] = $sumData['test_coin']+$offcialTestCost+$testSuperSignCost+$sumData['test_platform_coin']; $sumData['sum'] = $sumData['pay_amount'] +$sumData['test_coin'] + $sumData['platform_coin']; @@ -277,6 +276,8 @@ class PayChannelController extends ThinkController $payTypeDataExport['pay_amount'] .= $key.'：'.$value." "; } } + $payTypeDataExport['pay_amount'] .= "平台币直充金额(2019.12.18号以前的不显示在列表中，此项也不计入充值方式统计)：". + ($coinSum + $offcialData['pay_amount'] + $spreadData['pay_amount']+$offcialTestCost); $channelDataExport['game_name'] = '支付渠道'; foreach($channelData as $key => $value) { @@ -295,6 +296,8 @@ class PayChannelController extends ThinkController $this->meta_title = "支付渠道统计"; $size = $row;//每页显示的记录数 $data = array_slice($data, ($arraypage - 1) * $size, $size); + //平台币直充金额，下面列表 + $this->assign('coinSum',$coinSum + $offcialData['pay_amount'] + $spreadData['pay_amount']+$offcialTestCost); $this->assign('sumData',$sumData); $this->assign('channelData',$channelData); @@ -438,6 +441,9 @@ class PayChannelController extends ThinkController $coinMap['tab_deposit.pay_way'] =$spreadMap['pay_way']=$map['pay_way'] = array('egt',1); $offcialmap['pay_way'] = array('egt',1); if (!empty($_REQUEST['pay_way']) || $_REQUEST['pay_way']=='0') { + if ($_REQUEST['pay_way']=="2") { + $_REQUEST['pay_way'] = ['in', '2,3,4']; + } $map['pay_way'] = $_REQUEST['pay_way']; $coinMap['tab_deposit.pay_way'] = $_REQUEST['pay_way']; $spreadMap['pay_way'] = $_REQUEST['pay_way']; @@ -563,7 +569,11 @@ class PayChannelController extends ThinkController foreach ($sumData as $key => $value) { if ($value['pay_way']>=1) { - $sumAllData['pay_amount'] += $value['pay_amount']; + if($model == 'deposit'||$model == 'coin_pay_order') { + $sumAllData['platform_amount'] += $value['pay_amount']; + } else { + $sumAllData['pay_amount'] += $value['pay_amount']; + } } } @@ -769,7 +779,11 @@ class PayChannelController extends ThinkController foreach ($sumData as $key => $value) { if ($value['pay_way']>=1) { - $sumAllData['pay_amount'] += $value['pay_amount']; + if($model == 'deposit'||$model == 'coin_pay_order') { + $sumAllData['platform_amount'] += $value['pay_amount']; + } else { + $sumAllData['pay_amount'] += $value['pay_amount']; + } } } diff --git a/Application/Admin/Controller/RechargeSumController.class.php b/Application/Admin/Controller/RechargeSumController.class.php index 6c9946b7b..42571a658 100644 --- a/Application/Admin/Controller/RechargeSumController.class.php +++ b/Application/Admin/Controller/RechargeSumController.class.php @@ -64,7 +64,8 @@ class RechargeSumController extends ThinkController //当天注册人数 $registerNum = D('User')->where(array_merge($rmap, array('puid' => 0)))->join("tab_user_play on tab_user.id = tab_user_play.user_id and tab_user.fgame_id = tab_user_play.game_id", 'left')->field("tab_user.id")->select(); $registerNum = $registerNum ? array_column($registerNum, 'id') : []; - +// if ($key ==2) +// dd(D('User')->_sql()); //当天活跃人数 $livenNum = D('UserPlay')->where($map)->count("id"); diff --git a/Application/Admin/View/Finance/payTypeStatistics.html b/Application/Admin/View/Finance/payTypeStatistics.html index 2a15991a3..c32f57384 100644 --- a/Application/Admin/View/Finance/payTypeStatistics.html +++ b/Application/Admin/View/Finance/payTypeStatistics.html @@ -139,7 +139,7 @@ - {$data.pay_type}无 + 微信{$data.pay_type}无 {$data.pay_amount}无 {$data.balance}0 {$data.total}0 diff --git a/Application/Admin/View/Game/add.html b/Application/Admin/View/Game/add.html index aa8132628..1fc3cd195 100644 --- a/Application/Admin/View/Game/add.html +++ b/Application/Admin/View/Game/add.html @@ -220,7 +220,7 @@ 游戏ICON - + -->
@@ -249,7 +249,7 @@ 游戏素材包 - +
上传素材包
@@ -259,7 +259,7 @@
- + 此处可上传该游戏的素材包，必须为压缩包形式，用于渠道后台下载推广 @@ -267,7 +267,7 @@ 游戏推荐图 - + -->
@@ -296,7 +296,7 @@ 游戏截图 - @@ -407,18 +407,18 @@ - - 超级签Token： - - - - - - 超级签URL： - - - - + + 超级签Token： + + + + + + 超级签URL： + + + +
@@ -490,6 +490,39 @@ + + 支付宝 + + + + + + + + 微信 + + + + + + + + 快捷支付 + + + + + + 是否开启强更 @@ -612,7 +645,7 @@ 分享图标 - +
@@ -620,7 +653,7 @@
- + 512*512px @@ -629,7 +662,7 @@ 分享背景图片 - +
@@ -637,7 +670,7 @@
- + 720*1280px及以上 diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index a11cf4ce7..f35767f1f 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -226,17 +226,17 @@ 游戏ICON - + -->
@@ -257,7 +257,7 @@ 游戏素材包 - +
上传素材包
@@ -276,21 +276,21 @@
- + 此处可上传该游戏的素材包，必须为压缩包形式，用于渠道后台下载推广 游戏推荐图 - + @@ -308,7 +308,7 @@
- + 470*350px（用于官网首屏推荐游戏位展示） @@ -359,7 +359,7 @@ 落地页视频 - +
上传视频
@@ -379,7 +379,7 @@
- + 视频大小不能超过20M，支持格式：mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv,qlv @@ -554,18 +554,18 @@ - - 超级签Token： - - - - - - 超级签URL： - - - - + + 超级签Token： + + + + + + 超级签URL： + + + + 超级签状态： @@ -663,6 +663,39 @@ + + 支付宝 + + + + + + + + 微信 + + + + + + + + 快捷支付 + + + + + + 是否开启强更 @@ -786,7 +819,7 @@ 分享游戏图标 - +
@@ -794,7 +827,7 @@
- + 512*512px @@ -806,7 +839,7 @@ 分享背景图片 - +
diff --git a/Application/Admin/View/PayChannel/gameDetail.html b/Application/Admin/View/PayChannel/gameDetail.html index 1f7a8750f..a185fecf9 100644 --- a/Application/Admin/View/PayChannel/gameDetail.html +++ b/Application/Admin/View/PayChannel/gameDetail.html @@ -71,21 +71,29 @@
-
- + + + +
diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html index 3fde629f7..195d04db9 100644 --- a/Application/Admin/View/PayChannel/index.html +++ b/Application/Admin/View/PayChannel/index.html @@ -188,8 +188,8 @@ 官网 - {$offcialData['pay_amount']} - 0 + 0 + {$offcialData['pay_amount']} {$offcialData.test_coin}0 {$offcialData['sum']}0 @@ -198,8 +198,8 @@ 推广后台 - {$spreadData['pay_amount']}0 - 0 + 0 + {$spreadData['pay_amount']} 0 {$spreadData['sum']}0 diff --git a/Data/update.sql b/Data/update.sql index e4ba848f4..391c988f2 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -911,4 +911,8 @@ CREATE TABLE `tab_repair_pay` ( ALTER TABLE `tab_game` ADD COLUMN `beta_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Beta版状态'; ALTER TABLE `tab_game` -ADD COLUMN `beta_url` varchar(150) NOT NULL DEFAULT '' COMMENT 'Beta链接'; \ No newline at end of file +ADD COLUMN `beta_url` varchar(150) NOT NULL DEFAULT '' COMMENT 'Beta链接'; + +-- 游戏支付方式渠道配置 +ALTER TABLE `tab_game` +ADD COLUMN `pay_config` varchar(255) NOT NULL COMMENT '支付渠道 wx 微信 zfb 支付宝 quick 快捷 (gf 官方 sq 双乾'; \ No newline at end of file