diff --git a/Application/Admin/Controller/GameMarginController.class.php b/Application/Admin/Controller/GameMarginController.class.php index 97d5ba27e..6cde89900 100644 --- a/Application/Admin/Controller/GameMarginController.class.php +++ b/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']) diff --git a/Application/Admin/Controller/GameMarginSetController.class.php b/Application/Admin/Controller/GameMarginSetController.class.php index 4f2d2f8a9..bf929db07 100644 --- a/Application/Admin/Controller/GameMarginSetController.class.php +++ b/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{ diff --git a/Application/Admin/Model/TransferMerchantModel.class.php b/Application/Admin/Model/TransferMerchantModel.class.php index 92a3c71bc..32391243b 100644 --- a/Application/Admin/Model/TransferMerchantModel.class.php +++ b/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"; diff --git a/Public/Admin/excel/gamemargin.xlsx b/Public/Admin/excel/gamemargin.xlsx index 7f84aeed7..226d8dd7e 100644 Binary files a/Public/Admin/excel/gamemargin.xlsx and b/Public/Admin/excel/gamemargin.xlsx differ