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

Application/Admin/Common/function.php

@@ -724,7 +724,7 @@ function getAllGameList($groupByRelation = false)
 {
     $field = 'id, game_name, relation_game_id, relation_game_name';
     if ($groupByRelation) {
-        $games = M('game', 'tab_')->field($field)->group('relation_game_id')->select();
+        $games = M('game', 'tab_')->field($field)->where('id = relation_game_id')->group('relation_game_id')->select();
     } else {
         $games = M('game', 'tab_')->field($field)->select();
     }

Application/Admin/Controller/PromoteGameRatioController.class.php

@@ -64,7 +64,7 @@ class PromoteGameRatioController extends ThinkController
             $promoteIds = array_column($promoteGameRatios, 'promote_id');
             $gameIds = array_column($promoteGameRatios, 'game_id');
             $promoteFiled = 'id, account, mobile_phone, create_time, status, ver_status';
-            $gameFiled = 'id, game_name, ratio';
+            $gameFiled = 'id, relation_game_name, ratio';
             $promotes = M('promote', 'tab_')->where(array('id' => ['in', $promoteIds]))->getField($promoteFiled, true);
             $games = M('game', 'tab_')->where(array('id' => ['in', $gameIds]))->getField($gameFiled, true);
 
@@ -103,7 +103,7 @@ class PromoteGameRatioController extends ThinkController
                     $thisPromoteVerStatus = getPromoteVerStatus($promotes[$thisPromoteId]['ver_status'], 2);
                 }
                 if ($issetGame) {
-                    $thisGameName = $games[$thisGameId]['game_name'];
+                    $thisGameName = $games[$thisGameId]['relation_game_name'];
                     $thisGameRatio = $games[$thisGameId]['ratio'];
                     $thisGameRatio = ($thisGameRatio ?? '0.00') . '%';
                 }
@@ -326,7 +326,7 @@ class PromoteGameRatioController extends ThinkController
                 $this->assign('lastRatio', $lastRatio);
             }
 
-            $this->assign('gameList', getAllGameList());
+            $this->assign('gameList', getAllGameList(true));
             $this->assign('promoteList', getPromoteByLevel(1));
             $this->meta_title = $metaTitle;
             $this->display();
@@ -389,8 +389,11 @@ class PromoteGameRatioController extends ThinkController
                             $promoteIds = M('promote', 'tab_')->where($promoteMap)->getField('id', true);
                             $promoteIds[] = $promoteId;
 
+                            $gameIds = D('game')->where(array('relation_game_id' => $promoteGameRatio['game_id']))->getField('id', true);
+                            $gameIds = $gameIds ?? [-1];
+
                             $spendMap['promote_id'] = ['in', $promoteIds];
