From 4043cc04e675046588145312ec8320d29c8d9fd9 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Fri, 10 Jan 2020 11:47:19 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=BE=E7=BD=AE--?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=AF=E4=BB=98=E9=99=90=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/ToolController.class.php | 11 ++ Application/Admin/View/Tool/payset.html | 115 +++++++++++++++++- 2 files changed, 125 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/ToolController.class.php b/Application/Admin/Controller/ToolController.class.php index 638c75b80..c9aaa8419 100644 --- a/Application/Admin/Controller/ToolController.class.php +++ b/Application/Admin/Controller/ToolController.class.php @@ -16,6 +16,17 @@ class ToolController extends ThinkController { $config = I('config'); $data = array('config'=>json_encode($config),'template'=>$_POST['template'],'status'=>$_POST['status']); $map['name']=$name; + + $day_pay = $config['day_pay_limit']; + $month_pay = $config['month_pay_limit']; + if(!empty($day_pay) && !empty($month_pay)) { + if($month_pay / date('t') > $day_pay) { + $this->error('月支付限量较日支付限量过大'); + } elseif ($month_pay < $day_pay) { + $this->error('月支付限量不能小于日支付限量'); + } + } + if($_POST['status']==1&&$name=="weixin"){ $map_['name']=array("in",'wei_xin,wei_xin_app,weixin_gf'); M('tool','tab_')->where($map_)->setField('status','0'); diff --git a/Application/Admin/View/Tool/payset.html b/Application/Admin/View/Tool/payset.html index 6ce600f37..bd1b12822 100644 --- a/Application/Admin/View/Tool/payset.html +++ b/Application/Admin/View/Tool/payset.html @@ -215,6 +215,33 @@ 控制SDK内的支付宝支付方式，默认是APP支付，当选择WAP支付时，在SDK支付页面选择“支付宝”进行付款时，采用支付宝的WAP支付 + + + 日支付限量 + + + + + + 当额度达到限制额度时，隐藏支付方式 + + + + + + + + 月支付限量 + + + + + + 当额度达到限制额度时，隐藏支付方式 + + + + @@ -309,6 +336,36 @@ + + + + 日支付限量 + + + + + + 当额度达到限制额度时，隐藏支付方式 + + + + + + + + 月支付限量 + + + + + + 当额度达到限制额度时，隐藏支付方式 + + + + + + 启用状态 @@ -403,6 +460,8 @@ + + 启用状态 @@ -1253,7 +1312,33 @@ - + + + 日支付限量 + + + + + + 当额度达到限制额度时，隐藏支付方式 + + + + + + + + 月支付限量 + + + + + + 当额度达到限制额度时，隐藏支付方式 + + + + @@ -1345,6 +1430,34 @@ + + + 日支付限量 + + + + + + 当额度达到限制额度时，隐藏支付方式 + + + + + + + + 月支付限量 + + + + + + 当额度达到限制额度时，隐藏支付方式 + + + + + 启用状态 From e4854d4ac714071fbeb167cdc7967760ae80c709 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 18 Feb 2020 15:40:18 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=90=8D=E8=AF=8D=E5=86=99=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/FinancialSummaryController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/FinancialSummaryController.class.php b/Application/Admin/Controller/FinancialSummaryController.class.php index 381f8bc09..bd39dac4f 100644 --- a/Application/Admin/Controller/FinancialSummaryController.class.php +++ b/Application/Admin/Controller/FinancialSummaryController.class.php @@ -4,8 +4,8 @@ class FinancialSummaryController extends AdminController { public $keyname=array( "cash_spend"=>"现金充值收入", - "balance_coin_spend"=>"平台币充值收入", - "balance_coin_income"=>"平台币消耗", + "balance_coin_spend"=>"平台币消耗", + "balance_coin_income"=>"平台币充值收入", "game_supersign_income"=>"超级签购买收入", "test_user_income"=>"测试收入", "reward_count"=>"奖励", From 586dbf49e954ef864bd4b744569e06cf8be5f4ad Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Tue, 18 Feb 2020 15:46:17 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A5=96=E7=BD=9A?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=BF=94=E5=9B=9E=E5=87=BA=E7=8E=B0=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BABUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/StatementMangement/rewardManageSave.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/StatementMangement/rewardManageSave.html b/Application/Admin/View/StatementMangement/rewardManageSave.html index 7c86ec66b..d9fdcfe6f 100644 --- a/Application/Admin/View/StatementMangement/rewardManageSave.html +++ b/Application/Admin/View/StatementMangement/rewardManageSave.html @@ -149,7 +149,7 @@ - + From b3560b43455098c6b24de760ab1a3aa6b743a2df Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 18 Feb 2020 16:06:28 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/FinancialSummarySetController.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/FinancialSummarySetController.class.php b/Application/Admin/Controller/FinancialSummarySetController.class.php index 6d08cb495..2f49c500a 100644 --- a/Application/Admin/Controller/FinancialSummarySetController.class.php +++ b/Application/Admin/Controller/FinancialSummarySetController.class.php @@ -414,8 +414,8 @@ class FinancialSummarySetController extends \Think\Controller ") ->where($map) ->find(); - $moneyarry['wx'] += $dbres['wx_count']; - $moneyarry['gfzfb'] += $dbres['zfb_count']; + $moneyarry['wx'] += $dbres['wx_count']*100; + $moneyarry['gfzfb'] += $dbres['zfb_count']*100; } //玩家购买平台币 protected function getDepositPayWay(&$moneyarry) @@ -454,8 +454,8 @@ class FinancialSummarySetController extends \Think\Controller ") ->where($map) ->find(); - $moneyarry['wx'] += $dbres['wx_count']; - $moneyarry['gfzfb'] += $dbres['zfb_count']; + $moneyarry['wx'] += $dbres['wx_count']*100; + $moneyarry['gfzfb'] += $dbres['zfb_count']*100; } public function addDb() { From e55bfcb2d87454f8f3190dc8fef530bd2c5eee57 Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Tue, 18 Feb 2020 16:14:23 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=A5=96=E7=BD=9A=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E5=8F=AA=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StatementMangement/rewardManageSave.html | 160 +++++++++--------- 1 file changed, 83 insertions(+), 77 deletions(-) diff --git a/Application/Admin/View/StatementMangement/rewardManageSave.html b/Application/Admin/View/StatementMangement/rewardManageSave.html index d9fdcfe6f..43b9f5f22 100644 --- a/Application/Admin/View/StatementMangement/rewardManageSave.html +++ b/Application/Admin/View/StatementMangement/rewardManageSave.html @@ -25,7 +25,7 @@ @@ -62,22 +62,28 @@ charset="UTF-8">
+ class="form-horizontal form_info_ml" id="form">
奖惩编辑
  • - + +
  • - + +
  • @@ -93,22 +99,22 @@ $account):?>
    • @@ -153,72 +159,72 @@
- -
- -
- - -
- 已添加添加至常用设置 -
- + +
+ +
+ + +
+ 已添加添加至常用设置 +
+ \ No newline at end of file From e58bb1149fffc1d65e8ed9d618514d397d2be40b Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 18 Feb 2020 16:25:27 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=90=BD=E5=9C=B0?= =?UTF-8?q?=E9=A1=B5=E6=8E=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Base/Service/PromoteService.class.php | 2 +- .../Home/Controller/ApplyController.class.php | 41 +++++++++++++++++-- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index dc8be7cc6..6595b95ab 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -1015,7 +1015,7 @@ class PromoteService { if (!$record) { return false; } - if ($record['status'] != 1) { + if (!in_array($record['status'], [1, 2])) { return false; } } diff --git a/Application/Home/Controller/ApplyController.class.php b/Application/Home/Controller/ApplyController.class.php index ed99d068b..c7cf38695 100644 --- a/Application/Home/Controller/ApplyController.class.php +++ b/Application/Home/Controller/ApplyController.class.php @@ -132,6 +132,15 @@ class ApplyController extends BaseController } } break; + case 0: + $applyService = new ApplyService(); + $gameIdList = $applyService->getSociatyGameIds($loginPromote); + if (count($gameIdList) > 0) { + $gameIds = implode(',', $gameIdList); + $map['tab_game.id'] = ['in', $gameIds]; + } else { + $map = '1 = 2'; + } } $page = intval(I('get.p', 0)); @@ -615,8 +624,13 @@ class ApplyController extends BaseController $promoteId = $_REQUEST['promote_id']; } + $applyService = new ApplyService(); + $gameIdList = $applyService->getSociatyGameIds($loginPromote); + $applyMap['promote_id'] = $promoteId; $applyMap['offline_status'] = 0; + $applyMap['game_id'] = ['in', $gameIdList]; + $gameIds = M('Apply', 'tab_')->where($applyMap)->getField('game_id', true); $gameIds = implode(',', $gameIds); @@ -1795,7 +1809,7 @@ class ApplyController extends BaseController $promoteId = $promote['id']; } $apply = M('apply', 'tab_')->where(['promote_id' => $promoteId, 'game_id' => $gameId])->find(); - $game = M('game', 'tab_')->field(['icon'])->where(['id' => $gameId])->find(); + $game = M('game', 'tab_')->field(['id', 'icon', 'apply_auth'])->where(['id' => $gameId])->find(); if ($apply == null) { $this->ajaxReturn([ 'status' => 0, @@ -1805,6 +1819,16 @@ class ApplyController extends BaseController ]); } + $applyService = new ApplyService(); + if (!$applyService->checkSociatyPerm($promote, $game)) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => '该游戏未授权', + 'data' => [ + ] + ]); + } + $promoteService = new PromoteService(); if (!$promoteService->canPresidentApplyGame($promote)) { $this->ajaxReturn([ @@ -1817,7 +1841,6 @@ class ApplyController extends BaseController $icon = Request::getHost() . '/' . get_cover($game['icon'], 'path'); - $applyService = new ApplyService(); $result = $applyService->checkApplyStatus($apply); if (!$result['status']) { $this->ajaxReturn([ @@ -1847,7 +1870,8 @@ class ApplyController extends BaseController } $apply = M('apply', 'tab_')->where(['promote_id' => $promoteId, 'game_id' => $gameId])->find(); - $game = M('game', 'tab_')->field(['icon'])->where(['id' => $gameId])->find(); + $game = M('game', 'tab_')->field(['icon', 'apply_auth', 'id'])->where(['id' => $gameId])->find(); + if ($apply == null) { $this->ajaxReturn([ 'status' => 1, @@ -1857,6 +1881,16 @@ class ApplyController extends BaseController ]); } + $applyService = new ApplyService(); + if (!$applyService->checkSociatyPerm($promote, $game)) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => '该游戏未授权', + 'data' => [ + ] + ]); + } + $promoteService = new PromoteService(); if (!$promoteService->canPresidentApplyGame($promote)) { $this->ajaxReturn([ @@ -1869,7 +1903,6 @@ class ApplyController extends BaseController $icon = Request::getHost() . '/' . get_cover($game['icon'], 'path'); - $applyService = new ApplyService(); $result = $applyService->checkApplyStatus($apply); if (!$result['status']) { $this->ajaxReturn([ From c6a0f87dfeeb43e125562bf38795bbe038be7961 Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Tue, 18 Feb 2020 16:44:40 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=A5=96=E7=BD=9A=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E5=8F=AA=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/View/StatementMangement/rewardManageSave.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Admin/View/StatementMangement/rewardManageSave.html b/Application/Admin/View/StatementMangement/rewardManageSave.html index 43b9f5f22..885bb6c85 100644 --- a/Application/Admin/View/StatementMangement/rewardManageSave.html +++ b/Application/Admin/View/StatementMangement/rewardManageSave.html @@ -68,20 +68,20 @@
  • - + - disabled>
  • - + - disabled>