From e7b64f27f2e5d183a5e0a408b6ee90b4f7ebe497 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 13 Oct 2020 11:28:41 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B1=87=E6=80=BB=E9=87=8D=E7=AE=97?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/AggregateFinanceStatement/lists.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html index f49220582..cd66af626 100644 --- a/Application/Admin/View/AggregateFinanceStatement/lists.html +++ b/Application/Admin/View/AggregateFinanceStatement/lists.html @@ -461,7 +461,7 @@ // return $(elem).val(); }).get().join(","); if(text == ''){ - layer.msg("" + '无需要进行重新结算的结算单,仅[未申请发票][申请开票][审批拒绝][汇总审批撤回]状态可以进行重新结算' + ""); + layer.msg("" + '无需要进行重新结算的结算单,仅[未汇总][申请开票][审批拒绝][汇总审批撤回]状态可以进行重新结算' + ""); return; } layer.confirm("重算结算金额会对结算单回退到未申请发票状态，请慎重处理，点击取消停止操作",{title:false}, function(index){ From 723b3c9fa2722a351ef7915b60ecd4ee856709a8 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 13 Oct 2020 11:30:23 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B1=87=E6=80=BB=E9=87=8D=E7=AE=97?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/AggregateFinanceStatement/lists.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html index cd66af626..a6fa2de84 100644 --- a/Application/Admin/View/AggregateFinanceStatement/lists.html +++ b/Application/Admin/View/AggregateFinanceStatement/lists.html @@ -464,7 +464,7 @@ layer.msg("" + '无需要进行重新结算的结算单,仅[未汇总][申请开票][审批拒绝][汇总审批撤回]状态可以进行重新结算' + ""); return; } - layer.confirm("重算结算金额会对结算单回退到未申请发票状态，请慎重处理，点击取消停止操作",{title:false}, function(index){ + layer.confirm("重算结算金额会对结算单回退到未汇总状态，请慎重处理，点击取消停止操作",{title:false}, function(index){ _doReceived(); layer.close(index); }); From 3f90e1d9ee722b08a5ddbef6c0a0c21597912842 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 13 Oct 2020 11:33:16 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E9=87=8D=E7=AE=97=E7=8A=B6=E6=80=81=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/AggregateFinanceStatement/lists.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html index a6fa2de84..2a63fc4a7 100644 --- a/Application/Admin/View/AggregateFinanceStatement/lists.html +++ b/Application/Admin/View/AggregateFinanceStatement/lists.html @@ -453,7 +453,7 @@ //重算金额 $("#updateStatement").on("click",function(){ var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { - if($(elem).data("status") == 0 || $(elem).data("status") == 1 || $(elem).data("status") == -1 || $(elem).data("status") == -3){ + if($(elem).data("status") == 0 || $(elem).data("status") == -1 || $(elem).data("status") == -3){ return $(elem).val(); }else{ flag = true; From d9b37792fd7bac84746bdd2b72de2a1130d2aceb Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 19 Oct 2020 10:49:30 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E8=A1=A5=E7=82=B9bug?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementController.class.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 4ce977248..27ad14703 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -1438,9 +1438,12 @@ class CompanyStatementController extends ThinkController if ($company_ids) { $inside = M("promote_company",'tab_')->field("company_name")->where(['id'=>['in',$company_ids],'is_inside'=>1])->select(); - $inside = implode(',',array_column($inside,'company_name')); + if ($inside) { - $this->ajaxReturn(['status'=>0,'msg'=>$inside.'为内部公司不能添加特殊补点']); + $inside = implode(',',array_column($inside,'company_name')); + $this->ajaxReturn(['status'=>0,'msg'=>$inside.'为内部公司不能添加特殊补点']); + + } } From 36c240c608e173c87ed7b1b3c18719cd5083ed09 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 19 Oct 2020 17:58:14 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/GameApiController.class.php | 17 ++++++++++++++-- .../Service/TestingResourceService.class.php | 20 +++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/GameApiController.class.php b/Application/Admin/Controller/GameApiController.class.php index 7bd30f474..e52bd0396 100644 --- a/Application/Admin/Controller/GameApiController.class.php +++ b/Application/Admin/Controller/GameApiController.class.php @@ -22,7 +22,13 @@ class GameApiController extends Think { public function verify() { $service = new TestingResourceService(); - $batches = M('testing_resource_batch', 'tab_')->where(['verify_status' => 0])->select(); + + $gameIds = $service->getHasItfGameIds(); + $map = ['verify_status' => 0]; + if (count($gameIds) > 0) { + $map['game_id'] = ['in', $gameIds]; + } + $batches = M('testing_resource_batch', 'tab_')->where($map)->select(); foreach ($batches as $batch) { $service->verify($batch); } @@ -31,7 +37,14 @@ class GameApiController extends Think { public function provide() { $service = new TestingResourceService(); - $batches = M('testing_resource_batch', 'tab_')->where(['verify_status' => 1, 'provide_status' => 0])->select(); + + $gameIds = $service->getHasItfGameIds(); + + $map = ['verify_status' => 1, 'provide_status' => 0]; + if (count($gameIds) > 0) { + $map['game_id'] = ['in', $gameIds]; + } + $batches = M('testing_resource_batch', 'tab_')->where($map)->select(); foreach ($batches as $batch) { $service->provide($batch); } diff --git a/Application/Base/Service/TestingResourceService.class.php b/Application/Base/Service/TestingResourceService.class.php index 15b33344e..bb9aea68a 100644 --- a/Application/Base/Service/TestingResourceService.class.php +++ b/Application/Base/Service/TestingResourceService.class.php @@ -555,4 +555,24 @@ class TestingResourceService } return $resources; } + + public function getHasItfGameIds() + { + $gameSettings = $this->repository->getGameSettings(); + $baseGameIds = []; + foreach ($gameSettings as $gameSetting) { + if ($gameSetting['has_itf'] == 1) { + $baseGameIds[] = $gameSetting['base_game_id']; + } + } + $baseGames = []; + if (count($baseGameIds) > 0) { + $baseGames = M('base_game', 'tab_')->where(['id' => ['in', $baseGameIds]])->select(); + } + if (empty($baseGames)) { + return []; + } else { + return array_merge(array_column($baseGames, 'android_game_id'), array_column($baseGames, 'ios_game_id')); + } + } } \ No newline at end of file From 65c5a221fc61457447c55e1501e99c1be92db1e9 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 21 Oct 2020 20:53:59 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/PaymentRuleService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/PaymentRuleService.class.php b/Application/Base/Service/PaymentRuleService.class.php index 5b1596275..e6412c5dd 100644 --- a/Application/Base/Service/PaymentRuleService.class.php +++ b/Application/Base/Service/PaymentRuleService.class.php @@ -70,7 +70,7 @@ class PaymentRuleService } if ($length == 1) { $first = $repeatRules[0]; - if ($startTime <= $first['start_time'] && $endTime >= $last['end_time']) { + if ($startTime <= $first['start_time'] && $endTime >= $first['end_time']) { M('payment_rule', 'tab_')->where(['id' => $first['id']])->delete(); } elseif ($endTime < $first['end_time'] && $startTime <= $first['start_time']) { M('payment_rule', 'tab_')->where(['id' => $first['id']])->save(['start_time' => $endTime + 1, 'update_time' => time()]); From fe55de4aaf28db39cd9713ad56d49bac06d8f8ac Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 21 Oct 2020 20:57:03 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/PaymentMerchantController.class.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Application/Admin/Controller/PaymentMerchantController.class.php b/Application/Admin/Controller/PaymentMerchantController.class.php index 5e89bcb4c..8ad732dad 100644 --- a/Application/Admin/Controller/PaymentMerchantController.class.php +++ b/Application/Admin/Controller/PaymentMerchantController.class.php @@ -675,6 +675,13 @@ class PaymentMerchantController extends ThinkController ]); } + if ($rule['start_time'] < strtotime(date('Y-m-d 23:59:59', time()))) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => '该记录不可删除，规则开始时间包含今天或今天之前的时间。' + ]); + } + M('payment_rule', 'tab_')->where(['id' => $id])->delete(); addOperationLog([ 'op_type' => 2, From dc5e032817316c35c6e585d094b4d848689265dd Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 22 Oct 2020 10:05:29 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/PaymentMerchantController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/PaymentMerchantController.class.php b/Application/Admin/Controller/PaymentMerchantController.class.php index 8ad732dad..0dfad5d2e 100644 --- a/Application/Admin/Controller/PaymentMerchantController.class.php +++ b/Application/Admin/Controller/PaymentMerchantController.class.php @@ -414,7 +414,7 @@ class PaymentMerchantController extends ThinkController $query = M('payment_rule', 'tab_')->where($conditions); $countQuery = clone $query; - $items = $query->order('id desc')->page($page, $row)->select(); + $items = $query->order('start_time desc')->page($page, $row)->select(); $count = $countQuery->count(); $gameTypes = $gameService->getGameTypes(null, 'id,type_name');