Merge pull request 'hotfix/change_pay_0526' (#354) from hotfix/change_pay_0526 into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/354

Application/Admin/Controller/GameMarginController.class.php

@@ -173,7 +173,7 @@ class GameMarginController extends AdminController
             ->setCellValue('E'.$line, $v['cp_promote_ratio']/100)
             ->setCellValue('F'.$line, $v['cp_ratio']/100)
             ->setCellValue('G'.$line, $v['cp_statement_amount'])
-            ->setCellValue('H'.$line, $v['cp_rebate_ratio'])
+            ->setCellValue('H'.$line, $v['cp_rebate_ratio']/100)
             ->setCellValue('I'.$line, $v['cp_rebate_amount'])
             ->setCellValue('J'.$line, $v['cp_other_amount'])
             ->setCellValue('K'.$line, $v['pc_pay_amount'])

Application/Admin/Controller/GameMarginSetController.class.php

@@ -352,7 +352,7 @@ class GameMarginSetController extends Controller {
                         }else{
                             $ratio = $val['second_ratio'];
                         }
-                        $statement_money = round( $this->adddata[$game]['pay_amount'] * $ratio / 100,2);                        
+                        $statement_money = round( $this->adddata[$game]['pay_amount'] / $val['pay_amount'] * $val['sum_money'],2);                        
                         if( array_key_exists("cp_statement_amount",$this->adddata[$game]) ){
                             $this->adddata[$game]['cp_statement_amount'] += $statement_money;
                         }else{

Application/Admin/Model/TransferMerchantModel.class.php

@@ -14,8 +14,8 @@ class TransferMerchantModel extends Model
         "3"=>"通用一个账号"
     ];
     const IS_FREE_STR = [
-        "1"=>"官方自营接口（提现免手续费）",
-        "2"=>"官方接口"
+        "1"=>"官方直营接口（提现免手续费）",
+        "2"=>"官方支付宝接口"
     ];
     const StatementPaymentWhere ="ways = 1 or ways = 3";
     const UnderPaymentWhere ="ways = 2 or ways = 3";