Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

Application/Admin/Controller/ConsoleController.class.php

@@ -104,7 +104,7 @@ class ConsoleController extends Think {
     public function modifyLoginCheck($start_time=0, $end_time=0)
     {
         $start_time = $start_time ? strtotime($start_time) : strtotime(date("Y-m-d"));
-        $end_time = $end_time ? strtotime($end_time) : $start_time + 86400;
+        $end_time = $end_time ? strtotime($end_time) : $start_time;
         $this->modifyLogin($start_time, $end_time);
     }
 
@@ -118,7 +118,7 @@ class ConsoleController extends Think {
             $end_time = $i+86400;
             $result = M()->query("SELECT
                 game_id,
-                FROM_UNIXTIME(login_time, '%Y-%m-%d') create_time,
+                UNIX_TIMESTAMP(FROM_UNIXTIME(login_time, '%Y-%m-%d')) create_time,
                 user_id,
                 promote_id
                 FROM
@@ -135,18 +135,24 @@ class ConsoleController extends Think {
                 GROUP BY
                     create_time,
                     game_id,
-                    user_id");
+                    user_id,
+                    promote_id");
                 if ($result) {
                     foreach ($result as $index => $item) {
-                        $item['create_time'] = strtotime($item['create_time']);
+                        if (is_null($result[$index]['promote_id']))
-                        if ($item['create_time']) {
+                        {
-                            $res = M("login_daily_record", "tab_")->add($item);
+                            unset($result[$index]);
-                            echo "写入{$item['create_time']} $res \n";
+                        }
+                    }
+                    $step = 500;
+                    for ($j=0;;$j+=$step) {
+                        $insData = array_slice($result, $j, $step);
+                        if ($insData) {
+                            $res = M("login_daily_record", 'tab_')->addAll($insData);
+                            echo "写入 $res \n";
                         } else {
-                            echo "写入{$item['create_time']} error \n";
+                            break;
                         }
-                        
-                        unset($result[$index]);
                     } 
                 } else {
                     echo "写入{$item['create_time']} 无 \n";

Application/Admin/View/Query/settlement.html

@@ -405,13 +405,14 @@
                 btn: ['提交', '取消'],
             }, function (index) {
                 layer.close(index);
-                layer.load(0, {shade: [0.7, '#393D49']}, {shadeClose: true});
+                layer.load(0, {shade: [0.7, '#393D49'], time: 10 * 1000}, {shadeClose: true});
                 $.ajax({
                     type: 'post',
                     url: '{:U("settlementWithdraw")}',
                     dataType: 'json',
                     data: {'begin_time': beginTime, 'end_time': endTime, 'promote_id': promoteId},
                     success: function (data) {
+                        layer.closeAll('loading');
                         if (data.status == 1) {
                             layer.msg(data.msg, {icon: 1});
                             setTimeout(function(){
@@ -458,13 +459,16 @@
             layer.confirm(msg, {
                 title: '提示',
                 btn: ['确定', '取消'],
-            }, function () {
+            }, function (index) {
+                layer.close(index);
+                layer.load(0, {shade: [0.7, '#393D49'], time: 10 * 1000}, {shadeClose: true});
                 $.ajax({
                     type: 'post',
                     url: '{:U("cancelWithdraw")}',
                     dataType: 'json',
                     data: {id:id},
                     success: function (data) {
+                        layer.closeAll('loading');
                         if (data.status == 1) {
                             layer.msg(data.msg, {icon: 1});
                             setTimeout(function(){

Application/Base/Service/PromoteService.class.php

@@ -930,14 +930,14 @@ class PromoteService {
             'real_name'     => $params['real_name'],
             'email'         => $params['email'],
             'idcard'        => $params['idcard'] ?? '',
-            'status'        => $params['status'],
+            'status'        => $params['status'] ?? 0,
             'mobile_phone'  => $params['mobile_phone'],
             'bank_name'     => $params['bank_name'] ?? '',
             'bank_card'     => $params['bank_card'],
             'parent_id'     => $parent ? $parent['id'] : 0,
             'parent_name'   => $parent ? $parent['account'] : '官方渠道',
             'admin_id'      => $params['admin_id'] ?? 0,
-            'company_id'      => $params['company_id'] ?? 0,
+            'company_id'    => $params['company_id'] ?? 0,
             'invite_code'   => $params['invite_code'] ?? '',
             'create_time'   => time(),
         ];

Application/Home/Controller/PromoteController.class.php

@@ -985,6 +985,9 @@ class PromoteController extends BaseController
             } else {
                 $parent = $loginPromote;
             }
+            if ($parent) {
+                $params['company_id'] = $parent['company_id'];
+            }
             if (C('PROMOTE_AUTO_AUDIT') == 1) {
                 $params['status'] = 1;
             }