Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Admin/Controller/ExportController.class.php

@@ -49,10 +49,9 @@ class ExportController extends Controller
     //导出Excel
     function expUser($id)
     {
-                $xlsName = $_REQUEST['xlsname'];
+        $xlsName = $_REQUEST['xlsname'];
         switch ($id) {
             case 1:
-
                 $xlsCell = array(
                     array('user_account', "玩家账号"),
                     array('game_name', "游戏名称"),
@@ -861,10 +860,11 @@ class ExportController extends Controller
                     $map['spend_ip'] = array('like', '%' . trim($_REQUEST['spend_ip']) . '%');
                     unset($_REQUEST['spend_ip']);
                 }
-                if (isset($_REQUEST['time-start']) && isset($_REQUEST['time-end'])) {
+
-                    $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['time-start']), strtotime($_REQUEST['time-end']) + 24 * 60 * 60 - 1));
+                if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) {
-                    unset($_REQUEST['time-start']);
+                    $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 24 * 60 * 60 - 1));
-                    unset($_REQUEST['time-end']);
+                    unset($_REQUEST['timestart']);
+                    unset($_REQUEST['timeend']);
                 }
                 if (isset($_REQUEST['start']) && isset($_REQUEST['end'])) {
                     $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['start']), strtotime($_REQUEST['end']) + 24 * 60 * 60 - 1));

Application/Admin/Controller/MendController.class.php

