|
|
|
@ -2042,7 +2042,7 @@ function get_payment_config($way=1, $game=0, $user_id=0) {
|
|
|
|
|
$merchant_id = $rule['alipay_merchant_id'];
|
|
|
|
|
if ($way == 2)
|
|
|
|
|
$merchant_id = $rule['weixin_merchant_id'];
|
|
|
|
|
if ($way == 3)
|
|
|
|
|
if ($way == 4)
|
|
|
|
|
$merchant_id = $rule['express_merchant_id'];
|
|
|
|
|
|
|
|
|
|
$pay_conf = M('payment_merchant', 'tab_')->where([
|
|
|
|
@ -2144,7 +2144,7 @@ function get_payment_config($way=1, $game=0, $user_id=0) {
|
|
|
|
|
$merchant_id = $rule['alipay_merchant_id'];
|
|
|
|
|
if ($way == 2)
|
|
|
|
|
$merchant_id = $rule['weixin_merchant_id'];
|
|
|
|
|
if ($way == 3)
|
|
|
|
|
if ($way == 4)
|
|
|
|
|
$merchant_id = $rule['express_merchant_id'];
|
|
|
|
|
|
|
|
|
|
$pay_conf = M('payment_merchant', 'tab_')->where([
|
|
|
|
|