Merge branch 'master' into dev

app/admin/service/order/PayDetailService.php

@@ -97,6 +97,10 @@ class PayDetailService
                     $payWay = $prepayid[1];
                 }
             }
+            if (empty($payWay)){
+                $data['payWay'] = '';
+                return $data;
+            }
             $payWay = OrderService::$payWay[$payWay];
             if (!empty($data['payWay']) && $data['payWay'] == '组合支付') {
                 $data['payWayDesc'] = $payWay . '(￥' . $detail['pay_amount'] . '),';