From 8d742886a76eec9af617b8b903d3586ffa0ef42a Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Mar 2020 15:58:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PayChannelController.class.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index 762c584a8..48c8ed9ce 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -1377,18 +1377,31 @@ class PayChannelController extends ThinkController // ->order('tab_spend.id DESC') ->select(false); - if ($map['user_account']) { - $map['tab_deposit.user_account'] = $map['user_account']; - } +// if ($map['user_account']) { +// $map['tab_deposit.user_account'] = $map['user_account']; +// } + $map['user_account'] = $map['tab_spend.user_account']; + unset($map['tab_spend.user_account']); $coinMap = $map; $coinMap['tab_deposit.pay_status'] = 1; $coinMap['tab_deposit.pay_way'] = $map['pay_way']; + unset($coinMap['pay_status']); unset($coinMap['pay_way']); + $coinMap['tab_deposit.user_account'] = $coinMap['user_account']; + unset($coinMap['user_account']); + + if(!$coinMap['tab_deposit.user_account']) { + unset($coinMap['tab_deposit.user_account']); + } + + if (!$map['user_account']) { + unset($map['user_account']); + } if($map['pay_time']) { $coinMap['tab_deposit.create_time'] = $map['pay_time'];