diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index c913d60f3..4489696c1 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -218,24 +218,28 @@ class PayChannelController extends ThinkController } $testorderChannelArr = []; foreach($channelData as $key=>$value) { - foreach($testOrderChannelDatas as $trkey => $testOrderChannelData) { - if(intval($value['pay_way']) == intval($testOrderChannelData['pay_way'])) { - $channelData[$key]['pay_amount'] = number_format(($value['pay_amount'] + $testOrderChannelData['pay_amount']) ,2,'.',''); - $channelData[$key]['pay_way'] = get_pay_way($value['pay_way']); - break; - } - else if (!in_array(intval($testOrderChannelData['pay_way']),$pay_way_arr)) { - // $channelData[$testOrderChannelData['pay_way']]['pay_amount'] = number_format($testOrderChannelData['pay_amount'],2,'.',''); - $testorderChannelArr[$trkey]['pay_amount'] = number_format($testOrderChannelData['pay_amount'],2,'.',''); - $testorderChannelArr[$trkey]['pay_way'] = get_pay_way($testOrderChannelData['pay_way']); - } - else { - $channelData[$key]['pay_amount'] = number_format($value['pay_amount'],2,'.',''); - $channelData[$key]['pay_way'] = get_pay_way($value['pay_way']); + if($testOrderChannelDatas) { + foreach($testOrderChannelDatas as $trkey => $testOrderChannelData) { + if(intval($value['pay_way']) == intval($testOrderChannelData['pay_way'])) { + $channelData[$key]['pay_amount'] = number_format(($value['pay_amount'] + $testOrderChannelData['pay_amount']) ,2,'.',''); + $channelData[$key]['pay_way'] = get_pay_way($value['pay_way']); + break; + } + else if (!in_array(intval($testOrderChannelData['pay_way']),$pay_way_arr)) { + // $channelData[$testOrderChannelData['pay_way']]['pay_amount'] = number_format($testOrderChannelData['pay_amount'],2,'.',''); + $testorderChannelArr[$trkey]['pay_amount'] = number_format($testOrderChannelData['pay_amount'],2,'.',''); + $testorderChannelArr[$trkey]['pay_way'] = get_pay_way($testOrderChannelData['pay_way']); + } + else { + $channelData[$key]['pay_amount'] = number_format($value['pay_amount'],2,'.',''); + $channelData[$key]['pay_way'] = get_pay_way($value['pay_way']); + } + } - + } else { + $channelData[$key]['pay_amount'] = number_format($value['pay_amount'],2,'.',''); + $channelData[$key]['pay_way'] = get_pay_way($value['pay_way']); } - // $channelData[$key]['pay_way'] = get_pay_way($value['pay_way']); if (!$value['pay_way']) { unset($channelData[$key]);