Merge branch 'release-1.0.0' of wmtx/platform into master

优化补链记录

Application/Admin/Controller/MemberController.class.php

@@ -83,10 +83,16 @@ class MemberController extends ThinkController
         //1.2 与游戏相关
         $game_map = false;
         if (isset($_REQUEST['game_name']) || isset($_REQUEST['game_type'])) {
+            
             $game_map = " and tab_user_play_info.game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")";
         }
         if (isset($_REQUEST['server_name'])) {
-            $game_map = " and tab_user_play_info.server_name = '{$_REQUEST['server_name']}' ";
+            if($game_map){
+                $game_map .= " and tab_user_play_info.server_name = '{$_REQUEST['server_name']}' ";
+            }else{
+                $game_map = " and tab_user_play_info.server_name = '{$_REQUEST['server_name']}' ";
+            }
+            
         }
         $promoteRoot = getPowerPromoteIds();
 

Application/Admin/Controller/MendController.class.php

@@ -187,7 +187,7 @@ class MendController extends ThinkController {
     private function checkPromote($order_time,$account)
     {
         $res = M("Spend","tab_")->field("promote_id")->where(["pay_time"=>array("EGT",$order_time),"user_account"=>$account])->group("promote_id")->select();
-        if(count($res)>0) return true;
+        if(count($res)>1) return true;
         return false;
     }
     //补链详情

Application/Base/Service/PromoteService.class.php

@@ -357,7 +357,7 @@ class PromoteService {
                 'remark' => $remark == '' ? ($task['creator_type'] == 0 ? '后台补链' : '玩家迁移') : $remark,
                 'order_time' => $orderTime,
                 'create_time' => time(),
-                'pay_amount' => isset($payAmountRows[$item['id']]) ? $payAmountRows[$item['id']]['payAmount'] : 0,
+                'pay_amount' => isset($payAmountRows[$item['id']]) ? intval($payAmountRows[$item['id']]['payAmount']) : 0,
                 'op_id' => $creator ? $creator['id'] : 0,
                 'op_account' => $opAccount,
                 'op_type' => $task['creator_type'],