Merge branch 'master' into dev

app/admin/controller/order/WholeController.php

@@ -4225,7 +4225,7 @@ class WholeController extends Curd
                 'order_amount_pay' => $item['order_amount_pay'],
                 'order_status_system' => !empty($systemStatus) ? $systemStatus : self::$systemStatus[$item['order_status_system']],
                 'order_status_payment' => self::$paymentStatus[$item['order_status_payment']],
-                'pay_way' => $payWay ?? '',
+                'pay_way' => $item['order_status_payment'] == 'SUCCESS' ? ($payWay ?? '') : '',
                 'order_addtimes' => date('Y-m-d H:i:s', strtotime($item['order_addtimes']))
             ];
         }