rabin 1 jaar geleden
bovenliggende
commit
56ec4e8596
1 gewijzigde bestanden met toevoegingen van 3 en 11 verwijderingen
  1. 3 11
      database/yspay_merchant.php

+ 3 - 11
database/yspay_merchant.php

@@ -14,15 +14,7 @@ $project = function()
 	return Dever::db('pay/yspay_project')->state();
 };
 
-$merchant_id = Dever::input('search_option_merchant_id');
-if ($merchant_id > 0) {
-    Dever::setInput('search_option_merchant_id', -1);
-    $merchant = Dever::db('pay/yspay_merchant')->find($merchant_id);
-    $account_id = $merchant['account_id'];
-} else {
-    $account_id = Dever::input('search_option_account_id');
-}
-
+$account_id = Dever::input('search_option_account_id');
 $yspay_type = 1;
 if ($account_id) {
     $yspay = Dever::db('pay/yspay')->find(array('account_id' => $account_id));
@@ -41,11 +33,11 @@ $list_button = array
 );
 
 if ($yspay_type == 2) {
-    $list_button['list3'] = array('资金流水', '"yspay_cash&search_option_merchant_id={id}&oper_table=yspay_merchant&top_table=account"', '{status} == 1');
+    $list_button['list3'] = array('资金流水', '"yspay_cash&search_option_merchant_id={id}&search_option_account_id={account_id}&oper_table=yspay_merchant&top_table=account"', '{status} == 1');
 }
 
 if ($yspay_type == 1) {
-    $list_button['list2'] = array('提现管理', '"yspay_tixian&search_option_merchant_id={id}&oper_table=yspay_merchant&top_table=account"', '{status} == 1');
+    $list_button['list2'] = array('提现管理', '"yspay_tixian&search_option_merchant_id={id}&search_option_account_id={account_id}&oper_table=yspay_merchant&top_table=account"', '{status} == 1');
 }
 
 $list_button['list1'] = array('签约日志', '"yspay_sign_log&search_option_merchant_id={id}&oper_table=yspay_merchant&top_table=account"');