Merge branch 'master' of 124.223.222.61:elf/jy-sdk

Application/Common/Api/GameApi.class.php

@@ -62,7 +62,7 @@ class GameApi {
 			"sign"         => $md5_sign
 		);
 		
-		if (false && in_array($pay_data['game_id'], [7, 8, 9, 10, 11, 12, 13, 14]) && $pay_data['pay_way'] == 41) {
+		if (in_array($pay_data['game_id'], [7, 8, 9, 10, 11, 12, 13, 14]) && $pay_data['pay_way'] == 41) {
 			$game_data['pay_notify_url'] = 'http://119.45.181.187/pay/wmtxxbdhd3_callback.php';
 		}
 

Application/Common/Common/extend.php

@@ -2020,9 +2020,9 @@ function get_payment_config($way=1, $game=0, $user_id=0, $pay_amount = 0, $skipO
     // $monthEnd = date('Y-m-d', strtotime(date('Y-m-01') . '+1 month -1 day'));
     // $payAmountRow = M('spend','tab_')->field('SUM(pay_amount) as sum_amount')->where(array('pay_way'=>41,  'pay_real_status'=>1, 'payed_time' => ['gt', $monthBegin], 'payed_time' => ['lt', $monthEnd]))->find();
     // $payAmount = intval($payAmountRow['sum_amount']);
-    if ($pay_amount > 2000 && !$skipOuterPay && in_array($game['id'], [7, 8, 9, 10, 11, 12, 13, 14])) {
+    /* if (($pay_amount > 2000 && !$skipOuterPay && in_array($game['id'], [7, 8, 9, 10, 11, 12, 13, 14])) || in_array($user_id, [6, 186, 18925])) {
         return ['code' => 0, 'msg' => '', 'data' => ['id' => 3, 'channel' => 11, 'config' => '{}']];
-    }
+    } */
     
     $payment_rule = M('payment_rule', 'tab_')->where($map)->select();
     $find_rule = false;