From 016c2e11bd56fe56f4fa194297ffcee61d1d9794 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Sat, 27 Feb 2021 17:49:55 +0800 Subject: [PATCH] =?UTF-8?q?2.28=E5=8F=B7=E5=8A=9F=E8=83=BD=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementController.class.php | 6 ++++++ .../StatementMangementController.class.php | 11 +++++------ .../View/StatementMangement/addreward.html | 2 +- Public/Admin/excel/rewardOrfina.xlsx | Bin 15679 -> 10024 bytes 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 498f391d4..920fd2bc1 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -432,6 +432,12 @@ class CompanyStatementController extends ThinkController ->group("company_type,withdraw_type") ->select(); + foreach ($count as $key => $value) { + if ($value["company_belong"]==9) { + $this->ajaxReturn(["status"=>0,"msg"=>""]); + } + } + if (count($count)>1) { $this->ajaxReturn(["status"=>0,"msg"=>""]); } else { diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php index a7b96b79a..98870cf6f 100644 --- a/Application/Admin/Controller/StatementMangementController.class.php +++ b/Application/Admin/Controller/StatementMangementController.class.php @@ -791,6 +791,7 @@ class StatementMangementController extends ThinkController $record = []; $detail = []; $md5 = ''; + dump($checkarr); foreach ($checkarr as $k => $v) { if ($v['game_name']) { @@ -803,9 +804,9 @@ class StatementMangementController extends ThinkController $record["relation_game_id"] = $game_data["relation_game_id"]?$game_data["relation_game_id"]:0; $record["content"] = $v["content"]; - $record["reward_time"] = strtotime(gmdate("Y-m-d", \PHPExcel_Shared_Date::ExcelToPHP($v["reward_time"]))); - $record["confirm_time"] = strtotime(gmdate("Y-m-d", \PHPExcel_Shared_Date::ExcelToPHP($v["confirm_time"]))); - $record["settlement_time"] = strtotime(gmdate("Y-m-d", \PHPExcel_Shared_Date::ExcelToPHP($v["settlement_time"]))); + $record["reward_time"] = strtotime($v["reward_time"]); + $record["confirm_time"] = strtotime($v["confirm_time"]); + $record["settlement_time"] = strtotime($v["settlement_time"]); $record["create_time"] = time(); $record["creater_id"] = $_SESSION['onethink_admin']['user_auth']['uid']; @@ -880,17 +881,15 @@ class StatementMangementController extends ThinkController } } -// dump($all_record); +// die(); foreach ($all_record as $key => $value) { $insert_id = SM("reward_record","tab_")->add($value); - foreach ($all_detail[$key] as $k => $v) { $all_detail[$key][$k]['record_id'] = $insert_id; } $is_success = SM("reward_detail","tab_")->addAll($all_detail[$key]); - } $this->ajaxReturn(["status" => 1, "msg" => "导入成功"]); diff --git a/Application/Admin/View/StatementMangement/addreward.html b/Application/Admin/View/StatementMangement/addreward.html index 19c35b751..928ef7419 100644 --- a/Application/Admin/View/StatementMangement/addreward.html +++ b/Application/Admin/View/StatementMangement/addreward.html @@ -211,7 +211,7 @@