diff --git a/Application/Admin/Controller/TestingResourceController.class.php b/Application/Admin/Controller/TestingResourceController.class.php
index c6baeacc9..cda26b748 100644
--- a/Application/Admin/Controller/TestingResourceController.class.php
+++ b/Application/Admin/Controller/TestingResourceController.class.php
@@ -301,6 +301,20 @@ class TestingResourceController extends ThinkController
$repository = new TestingResourceRepository();
$records = $repository->makeDailyCountData($dbdata);
+ if (!empty($isExport)) {
+ data2csv($records, '测试资源申请统计', [
+ 'create_day_time' => '申请日期',
+ 'role_name' => '角色名称',
+ 'game_name' => '游戏名称',
+ 'server_name' => '区服名称',
+ 'user_account' => '测试账号',
+ 'apply_username' => '申请人',
+ 'promote_account' => '所属推广员',
+ 'level_top_promote' => '所属会长',
+ 'apply_amount' => '总申请金额',
+ 'provide_amount' => '实发金额'
+ ]);
+ }
$pagination = set_pagination($count, $row);
$gameRepository = new GameRepository();
$gameId = $params['game_id'] ?? 0;
diff --git a/Application/Admin/View/TestingResource/dailyCount.html b/Application/Admin/View/TestingResource/dailyCount.html
index 0ecce584b..88df34a5f 100644
--- a/Application/Admin/View/TestingResource/dailyCount.html
+++ b/Application/Admin/View/TestingResource/dailyCount.html
@@ -157,6 +157,7 @@
测试账号 |
申请人 |
所属推广员 |
+ 所属会长 |
总申请金额 |
实发金额 |
操作 |
@@ -177,6 +178,7 @@
{$record.user_account} |
{$record.apply_username} |
{$record.promote_account} |
+ {$record.level_top_promote} |
{$record.apply_amount} |
{$record.provide_amount} |
@@ -191,8 +193,8 @@
-
+ 导出
{$_page|default=''}
diff --git a/Application/Base/Repository/TestingResourceRepository.class.php b/Application/Base/Repository/TestingResourceRepository.class.php
index 54fb1a003..97ad95a01 100644
--- a/Application/Base/Repository/TestingResourceRepository.class.php
+++ b/Application/Base/Repository/TestingResourceRepository.class.php
@@ -165,7 +165,7 @@ class TestingResourceRepository
$applyAdmins = index_by_column('id', $applyAdmins);
if (count($users) > 0) {
- $promotes = M('promote', 'tab_')->field(['id', 'account'])->where(['id' => ['in', array_column($users, 'promote_id')]])->select();
+ $promotes = M('promote', 'tab_')->field(['id', 'account', 'level1_id'])->where(['id' => ['in', array_column($users, 'promote_id')]])->select();
$promotes = index_by_column('id', $promotes);
}
$verifyAdminIds = array_column($batches, 'verify_admin_id');
@@ -236,6 +236,7 @@ class TestingResourceRepository
$promotes = $result['promotes'];
$verifyAdmins = $result['verifyAdmins'];
$applyAdmins = $result['applyAdmins'];
+ $levelTopPromotes = M('promote', 'tab_')->where(['id' => ['in', array_unique(array_column($promotes,'level1_id'))]])->getField('id,account',true);
//获取申请人
$records = [];
foreach ($items as $batch) {
@@ -244,6 +245,7 @@ class TestingResourceRepository
$user = $users[$batch['user_id']] ?? null;
$applyPromote = $applyPromotes[$batch['apply_promote_id']] ?? null;
$promote = $user && isset($promotes[$user['promote_id']]) ? $promotes[$user['promote_id']] : null;
+ $levelTopPromote = $promote && isset($levelTopPromotes[$promote['level1_id']]) ? $levelTopPromotes[$promote['level1_id']] : null;
$verifyAdmin = $verifyAdmins[$batch['verify_admin_id']] ?? null;
$applyAdmin = $applyAdmins[$batch['apply_admin_id']] ?? null;
$jumpParm = [
@@ -262,6 +264,7 @@ class TestingResourceRepository
'user_account' => $role ?$role['user_account'] : '--',
'apply_username' => $applyPromote ? $applyPromote['account'] . '[推广员]' : ($applyAdmin ? $applyAdmin['username'] . '[管理员]' : ''),
'promote_account' => $promote['account'],
+ 'level_top_promote'=>$levelTopPromote,
'apply_amount' => $batch['apply_amount'],
'provide_amount' => $batch['provide_amount'],
'jump_url'=>$jumpUrl
diff --git a/Application/Payment/Controller/PaymentController.class.php b/Application/Payment/Controller/PaymentController.class.php
index bd7294ee4..05b1d5812 100644
--- a/Application/Payment/Controller/PaymentController.class.php
+++ b/Application/Payment/Controller/PaymentController.class.php
@@ -368,7 +368,7 @@ class PaymentController extends BaseController
//获取自身
$remark = ($oldInfo['remark'] .'该打款由线上转为线下付款,原支付宝用户:'. $company_info['ali_user'].',支付宝账号为:'.$company_info['ali_account']);
//修改自身
- $res = M("company_statement_info","tab_")->where("id = {$id}")->save(['verify_status' => 2, 'pay_check' => 0, 'pay_check_member_id' => 0, 'pay_check_time' => 0, 'remark' => $remark]);
+ $res = M("company_statement_info","tab_")->where("id = {$id}")->save(['verify_status' => 2,'pay_status'=>0,'pay_time'=>0,'pay_info'=>'','pay_check' => 0, 'pay_check_member_id' => 0, 'pay_check_time' => 0, 'remark' => $remark]);
if(empty($res)){
$this->ajaxReturn(['status' =>0 ,'msg'=>'转换失败','data'=>[]]);
}
diff --git a/Application/Payment/View/Payment/lists.html b/Application/Payment/View/Payment/lists.html
index e55b532f0..dcdef7f79 100644
--- a/Application/Payment/View/Payment/lists.html
+++ b/Application/Payment/View/Payment/lists.html
@@ -283,11 +283,10 @@
更新打款信息
+
+
转线下打款
-
-
-
|