From a9ce0585cc0d3549b04a531b3a65ddae3cb44d4d Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Sun, 26 Apr 2020 16:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/ExportController.class.php     |  5 ++
 .../TestResourceController.class.php          | 47 ++++++-----
 .../Admin/View/TestResource/index.html        |  2 +-
 .../View/TestResource/supportNumberList.html  | 79 +++++++++++++++++++
 4 files changed, 111 insertions(+), 22 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 53357ea5c..aeda732e5 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -1404,6 +1404,11 @@ class ExportController extends Controller
                     ->where($map)
                     ->order('id DESC')
                     ->select();
+                foreach ($xlsData as $key => $value) {
+                    checkEncryptionAuth($xlsData[$key]['user_account'],'provide_list');
+                }
+
+
                 $xlsCell = array(
                     array('pay_order_number', "订单号"),
                     array('user_account', "玩家账号"),
diff --git a/Application/Admin/Controller/TestResourceController.class.php b/Application/Admin/Controller/TestResourceController.class.php
index 9d641f429..77f8b8667 100644
--- a/Application/Admin/Controller/TestResourceController.class.php
+++ b/Application/Admin/Controller/TestResourceController.class.php
@@ -104,7 +104,7 @@ class TestResourceController extends ThinkController
 
       $page = set_pagination($count,$row);
       if($page) {$this->assign('_page', $page);}
-      $this->meta_title = '扶持号管理';
+      $this->meta_title = '资源管理';
       $this->assign('data',$data);
       $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
       $this->assign('show_data_power', $show_data_power);
@@ -120,34 +120,39 @@ class TestResourceController extends ThinkController
             $this->error('请选择资源后再进行操作');
         }
 
-        $resourceData = M('test_resource','tab_')
-            ->field("promote_id")
-            ->where(['id'=>['in',$id]])
-            ->select();
-
-        $resourceData = array_column($resourceData,'promote_id');
-
-        $promoteId = [];
+        if (!I('status','')&&I('status','')!='0') {
+            $this->error('请选择状态后在进行操作');
+        }
 
-        foreach ($resourceData as $key => $value) {
+//        $resourceData = M('test_resource','tab_')
+//            ->field("promote_id")
+//            ->where(['id'=>['in',$id]])
+//            ->select();
+//
+//        $resourceData = array_column($resourceData,'promote_id');
 
-            $promoteData = M('promote','tab_')
-                ->field('id')
-                ->where("chain like '%/{$value}/%' or id = {$value}")
-                ->select();
-            $promoteId = array_merge($promoteData, $promoteId);
-        }
+//        $promoteId = [];
+//
+//        foreach ($resourceData as $key => $value) {
+//
+//            $promoteData = M('promote','tab_')
+//                ->field('id')
+//                ->where("chain like '%/{$value}/%' or id = {$value}")
+//                ->select();
+//            $promoteId = array_merge($promoteData, $promoteId);
+//        }
 
-        $promoteId = implode(',',array_column($promoteId,'id'));
+//        $promoteId = array_unique($resourceData);
+//        var_dump($promoteId);die();
 
         $testResource = M('test_resource','tab_')
             ->field("user_id")
-            ->where(['promote_id'=>['in',$promoteId]])
+            ->where(['id'=>['in',$id]])
             ->group('user_id')
             ->select();
 
         $data = [
-            'lock_status' => 0
+            'lock_status' => I('status','')
         ];
 
         $user_id = implode(',',array_column($testResource,'user_id'));
@@ -156,11 +161,11 @@ class TestResourceController extends ThinkController
 
         if ($isFreeze) {
 
-            $this->success('冻结成功',U('index'));
+            $this->success('操作成功',U('supportNumberList'));
 
         } else {
 
-            $this->error('冻结失败',U('index'));
+            $this->error('操作失败',U('supportNumberList'));
 
         }
 
diff --git a/Application/Admin/View/TestResource/index.html b/Application/Admin/View/TestResource/index.html
index ca242a95f..cdc995013 100644
--- a/Application/Admin/View/TestResource/index.html
+++ b/Application/Admin/View/TestResource/index.html
@@ -110,7 +110,7 @@
 
                     <a class="fr" id="batch_add"><span class="button_icon button_icon9"></span>批量申请后续</a>
                     <a class="fr" href="{:U('add?model='.$model['id'])}"><span class="button_icon button_icon1"></span>新增测试账号</a>
