From 098c63d63d70ec4e4910216c0727eaff85954ff4 Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Thu, 5 Mar 2020 14:34:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PayChannelController.class.php | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

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]);