@@ -81,6 +81,8 @@ class MendController extends ThinkController {
                 "order_time"=>$create['order_time'],
                 "type"=>2,
                 "shift_ids"=>[$create['user_id']],
+                "creator_type"=>0,
+                "creator_id"=>$_SESSION["onethink_admin"]["user_auth"]["uid"]
             );
             if(!empty($create['remark'])){
                 $params['remark'] = $create['remark'];
@@ -111,13 +113,16 @@ class MendController extends ThinkController {
     {
         $id  = I('id');
         $info = M("shift_task")->where("id = {$id} and status = 0")->find();
+        
         if(empty($info)){
             $this->error("补链不存在或已处理");
         }
         
 
         $info['user_id'] = json_decode($info['shift_ids'])[0]; 
-        $info['order_time'] = date("Y-m-d",$info['order_time']); 
+        $info['order_time'] = date("Y-m-d",$info['order_time']);
+        $userid = $info['user_id'];
+        $info['account'] = M("User","tab_")->field("account")->where("id = '{$userid}'")->find()['account'];
         $this->assign('data',$info);
         $this->display();
     }

Application/Admin/View/Mend/lists.html

@@ -107,6 +107,7 @@
                         <th>补链前渠道</th>
                         <th>补链后渠道</th>
                         <th style="width: 450px;">备注</th>
+                        <th>切分时间</th>
                         <th>补链时间</th>
                         <th>操作人员</th>
                     </tr>
@@ -126,6 +127,7 @@
                             <td class="js-pop" >
                                 <a href="javascript:" title="点击查看" class="remarkView" info="{$data['remark']}">{:get_title($data['remark'])}</a>
                             </td>
+                            <td>{$data.order_time|date='Y-m-d H:i:s',###}</td>
                             <td>{$data.create_time|date='Y-m-d H:i:s',###}</td>
                             <td>{$data.op_account}</td>
                         </tr>

Application/Admin/View/Mend/shiftInfo.html

@@ -57,7 +57,7 @@
             <tr>
                 <td class="l noticeinfo">用户账号</td>
                 <td class="r table_radio">
-                    <input name="account" value="{:get_promote_name($data['promote_id'])}" disabled readonly type="text" class="">
+                    <input name="account" value="{$data['account']}" disabled readonly type="text" class="">
                 </td>
             </tr>
             <tr>
@@ -82,13 +82,13 @@
                 </td>
             </tr>
 
-            <tr>
+            <!-- <tr>
                 <td class="l noticeinfo">换绑类型</td>
                 <td class="r table_radio">
                     <input name="bind_type" value="1" type="radio">In
                     <input name="bind_type" value="2" type="radio">Out
                 </td>
-            </tr>
+            </tr> -->
 
             <tr>
                 <td class="l noticeinfo">备注</td>

Application/Admin/View/Spend/lists.html

@@ -230,13 +230,16 @@
 
 
                     <td>汇总</td>
-                    <td colspan="99">
+                    <td colspan="6">
                         当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
                         今日充值：{$ttotal}
                         昨日充值：{$ytotal}
                         累计充值：{$total}（此处只汇总充值成功的订单）
                     </td>
-                    <td></td>
+                    <td colspan="99" style="color: #a9a9a9;">
+                        今日充值：今日平台所有推广员的累计充值（包括官方渠道）/
+                        昨日充值：昨日平台所有推广员的累计充值（包括官方渠道）
+                    </td>
                 </tr>
                 </tbody>
             </table>

Application/Base/Service/PromoteService.class.php

@@ -92,7 +92,9 @@ class PromoteService {
         $balanceCoinMode = isset($params['balance_coin_mode']) ? $params['balance_coin_mode'] : 0;
         $type = isset($params['type']) ? $params['type'] : 0;
         $shiftIds = isset($params['shift_ids']) && $params['shift_ids'] ? $params['shift_ids'] : [];
-        $createPromoteId = empty(session('promote_auth.pid')) ? 0 : session('promote_auth.pid');
+        $creatorId = isset($params['creator_id']) ? $params['creator_id'] : 0;
+        $creatorType = isset($params['creator_type']) ? $params['creator_type'] : 0;
+        $remark = isset($params['remark']) ? $params['remark'] : '';
 
         if ($fromPromoteId == $toPromoteId) {
             return [
@@ -140,9 +142,11 @@ class PromoteService {
             'order_time' => strtotime($orderTime),
             'balance_coin_mode' => $balanceCoinMode,
             'create_time' => time(),
-            'create_promote_id' => $createPromoteId,
+            'creator_id' => $creatorId,
+            'creator_type' => $creatorType,
             'status' => 0,
             'type' => $type,
+            'remark' => $remark,
             'shift_ids' => json_encode($shiftIds)
         ];
 
@@ -299,9 +303,19 @@ class PromoteService {
     {
         $toPromoteId = $task['to_promote_id'];
         $fromPromoteId = $task['from_promote_id'];
+        $orderTime = $task['order_time'];
         $shiftIds = json_decode($task['shift_ids'], true) ?? [];
+        $remark = $task['remark'] ?? '';
 
-        $createPromote = M('promote', 'tab_')->where(['create_promote_id' => $task['create_promote_id']])->find();
+        $creator = null;
+        $opAccount = '';
+        if ($task['creator_type'] == 1) {
+            $creator = M('promote', 'tab_')->where(['id' => $task['creator_id']])->find();
+            $opAccount = $creator ? $creator['account'] : '';
+        } else {
+            $creator = M('ucenter_member', 'sys_')->where(['id' => $task['creator_id']])->find();
+            $opAccount = $creator ? $creator['username'] : '';
+        }
 
         $toPromote = M('promote', 'tab_')->where(['id' => $toPromoteId])->find();
         $fromPromote = M('promote', 'tab_')->where(['id' => $fromPromoteId])->find();
@@ -332,11 +346,12 @@ class PromoteService {
                 'promote_account' => $fromPromote['account'],
                 'promote_id_to' => $toPromote['id'],
                 'promote_account_to' => $toPromote['account'],
-                'remark' => '玩家迁移',
+                'remark' => $remark == '' ? ($task['creator_type'] == 0 ? '后台补链' : '玩家迁移') : $remark,
+                'order_time' => $orderTime,
                 'create_time' => time(),
-                'op_id' => $createPromote ? $createPromote['id'] : 0,
+                'op_id' => $creator ? $creator['id'] : 0,
-                'op_account' => $createPromote ? $createPromote['account'] : '',
+                'op_account' => $opAccount,
-                'op_type' => 1,
+                'op_type' => $task['creator_type'],
                 'bind_type' => 1,
             ];
         }
@@ -370,9 +385,15 @@ class PromoteService {
         M('user_play', 'tab_')->where($otherMap)->save($updateData);
         M('user_play_info', 'tab_')->where($otherMap)->save($updateData);
         
-        M('spend', 'tab_')->where($otherMap)->where(['is_check' => ['in','1,2']])->save($updateData); // 只改未对账的数据
+        $orderMap1 = $otherMap;
-        M('deposit', 'tab_')->where($otherMap)->save($updateData);
+        $orderMap1['pay_time'] = ['egt', $orderTime];
-        M('bind_spend', 'tab_')->where($otherMap)->save($updateData);
+        M('spend', 'tab_')->where($orderMap1)->where(['is_check' => ['in','1,2']])->save($updateData); // 只改未对账的数据
+        M('bind_spend', 'tab_')->where($orderMap1)->save($updateData);
+
+        $orderMap2 = $otherMap;
+        $orderMap2['create_time'] = ['egt', $orderTime];
+        M('deposit', 'tab_')->where($orderMap2)->save($updateData);
+        M('user_play_data_count', 'tab_')->where($orderMap2)->save(['promote_id' => $toPromote['id']]);
 
         $status = M('shift_task', 'sys_')->where('id=' . $task['id'])->save(['status' => 1, 'handle_time' => time()]);
         if (!$status) {

Application/Home/Controller/DownloadController.class.php

@@ -1767,12 +1767,12 @@ class DownloadController extends BaseController {
         $model = M('user','tab_');
         
         $data = $model->field('account,device_number,promote_account,register_time,register_ip,login_time,login_ip')->where($map)->order('tab_user.id desc')->select();
-        //var_dump($data);
         $xlsData = [];
         foreach ($data as $key1 => $value1) {
            $value1['register_time'] = date("Y-m-d H:i:s",$value1['register_time']);
            $value1['login_time'] = date("Y-m-d H:i:s",$value1['login_time']);
            $value1['account'] = $this->encryption($value1['account']); 
+           $value1['device_number'] = $this->encryption($value1['device_number']);
            $xlsData[] = $value1;
         }
         $this->exportExcel($xlsName, $xlsCell, $xlsData,$id);

Application/Home/Controller/PromoteController.class.php

@@ -1935,8 +1935,12 @@ class PromoteController extends BaseController
 
     public function shift()
     {
+        $loginPromote = $this->getLoginPromote();
+        $params = $_POST;
+        $params['creator_id'] = $loginPromote['id'];
+        $params['creator_type'] = 1;
         $promoteService = new PromoteService();
-        $result = $promoteService->addShiftTask($_POST);
+        $result = $promoteService->addShiftTask($params);
         $this->ajaxReturn($result);
     }
 

Application/Home/Controller/QueryController.class.php

@@ -20,11 +20,6 @@ class QueryController extends BaseController
         0 => '平台币',
         1 => '支付宝',
         2 => '微信',
-        5 => '聚宝云',
-        6 => '竣付通',
-        7 => '苹果支付',
-        8 => '金猪支付',
-        9 => '双乾支付',
     ];
 
     public function recharge($p = 0)
@@ -258,6 +253,10 @@ class QueryController extends BaseController
                 $list['new_login_time'] = date('Y-m-d H:i:s', $newLoginData['login_time']);
                 $list['new_login_ip'] = $newLoginData['login_ip'];
                 $list['account'] = substr($list['account'], 0, 2) . '******' . substr($list['account'], 8);
+                if(!empty($list['device_number'])) {
+                     $list['device_number'] = encryption($list['device_number']);
+                }
+                
             }
         }
 
@@ -1720,7 +1719,7 @@ class QueryController extends BaseController
         $sortName = trim(I('sort_name', ''));
         $sort = intval(I('sort', 1));
         $sortNameData = ['recharge_cost', 'recharge_count', 'recharge_cost_today', 'unlogin_day'];
-        $nowTime = date('Y-m-d');
+        $nowTime = date('Y-m-d', time() - 3600 * 24);
         $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
         $initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
         $initEndTime = $nowTime;
@@ -1843,6 +1842,7 @@ class QueryController extends BaseController
         $this->assign('initBegTime', $initBegTime);
         $this->assign('initEndTime', $initEndTime);
         $this->assign('sort', $sort);
+        $this->assign('setdate', $nowTime);
         $this->display('userRecharges');
     }
 

Application/Home/View/default/Query/userRecharges.html

@@ -31,6 +31,7 @@
       </div>
       <img src="__IMG__/20180207/icon_normal_game.png">
       <span class="title_main">玩家充值</span>
+      <span class="details">说明：充值数据不包含当日</span>
     </div>
     <div class="trunk-content article">
         <div class="trunk-search clearfix jssearch">

Application/Media/Controller/RechargeController.class.php

@@ -98,15 +98,15 @@ class RechargeController extends BaseController
             case 'alipay':
                 //判断是否开启支付宝充值
                 if (pay_set_status('alipay') == 0) {
-                    $this->error("网站未启用支付宝充值", '', 1);
+//                    $this->error("网站未启用支付宝充值", '', 1);
-                    exit();
+//                    exit();
                 }
                 echo $pay->buildRequestForm($vo);
                 break;
             case 'weixin':
                 if (pay_set_status('wei_xin') == 0 && pay_set_status('weixin') == 0&&pay_set_status('weixin_gf')==0 ) {
-                    $this->error("网站未启用微信充值", '', 1);
+//                    $this->error("网站未启用微信充值", '', 1);
-                    exit();
+//                    exit();
                 }
                 if (get_wx_type() == 0) {//微信官方
                     $data['pay_order_number'] = $data['order_no'];

Application/Media/View/default/Index/business.html

@@ -32,7 +32,7 @@
             </div>
             <div class="have_product">
                 <ul >
-                    <volist name="recommend" id="rec" offset="0" length="1">
+                    <volist name="recommend" id="rec">
                     <li>
                         <img src="{:get_cover($rec['cover'],'path')}" onerror="this.src='__IMG__/empty.jpg';this.onerror=null"/>
                         <div class="have_product_box">
@@ -42,6 +42,7 @@
                         </div>
                     </li>
                     </volist>
+
                 </ul>
             </div>
         </div>

Application/Media/View/default/Recharge/pay.html

@@ -136,20 +136,25 @@
         <div class="way-box">
           <div class="way-select">
 
-            <if condition="get_tool_status('alipay') eq 1">
+<!--            <if condition="get_tool_status('alipay') eq 1">-->
+<!--            <div class="wayBg" data-type="alipay">-->
+<!--              <img src="__IMG__/zhifubaozhifu.png" alt="">-->
+<!--              <span>支付宝</span>-->
+<!--            </div>-->
+
+<!--            </if>-->
+
+<!--            <if condition="get_tool_status('weixin') eq 1 or get_tool_status('wei_xin') eq 1 or get_tool_status('weixin_gf') eq 1">-->
             <div class="wayBg" data-type="alipay">
               <img src="__IMG__/zhifubaozhifu.png" alt="">
               <span>支付宝</span>
-
             </div>
-            </if>
-
-            <if condition="get_tool_status('weixin') eq 1 or get_tool_status('wei_xin') eq 1 or get_tool_status('weixin_gf') eq 1">
             <div class="" data-type="weixin">
               <img src="__IMG__/weixin.png" alt="">
               <span>微信支付</span>
             </div>
-            </if>
+
+<!--            </if>-->
 
             <if condition="get_tool_status('jft') eq 1">
               <div class="" data-type="jft"><span class="p1_1 g" id="p1">竣付通</span></div>
@@ -180,8 +185,8 @@
         <img src="__IMG__/foot_logo.png" alt="">
         <div class="foot_top_ri">
           <div class="foot_link">
-            <a>家长监护</a>
+            <a href="/media.php?s=/Article/news1/type/supervise.html">家长监护</a>
-            <a>客服帮助</a>
+            <a href="/media.php?s=/Service/index.html">客服帮助</a>
 <!--            <a href="#">国浩律所</a>-->
           </div>
           <div class="foot_serial">

Application/Media/View/default/Service/detail.html

@@ -19,7 +19,6 @@
       height: 30px;
       padding-left: 12px;
       padding-right: 30px;
-      font-size: 1rem;
     }
 
     .search-icon {

Application/Mobile/View/User/userphone.html

@@ -100,8 +100,12 @@
             $(e).removeClass('g-btn').addClass('g-btntn');
             var a = setInterval(function() {
               r--;
-              $(e).text('成功'+r + '秒后重发'),
+              $(e).text(r + '秒'),
-              0 == r && ($(e).removeClass('g-btntn').addClass('g-btn'), $(e).text('获取短信验证码'), clearInterval(a))
+              $(e).css("background", "rgba(169,169,169)");
+              0 == r && ($(e).removeClass('g-btntn').addClass('g-btn'),
+                      $(e).text('获取短信验证码'),
+                      $(e).css("background", "rgba(33,177,235,1)"),
+                      clearInterval(a))
             },1e3)
           }
         };

Data/update.sql

@@ -585,4 +585,14 @@ VALUES
   ('contact_cs', '联系客服', '[{\"name\":\"support\",\"title\":\"\\u8054\\u7cfb\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"2\",\"act\":\"3007567814\",\"ios_url\":\"3007567814\",\"sort\":\"1\",\"id\":1,\"icon\":\"\",\"cover\":\"\"}]', '', 5, 1, 1571723212 );
 INSERT INTO `tab_tool` (`name`, `title`, `config`, `template`, `type`, `status`, `create_time` )
 VALUES
-  ('sdk_menu', 'SDK用户菜单', '[{\"name\":\"mine\",\"title\":\"\\u6211\\u7684\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"my\",\"ios_url\":\"\",\"sort\":\"1\",\"id\":\"1\",\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd524dfd76fa.png\",\"cover\":\"1980\"},{\"name\":\"gift\",\"title\":\"\\u793c\\u5305\",\"menu_version\":\"0\",\"url\":\"\\/sdk.php\\/GameGiftPage\\/gift_list\",\"type\":\"0\",\"act\":\"gift\",\"ios_url\":\"?action=gift\",\"sort\":\"2\",\"id\":2,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd52509f3767.png\",\"cover\":\"1981\"},{\"name\":\"support\",\"title\":\"\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"support\",\"ios_url\":\"\",\"sort\":\"3\",\"id\":3,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd5251e0aee3.png\",\"cover\":\"1982\"},{\"name\":\"message\",\"title\":\"\\u6d88\\u606f\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"msg\",\"ios_url\":\"\",\"sort\":\"4\",\"id\":4,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525606ff53.png\",\"cover\":\"1983\"},{\"name\":\"logout\",\"title\":\"\\u9000\\u51fa\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"logout\",\"ios_url\":\"\",\"sort\":\"5\",\"id\":5,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525d99ed99.png\",\"cover\":\"1984\"},{\"name\":\"suppersign\",\"title\":\"\\u8d85\\u7ea7\\u7b7e\",\"menu_version\":\"2\",\"url\":\"\\/mobile.php\\/ssg\\/home\",\"type\":\"2\",\"act\":\"suppersign\",\"ios_url\":\"http:\\/\\/m.wmtxkj.cn\\/mobile.php\\/ssg\\/home\",\"sort\":\"6\",\"id\":6,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525f388843.png\",\"cover\":\"1985\"}]', '', 5, 1, 1571723212 );
+  ('sdk_menu', 'SDK用户菜单', '[{\"name\":\"mine\",\"title\":\"\\u6211\\u7684\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"my\",\"ios_url\":\"\",\"sort\":\"1\",\"id\":\"1\",\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd524dfd76fa.png\",\"cover\":\"1980\"},{\"name\":\"gift\",\"title\":\"\\u793c\\u5305\",\"menu_version\":\"0\",\"url\":\"\\/sdk.php\\/GameGiftPage\\/gift_list\",\"type\":\"0\",\"act\":\"gift\",\"ios_url\":\"?action=gift\",\"sort\":\"2\",\"id\":2,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd52509f3767.png\",\"cover\":\"1981\"},{\"name\":\"support\",\"title\":\"\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"support\",\"ios_url\":\"\",\"sort\":\"3\",\"id\":3,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd5251e0aee3.png\",\"cover\":\"1982\"},{\"name\":\"message\",\"title\":\"\\u6d88\\u606f\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"msg\",\"ios_url\":\"\",\"sort\":\"4\",\"id\":4,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525606ff53.png\",\"cover\":\"1983\"},{\"name\":\"logout\",\"title\":\"\\u9000\\u51fa\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"logout\",\"ios_url\":\"\",\"sort\":\"5\",\"id\":5,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525d99ed99.png\",\"cover\":\"1984\"},{\"name\":\"suppersign\",\"title\":\"\\u8d85\\u7ea7\\u7b7e\",\"menu_version\":\"2\",\"url\":\"\\/mobile.php\\/ssg\\/home\",\"type\":\"2\",\"act\":\"suppersign\",\"ios_url\":\"http:\\/\\/m.wmtxkj.cn\\/mobile.php\\/ssg\\/home\",\"sort\":\"6\",\"id\":6,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525f388843.png\",\"cover\":\"1985\"}]', '', 5, 1, 1571723212 );
+
+-- 修改迁移
+ALTER TABLE `tab_mend` 
+ADD COLUMN `order_time` int(11) NOT NULL DEFAULT 0 COMMENT '订单时间' AFTER `remark`;
+ALTER TABLE `sys_shift_task` 
+CHANGE COLUMN `create_promote_id` `creator_id` int(11) NOT NULL DEFAULT 0 COMMENT '创建渠道ID' AFTER `status`;
+ALTER TABLE `sys_shift_task` 
+ADD COLUMN `creator_type` tinyint(1) NOT NULL DEFAULT 0 COMMENT '创建者类型 0 后台管理员 1 推广员' AFTER `creator_id`;
+ALTER TABLE `tab_mend` 
+ADD COLUMN `op_type` tinyint(0) NOT NULL DEFAULT 0 COMMENT '0 管理员 1 推广员' AFTER `op_account`;