Merge pull request '2.28号功能提交' (#176) from feature/add_item into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/176

Application/Admin/Controller/CompanyStatementController.class.php

@@ -438,6 +438,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 {

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" => "导入成功"]);

Application/Admin/View/StatementMangement/addreward.html

@@ -211,7 +211,7 @@
     <script type="text/javascript" src="__STATIC__/layer3/layer.js"></script>
     <script type="text/javascript">
         //导航高亮
-        highlight_subnav('{:U('MarketPercentage/marketStaffSettle')}');
+        highlight_subnav('{:U('rewardManageList')}');
         var MSG={
             showmsg:function(str){
                 $("#creat_msg").show();