-                    <a class="fr" id="batch_freeze"><span class="button_icon button_icon5 "></span>批量锁定</a>
+<!--                    <a class="fr" id="batch_freeze"><span class="button_icon button_icon5 "></span>批量锁定</a>-->
                 </empty>
             </div>
         </div>
diff --git a/Application/Admin/View/TestResource/supportNumberList.html b/Application/Admin/View/TestResource/supportNumberList.html
index 8999bc238..c4309060b 100644
--- a/Application/Admin/View/TestResource/supportNumberList.html
+++ b/Application/Admin/View/TestResource/supportNumberList.html
@@ -84,7 +84,20 @@
       <div class="input-list">
         <a class="sch-btn" href="javascript:;" id="search" url="{:U('TestResource/supportNumberList','model='.$model['name'] .'&row='.I('row'),false)}">搜索</a>
       </div>
+      <div class="input-list button_list" style="margin-left: 120px">
+        <div class="tools">
+          <empty name="show_status">
+
+            <a class="fr" id="batch_unfreeze"><span class="button_icon button_icon9"></span>批量开启</a>
+            <!--          <a class="fr" href="{:U('add?model='.$model['id'])}"><span class="button_icon button_icon1"></span>新增测试账号</a>-->
+            <a class="fl" id="batch_freeze"><span class="button_icon button_icon5 "></span>批量锁定</a>
+          </empty>
+        </div>
+      </div>
     </div>
+
+
+
   </div>
   <!-- 数据列表 -->
   <div class="data_list">
@@ -94,6 +107,9 @@
           <!-- 表头 -->
           <thead>
           <tr>
+            <th>
+              <input class="check-all" type="checkbox">
+            </th>
             <th>产品名称</th>
             <th>区服</th>
             <th>测试账号</th>
@@ -116,6 +132,7 @@
           <notemtpy name = "data">
             <volist name="data" id="s">
               <tr data-id="{$s.user_id}">
+                <td><input class="ids" type="checkbox" value="{$s['id']}" name="ids[]" ></td>
                 <td>{$s.game_name}</td>
                 <td>{$s.server_name}</td>
                 <td>{$s.user_account}</td>
@@ -204,6 +221,66 @@
         }
       })
 
+      $('#batch_freeze').click(function () {
+        var ids = $('.ids:checked');
+
+        if (ids.length > 0) {
+          var str = new Array();
+          ids.each(function () {
+            str.push($(this).val());
+          });
+          param = str.join(',');
+        } else {
+          layer.msg('请选择要操作的数据',{skin:'textColor'});
+          return false;
+        }
+        var url = "{:U('batchFreeze','','')}" + '/id/' + param + '/status/0';
+
+        layer.confirm('是否冻结选中推广员下的资源账号?', {
+          title:'冻结资源账号',
+          icon:3,
+          skin:'textColor',
+          btn: ['冻结','取消'] //按钮
+        }, function(){
+
+          window.location.href = url;
+
+        }, function(){
+          layer.close();
+        });
+
+      });
+
+      $('#batch_unfreeze').click(function () {
+        var ids = $('.ids:checked');
+
+        if (ids.length > 0) {
+          var str = new Array();
+          ids.each(function () {
+            str.push($(this).val());
+          });
+          param = str.join(',');
+        } else {
+          layer.msg('请选择要操作的数据',{skin:'textColor'});
+          return false;
+        }
+        var url = "{:U('batchFreeze','','')}" + '/id/' + param + '/status/1';
+
+        layer.confirm('是否冻结选中推广员下的资源账号?', {
+          title:'冻结资源账号',
+          icon:3,
+          skin:'textColor',
+          btn: ['冻结','取消'] //按钮
+        }, function(){
+
+          window.location.href = url;
+
+        }, function(){
+          layer.close();
+        });
+
+      });
+
       $('.unfroze-btn').on({
         click: function() {
           var id = $(this).parents('tr').eq(0).attr('data-id')
@@ -485,6 +562,8 @@
       window.location.href = url;
 
     });
+
+
   </script>
   <style>
     .textColor .layui-layer-content{color: #000000;}