From 070cc2e7c2f739fcd4b76e945c5daa866b6f44e1 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 7 Nov 2019 17:56:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Base/Service/PromoteService.class.php | 22 +- .../Controller/PromoteController.class.php | 4 +- .../Home/View/default/Promote/children.html | 119 +- .../Home/View/default/Public/transfer.html | 48 + Public/Home/css/transfer.css | 128 + Public/Home/js/transfer.js | 217 + Public/static/vue.js | 11944 ++++++++++++++++ 7 files changed, 12447 insertions(+), 35 deletions(-) create mode 100644 Application/Home/View/default/Public/transfer.html create mode 100644 Public/Home/css/transfer.css create mode 100644 Public/Home/js/transfer.js create mode 100644 Public/static/vue.js diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index eccf2aac5..a5874251a 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -92,7 +92,7 @@ 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'] : []; - $create_promote_id = empty(session('promote_auth.pid')) ? 0 : session('promote_auth.pid'); + $createPromoteId = empty(session('promote_auth.pid')) ? 0 : session('promote_auth.pid'); if ($fromPromoteId == $toPromoteId) { return [ @@ -106,6 +106,7 @@ class PromoteService { 'msg'=>'订单日期不能为空' ]; } + if ($type == 1 && $balanceCoinMode == 0) { return [ 'status' => false, @@ -113,6 +114,21 @@ class PromoteService { ]; } + if (count($shiftIds) > 15) { + return [ + 'status' => false, + 'msg'=>'部分迁移时,迁移人数不能超过15' + ]; + } + + $shiftTask = M('shift_task', 'sys_')->field(['id'])->where(['type' => $type, 'status' => 0, 'from_promote_id'])->find(); + if ($shiftTask) { + return [ + 'status' => false, + 'msg' => '含有类似未执行迁移任务,请稍后再试' + ]; + } + $isFuture = false; if (strtotime($orderTime) > strtotime(date('Y-m-d 23:59:59'))) { $isFuture = true; @@ -124,13 +140,13 @@ class PromoteService { 'order_time' => strtotime($orderTime), 'balance_coin_mode' => $balanceCoinMode, 'create_time' => time(), - 'create_promote_id' => $create_promote_id, + 'create_promote_id' => $createPromoteId, 'status' => 0, 'type' => $type, 'shift_ids' => json_encode($shiftIds) ]; - if (M('ShiftTask')->add($data)) { + if (M('shift_task', 'sys_')->add($data)) { return [ 'status' => true, 'msg'=>'迁移任务创建成功' diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index 159239644..a407002c1 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -874,8 +874,8 @@ class PromoteController extends BaseController if (count($ids) > 0) { $countList = M('promote', 'tab_')->field(['count(*)' => 'count', 'parent_id' => 'parent_id'])->where(['parent_id' => ['in', $ids]])->group('parent_id')->select(); $playerList = M('user_play', 'tab_')->field(['count(*)' => 'count', 'promote_id' => 'promote_id'])->where(['promote_id' => ['in', $ids]])->group('promote_id')->select(); - $shiftList = M('shift_task', 'sys_')->field(['count(*)' => 'count', 'from_promote_id' => 'from_promote_id'])->where(['status' => 0, 'type' => 1, 'promote_id' => ['in', $ids]])->group('from_promote_id')->select(); - $shiftPlayerList = M('shift_task', 'sys_')->field(['count(*)' => 'count', 'from_promote_id' => 'from_promote_id'])->where(['status' => 0, 'type' => 2, 'promote_id' => ['in', $ids]])->group('from_promote_id')->select(); + $shiftList = M('shift_task', 'sys_')->field(['count(*)' => 'count', 'from_promote_id' => 'from_promote_id'])->where(['status' => 0, 'type' => 1, 'from_promote_id' => ['in', $ids]])->group('from_promote_id')->select(); + $shiftPlayerList = M('shift_task', 'sys_')->field(['count(*)' => 'count', 'from_promote_id' => 'from_promote_id'])->where(['status' => 0, 'type' => 2, 'from_promote_id' => ['in', $ids]])->group('from_promote_id')->select(); $hasChildList = array_column($countList, 'parent_id'); $hasPlayerList = array_column($playerList, 'promote_id'); $hasShiftList = array_column($shiftList, 'from_promote_id'); diff --git a/Application/Home/View/default/Promote/children.html b/Application/Home/View/default/Promote/children.html index 1c9da8225..3655f0055 100644 --- a/Application/Home/View/default/Promote/children.html +++ b/Application/Home/View/default/Promote/children.html @@ -1,6 +1,9 @@ + + + @@ -16,7 +19,7 @@ - 添加{$promoteTypeName} + 添加{$promoteTypeName} @@ -60,7 +63,7 @@ 暂无数据 - + {$record.id} {$record.account} {$record.real_name} @@ -137,6 +140,7 @@ + 账号(真实姓名) @@ -164,6 +168,18 @@ 平台币清零 + + + 迁移方式 + + 全部迁移 + 部分迁移 + + + + + + 确定 @@ -206,16 +222,21 @@ + +
暂无数据