From e5b6af3771d40e67958b63bdd7873ecf652c14bf Mon Sep 17 00:00:00 2001 From: tping Date: Wed, 3 Feb 2021 12:09:56 +0800 Subject: [PATCH 1/6] 1 --- .../Home/Controller/DownloadController.class.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 761c20785..3bec61a7b 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1481,19 +1481,19 @@ class DownloadController extends BaseController - if (!empty(I('begtime')) && empty(I('endtime'))) { + if (!empty(I('begtime')) && empty(I('endtime'))) { $map['tab_spend.spend_time'] = ['egt', strtotime(I('begtime'))]; } elseif (empty(I('begtime')) && !empty(I('endtime'))) { $map['tab_spend.spend_time'] = ['elt', strtotime(I('endtime')) + 86399]; } elseif (!empty(I('begtime')) && !empty(I('endtime'))) { $map['tab_spend.spend_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]]; }else { - $nowTime = date('Y-m-d'); - $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); - $initEndTime = date('Y-m-d'); - $initBegTime = strtotime($initBegTime); - $initEndTime = strtotime($initEndTime); - $map['tab_spend.spend_time'] = ['between',[$initBegTime,$initEndTime]]; +// $nowTime = date('Y-m-d'); +// $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); +// $initEndTime = date('Y-m-d'); +// $initBegTime = strtotime($initBegTime); +// $initEndTime = strtotime($initEndTime); +// $map['tab_spend.spend_time'] = ['between',[$initBegTime,$initEndTime]]; } if ($payedBegTime) { From 792508bd64a0f656e6743f5c980ddaf6eec9d02e Mon Sep 17 00:00:00 2001 From: tping Date: Wed, 3 Feb 2021 12:12:35 +0800 Subject: [PATCH 2/6] 1 --- Application/Home/Controller/QueryController.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 16993ad90..99937ace3 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -241,6 +241,8 @@ class QueryController extends BaseController $parameter['row'] = $row; $parameter['begtime'] = $initBegTime; $parameter['endtime'] = $initEndTime; + $parameter['payed_begtime'] = I("payed_begtime", ''); + $parameter['payed_endtime'] = I("payed_endtime", ''); $parameter['relation_game_id'] = $relationGameId; $parameter['sdk_version'] = $sdkVersion; $parameter['server_id'] = $serverId; From f3efd97a19b853376f951282ff7c7dc7ff0c9457 Mon Sep 17 00:00:00 2001 From: tping Date: Wed, 3 Feb 2021 12:32:46 +0800 Subject: [PATCH 3/6] 1 --- Application/Home/View/default/Query/recharge.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index 05b9e23fe..587322d0e 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -432,15 +432,28 @@ layer.msg('到账时间间隔不能超过31天，请重新选择日期'); return false; } + + if (sdate && !edate) { + layer.msg('下单结束时间不能为空'); + return false; + } + if (!sdate && edate) { + layer.msg('下单开始时间不能为空'); + return false; + } + if (payed_sdate && !payed_edate) { layer.msg('到账结束时间不能为空'); + return false; } if (!payed_sdate && payed_edate) { layer.msg('到账开始时间不能为空'); + return false; } if (!edate && !sdate && !payed_sdate && !payed_edate) { layer.msg('时间不能为空'); + return false; } var url = $(this).attr('url'); From 4e5f6a664d3d5ddbfa7a907d6b6f0924bbc2e8b6 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 3 Feb 2021 16:43:59 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Payment/Controller/PaymentController.class.php | 2 +- Application/Payment/View/Payment/lists.html | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Application/Payment/Controller/PaymentController.class.php b/Application/Payment/Controller/PaymentController.class.php index 08f953372..3dbbaabb9 100644 --- a/Application/Payment/Controller/PaymentController.class.php +++ b/Application/Payment/Controller/PaymentController.class.php @@ -358,7 +358,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 0c278d2b7..4612c7283 100644 --- a/Application/Payment/View/Payment/lists.html +++ b/Application/Payment/View/Payment/lists.html @@ -282,11 +282,10 @@ 更新打款信息 + + 转线下打款 - - - From 290b48dc3b262a2496b8f334716ec091962a0412 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 3 Feb 2021 18:18:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/TestingResourceController.class.php | 14 ++++++++++++++ .../Admin/View/TestingResource/dailyCount.html | 6 ++++-- .../Repository/TestingResourceRepository.class.php | 5 ++++- 3 files changed, 22 insertions(+), 3 deletions(-) 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 From d7a787c0fcfbfbeed3bc42d38d3cd0ecdb0b3009 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 3 Feb 2021 18:26:34 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=80=E5=B1=9E?= =?UTF-8?q?=E4=BC=9A=E9=95=BF=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Base/Repository/TestingResourceRepository.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Application/Base/Repository/TestingResourceRepository.class.php b/Application/Base/Repository/TestingResourceRepository.class.php index 97ad95a01..a75ee3424 100644 --- a/Application/Base/Repository/TestingResourceRepository.class.php +++ b/Application/Base/Repository/TestingResourceRepository.class.php @@ -236,7 +236,11 @@ 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); + if(!empty($promotes)){ + $levelTopPromotes = M('promote', 'tab_')->where(['id' => ['in', array_unique(array_column($promotes,'level1_id'))]])->getField('id,account',true); + }else{ + $levelTopPromotes = []; + } //获取申请人 $records = []; foreach ($items as $batch) {