-                            $spendMap['game_id'] = $promoteGameRatio['game_id'];
+                            $spendMap['game_id'] = ['in', $gameIds];
                             if ($promoteGameRatio['end_time'] > 0) {
                                 $spendMap['pay_time'] = ['between', [$promoteGameRatio['begin_time'], $promoteGameRatio['end_time'] + 3600 * 24 - 1]];
                             } else {

Application/Admin/Model/WithdrawModel.class.php

@@ -268,37 +268,42 @@ class WithdrawModel extends Model{
             $balance = 0;
             $notInGameIds = [-1];
             foreach ($promoteGameRatios as $promoteGameRatio) {
-                $spendWhere['game_id'] = $promoteGameRatio['game_id'];
                 if (!empty($promoteGameRatio['turnover_ratio']) && $promoteGameRatio['begin_time'] <= $settlementBeginTime && (empty($promoteGameRatio['end_time']) || $promoteGameRatio['end_time'] >= $settlementEndTime)) {
-                    $notInGameIds[] = $promoteGameRatio['game_id'];
                     $ratio = $promoteGameRatio['ratio'];
                     $promoteGameRatio['turnover_ratio'] = json_decode($promoteGameRatio['turnover_ratio'], true);
                     $turnoverRatios = array_reverse($promoteGameRatio['turnover_ratio']);
-                    $sumAmount = $spendModel->field("sum(pay_amount) as sum_amount")
-                        ->where($spendWhere)
-                        ->find()['sum_amount'];
-                    $sumAmount = $sumAmount ?? 0;
-                    foreach ($turnoverRatios as $turnoverRatio) {
-                        if ($sumAmount >= $turnoverRatio['turnover']) {
-                            $ratio = $turnoverRatio['ratio'];
-                            break;
+                    $gameIds = D('game')->where(array('relation_game_id' => $promoteGameRatio['game_id']))->getField('id', true);
+                    if (!empty($gameIds)) {
+                        foreach ($gameIds as $gameId) {
+                            $spendWhere['game_id'] = $gameId;
+                            $notInGameIds[] = $gameId;
+                            $sumAmount = $spendModel->field("sum(pay_amount) as sum_amount")
+                                ->where($spendWhere)
+                                ->find()['sum_amount'];
+                            $sumAmount = $sumAmount ?? 0;
+                            foreach ($turnoverRatios as $turnoverRatio) {
+                                if ($sumAmount >= $turnoverRatio['turnover']) {
+                                    $ratio = $turnoverRatio['ratio'];
+                                    break;
+                                }
+                            }
+
+                            $thisBalance = $spendModel->field("sum(pay_amount * {$ratio}) as balance")
+                                ->where($spendWhere)
+                                ->find()['balance'];
+                            $thisBalance = $thisBalance ?? 0;
+                            $balance = bcadd($balance, $thisBalance, 2);
+
+                            $gameRatios[$gameId] = [];
+                            $gameRatios[$gameId][] = [
+                                'selle_ratio' => $ratio,
+                                'default_ratio' => $promoteGameRatio['ratio'],
+                                'sum_amount' => $sumAmount,
+                                'begin_time' => $beginTime,
+                                'end_time' => $endTime,
+                            ];
                         }
                     }
-
-                    $thisBalance = $spendModel->field("sum(pay_amount * {$ratio}) as balance")
-                        ->where($spendWhere)
-                        ->find()['balance'];
-                    $thisBalance = $thisBalance ?? 0;
-                    $balance = bcadd($balance, $thisBalance, 2);
-
-                    $gameRatios[$promoteGameRatio['game_id']] = [];
-                    $gameRatios[$promoteGameRatio['game_id']][] = [
-                        'selle_ratio' => $ratio,
-                        'default_ratio' => $promoteGameRatio['ratio'],
-                        'sum_amount' => $sumAmount,
-                        'begin_time' => $beginTime,
-                        'end_time' => $endTime,
-                    ];
                 }
             }
 
@@ -391,33 +396,38 @@ class WithdrawModel extends Model{
         $gameRatios = [];
         foreach ($promoteGameRatios as $promoteGameRatio) {
             if (!empty($promoteGameRatio['turnover_ratio']) && $promoteGameRatio['begin_time'] <= $settlementBeginTime && (empty($promoteGameRatio['end_time']) || $promoteGameRatio['end_time'] >= $settlementEndTime)) {
-                $spendMap['game_id'] = $promoteGameRatio['game_id'];
                 $promoteGameRatio['turnover_ratio'] = json_decode($promoteGameRatio['turnover_ratio'], true);
                 $turnoverRatios = array_reverse($promoteGameRatio['turnover_ratio']);
-                $sumAmount = $spendModel->field("sum(pay_amount) as sum_amount")
-                    ->where($spendMap)
-                    ->find()['sum_amount'];
-                $sumAmount = $sumAmount ?? 0;
-                $ratio = 0;
-                foreach ($turnoverRatios as $turnoverRatio) {
-                    if ($sumAmount >= $turnoverRatio['turnover']) {
-                        $ratio = $turnoverRatio['ratio'];
-                        break;
-                    }
-                }
+                $gameIds = D('game')->where(array('relation_game_id' => $promoteGameRatio['game_id']))->getField('id', true);
+                if (!empty($gameIds)) {
+                    foreach ($gameIds as $gameId) {
+                        $spendMap['game_id'] = $gameId;
+                        $sumAmount = $spendModel->field("sum(pay_amount) as sum_amount")
+                            ->where($spendMap)
+                            ->find()['sum_amount'];
+                        $sumAmount = $sumAmount ?? 0;
+                        $ratio = 0;
+                        foreach ($turnoverRatios as $turnoverRatio) {
+                            if ($sumAmount >= $turnoverRatio['turnover']) {
+                                $ratio = $turnoverRatio['ratio'];
+                                break;
+                            }
+                        }
 
-                if ($ratio > 0) {
-                    $ratio = bcsub($ratio, $promoteGameRatio['ratio'], 2);
-                    $thisBalance = bcdiv(bcmul($sumAmount, $ratio, 2), 100, 2);
-                    $balance = bcadd($balance, $thisBalance, 2);
-
-                    $gameRatios[$promoteGameRatio['game_id']][] = [
-                        'selle_ratio' => $ratio,
-                        'default_ratio' => $promoteGameRatio['ratio'],
-                        'sum_amount' => $sumAmount,
-                        'begin_time' => date('Y-m-d', $settlementBeginTime),
-                        'end_time' => date('Y-m-d', $settlementEndTime),
-                    ];
+                        if ($ratio > 0) {
+                            $ratio = bcsub($ratio, $promoteGameRatio['ratio'], 2);
+                            $thisBalance = bcdiv(bcmul($sumAmount, $ratio, 2), 100, 2);
+                            $balance = bcadd($balance, $thisBalance, 2);
+
+                            $gameRatios[$gameId][] = [
+                                'selle_ratio' => $ratio,
+                                'default_ratio' => $promoteGameRatio['ratio'],
+                                'sum_amount' => $sumAmount,
+                                'begin_time' => date('Y-m-d', $settlementBeginTime),
+                                'end_time' => date('Y-m-d', $settlementEndTime),
+                            ];
+                        }
+                    }
                 }
             }
         }
@@ -477,25 +487,30 @@ class WithdrawModel extends Model{
         $balance = 0;
         foreach ($promoteGameRatios as $promoteGameRatio) {
             if (!empty($promoteGameRatio['turnover_ratio']) && $promoteGameRatio['begin_time'] <= $settlementBeginTime && (empty($promoteGameRatio['end_time']) || $promoteGameRatio['end_time'] >= $settlementEndTime)) {
-                $spendMap['game_id'] = $promoteGameRatio['game_id'];
                 $promoteGameRatio['turnover_ratio'] = json_decode($promoteGameRatio['turnover_ratio'], true);
                 $turnoverRatios = array_reverse($promoteGameRatio['turnover_ratio']);
-                $sumAmount = $spendModel->field("sum(pay_amount) as sum_amount")
-                    ->where($spendMap)
-                    ->find()['sum_amount'];
-                $sumAmount = $sumAmount ?? 0;
-                $ratio = 0;
-                foreach ($turnoverRatios as $turnoverRatio) {
-                    if ($sumAmount >= $turnoverRatio['turnover']) {
-                        $ratio = $turnoverRatio['ratio'];
-                        break;
-                    }
-                }
+                $gameIds = D('game')->where(array('relation_game_id' => $promoteGameRatio['game_id']))->getField('id', true);
+                if (!empty($gameIds)) {
+                    foreach ($gameIds as $gameId) {
+                        $spendMap['game_id'] = $gameId;
+                        $sumAmount = $spendModel->field("sum(pay_amount) as sum_amount")
+                            ->where($spendMap)
+                            ->find()['sum_amount'];
+                        $sumAmount = $sumAmount ?? 0;
+                        $ratio = 0;
+                        foreach ($turnoverRatios as $turnoverRatio) {
+                            if ($sumAmount >= $turnoverRatio['turnover']) {
+                                $ratio = $turnoverRatio['ratio'];
+                                break;
+                            }
+                        }
 
-                if ($ratio > 0) {
-                    $ratio = bcsub($ratio, $promoteGameRatio['ratio'], 2);
-                    $thisBalance = bcdiv(bcmul($sumAmount, $ratio, 2), 100, 2);
-                    $balance = bcadd($balance, $thisBalance, 2);
+                        if ($ratio > 0) {
+                            $ratio = bcsub($ratio, $promoteGameRatio['ratio'], 2);
+                            $thisBalance = bcdiv(bcmul($sumAmount, $ratio, 2), 100, 2);
+                            $balance = bcadd($balance, $thisBalance, 2);
+                        }
+                    }
                 }
             }
         }
@@ -532,28 +547,33 @@ class WithdrawModel extends Model{
             $balance = 0;
             $notInGameIds = [-1];
             foreach ($promoteGameRatios as $promoteGameRatio) {
-                $spendWhere['game_id'] = $promoteGameRatio['game_id'];
                 if (!empty($promoteGameRatio['turnover_ratio']) && $promoteGameRatio['begin_time'] <= $settlementBeginTime && (empty($promoteGameRatio['end_time']) || $promoteGameRatio['end_time'] >= $settlementEndTime)) {
-                    $notInGameIds[] = $promoteGameRatio['game_id'];
                     $ratio = $promoteGameRatio['ratio'];
                     $promoteGameRatio['turnover_ratio'] = json_decode($promoteGameRatio['turnover_ratio'], true);
                     $turnoverRatios = array_reverse($promoteGameRatio['turnover_ratio']);
-                    $sumAmount = $spendModel->field("sum(pay_amount) as sum_amount")
-                        ->where($spendWhere)
-                        ->find()['sum_amount'];
-                    $sumAmount = $sumAmount ?? 0;
-                    foreach ($turnoverRatios as $turnoverRatio) {
-                        if ($sumAmount >= $turnoverRatio['turnover']) {
-                            $ratio = $turnoverRatio['ratio'];
-                            break;
+                    $gameIds = D('game')->where(array('relation_game_id' => $promoteGameRatio['game_id']))->getField('id', true);
+                    if (!empty($gameIds)) {
+                        foreach ($gameIds as $gameId) {
+                            $spendWhere['game_id'] = $gameId;
+                            $notInGameIds[] = $gameId;
+                            $sumAmount = $spendModel->field("sum(pay_amount) as sum_amount")
+                                ->where($spendWhere)
+                                ->find()['sum_amount'];
+                            $sumAmount = $sumAmount ?? 0;
+                            foreach ($turnoverRatios as $turnoverRatio) {
+                                if ($sumAmount >= $turnoverRatio['turnover']) {
+                                    $ratio = $turnoverRatio['ratio'];
+                                    break;
+                                }
+                            }
+
+                            $thisBalance = $spendModel->field("sum(pay_amount * {$ratio}) as balance")
+                                ->where($spendWhere)
+                                ->find()['balance'];
+                            $thisBalance = $thisBalance ?? 0;
+                            $balance = bcadd($balance, $thisBalance, 2);
                         }
                     }
-
-                    $thisBalance = $spendModel->field("sum(pay_amount * {$ratio}) as balance")
-                        ->where($spendWhere)
-                        ->find()['balance'];
-                    $thisBalance = $thisBalance ?? 0;
-                    $balance = bcadd($balance, $thisBalance, 2);
                 }
             }
 

Application/Admin/View/PromoteGameRatio/applyRatio.html

@@ -105,11 +105,11 @@
                   <option value="">游戏名称</option>
                   <empty name="record">
                     <volist name="gameList" id="vo">
-                      <option value="{$vo.id}">{$vo.game_name}</option>
+                      <option value="{$vo.id}">{$vo.relation_game_name}</option>
                     </volist>
                     <else/>
                     <volist name="gameList" id="vo">
-                      <option value="{$vo.id}" <if condition="$vo['id'] eq $record['game_id']">selected</if> >{$vo.game_name}</option>
+                      <option value="{$vo.id}" <if condition="$vo['id'] eq $record['game_id']">selected</if> >{$vo.relation_game_name}</option>
                     </volist>
                   </empty>
                 </select>

Application/Common/Common/extend.php

@@ -1106,6 +1106,10 @@ function getGameSelleRatioByPromote($promoteId = null, $gameId = null)
     $promoteId = intval($promoteId);
     $gameId = intval($gameId);
     $promote = M('promote', 'tab_')->find($promoteId);
+    $gameId = M('game', 'tab_')->where(array('id' => $gameId))->getField('relation_game_id');
+    if (empty($gameId)) {
+        return false;
+    }
 
     if (empty($promote)) {
         return false;

Application/Home/Controller/DownloadController.class.php

@@ -2199,10 +2199,11 @@ class DownloadController extends BaseController {
             if($value1['status'] == 2) {
                 $value1['promotestatus'] = "冻结中";
             }
-            $value1['account'] = substr_replace($value1['account'],'****',2);
+            $realname = mb_strlen($value1['real_name'],'utf-8') == 2 ? mb_substr($value1['real_name'],0,1,'utf-8').'*':mb_substr($value1['real_name'],0,1,'utf-8').'**';
+            $value1['real_name'] = $realname;
             $value1['idcard'] = substr_replace($value1['idcard'],'************',3,12);
-           $value1['create_time'] = date('Y-m-d H:i:s',$value1['create_time']);
-           $xlsData[] = $value1;
+            $value1['create_time'] = date('Y-m-d H:i:s',$value1['create_time']);
+            $xlsData[] = $value1;
         }
         $this->exportExcel($xlsName, $xlsCell, $xlsData,$id);
      }
@@ -3087,7 +3088,7 @@ class DownloadController extends BaseController {
             $records[] = [
                 'id' => $parent['id'],
                 'account' => $parent['account'],
-                'real_name' => $parent['real_name'],
+                'real_name' => mb_strlen($parent['real_name'],'utf-8') == 2 ? mb_substr($parent['real_name'],0,1,'utf-8').'*':mb_substr($parent['real_name'],0,1,'utf-8').'**',
                 'level' => $parent['level'],
                 'create_role_count' => $selfCreateRoleCountList[$parent['id']],
                 'create_role_user_count' => $selfCreateRoleUserCountList[$parent['id']],
@@ -3109,7 +3110,7 @@ class DownloadController extends BaseController {
             $records[] = [
                 'id' => $id,
                 'account' => $promote['account'],
-                'real_name' => $promote['real_name'],
+                'real_name' => mb_strlen($promote['real_name'],'utf-8') == 2 ? mb_substr($promote['real_name'],0,1,'utf-8').'*':mb_substr($promote['real_name'],0,1,'utf-8').'**',
                 'level' => $promote['level'],
                 'create_role_count' => $createRoleCountList[$id],
                 'create_role_user_count' => $createRoleUserCountList[$id],

Application/Home/Controller/PromoteController.class.php

@@ -972,6 +972,8 @@ class PromoteController extends BaseController
         list($records, $pagination, $count) = $this->paginate($query);
 
         foreach ($records as $key => $value) {
+            $realname = mb_strlen($value['real_name'],'utf-8') == 2 ? mb_substr($value['real_name'],0,1,'utf-8').'*':mb_substr($value['real_name'],0,1,'utf-8').'**';
+            $records[$key]['real_name'] = $realname;
             $records[$key]['idcard'] = encryption($value['idcard']);
             $records[$key]['mobile_phone'] = encryption($value['mobile_phone']);
         }

Application/Home/Controller/QueryController.class.php

@@ -2112,7 +2112,7 @@ class QueryController extends BaseController
                 $records[] = [
                     'id' => $parent['id'],
                     'account' => $parent['account'],
-                    'real_name' => $parent['real_name'],
+                    'real_name' => mb_strlen($parent['real_name'],'utf-8') == 2 ? mb_substr($parent['real_name'],0,1,'utf-8').'*':mb_substr($parent['real_name'],0,1,'utf-8').'**',
                     'level' => $parent['level'],
                     'create_role_count' => $selfCreateRoleCountList[$parent['id']],
                     'create_role_user_count' => $selfCreateRoleUserCountList[$parent['id']],
@@ -2134,7 +2134,7 @@ class QueryController extends BaseController
                 $records[] = [
                     'id' => $id,
                     'account' => $promote['account'],
-                    'real_name' => $promote['real_name'],
+                    'real_name' => mb_strlen($promote['real_name'],'utf-8') == 2 ? mb_substr($promote['real_name'],0,1,'utf-8').'*':mb_substr($promote['real_name'],0,1,'utf-8').'**',
                     'level' => $promote['level'],
                     'create_role_count' => $createRoleCountList[$id],
                     'create_role_user_count' => $createRoleUserCountList[$id],

Application/Home/Controller/SafeController.class.php

@@ -352,11 +352,14 @@ class SafeController extends BaseController{
         } */
         $promoteInfo = "";
         $address = json_decode($rs['address'],false)[1];
+        $realname = mb_strlen($rs['real_name'],'utf-8') == 2 ? mb_substr($rs['real_name'],0,1,'utf-8').'*':mb_substr($rs['real_name'],0,1,'utf-8').'**';
         $this->assign('addr',$address);
         $this->assign('ver_status',$rs['ver_status']);
         $this->assign('rs',$rs);
+        $this->assign('idcard',encryption($rs['idcard']));
+        $this->assign('real_name',$realname);
         $this->assign('promoteInfo',$promoteInfo);
-        $this->assign('tel',$rs['mobile_phone']);
+        $this->assign('tel',encryption($rs['mobile_phone']));
         $this->display();
     }  
 

Application/Home/View/default/Safe/editModify.html

@@ -121,10 +121,10 @@
           <div class="zizhi">
             <div class="line_title">资质认证</div>
             <div class="line_text">
-                真实姓名:  {$rs['real_name']}
+                真实姓名:  {$real_name}
             </div>
             <div class="line_text">
-                身份证号码:   {$rs['idcard']}
+                身份证号码:   {$idcard}
             </div>
             <div class="line_text">
                 身份证扫描:  <span style="color:#449acb">已认证<span>