订单导出

app/admin/controller/order/WholeController.php

@@ -4104,6 +4104,16 @@ class WholeController extends Curd
             } elseif ($item['order_is_complete'] == 'R') {
                 $systemStatus = '售后已完成';
             }
+            if ($item['order_is_complete'] != 'R' && !empty($item['order_return_status']) && $item['order_return_status'] == 'PENDING') {
+                $systemStatus = '待处理';
+            } elseif ($item['order_is_complete'] != 'R' && !empty($item['order_return_status']) && $item['order_return_status'] == 'DOING') {
+                $systemStatus = '退款中';
+            } elseif ($item['order_is_complete'] != 'R' && !empty($item['order_return_status']) && $item['order_return_status'] == 'DONE') {
+                $systemStatus = '退款完成';
+            } elseif ($item['order_is_complete'] != 'R' && !empty($item['order_return_status']) && $item['order_return_status'] == 'DISAGREE') {
+                $systemStatus = '不同意退款';
+            }
+
             $payDetails = PayDetail::where('join_pay_order_id', $item['order_groupby'])
                 ->where('pay_status', 'SUCCESS')
                 ->where('pay_category', '<>', 'REFUND')
@@ -4113,7 +4123,10 @@ class WholeController extends Curd
                 $payWay = '组合支付';
             } elseif (count($payDetails) == 1) {
                 $payWayEn = OrderService::getPayWayByPrepayId($payDetails[0]['pay_prepayid']);
-                $payWay = OrderService::$payWay[$payWayEn];
+                $payWay='';
+                if (!empty($payWayEn)){
+                    $payWay = OrderService::$payWay[$payWayEn];
+                }
             }
             if ($item['member']['member_mobile'] == '0000') {
                 $memberName = '散客';

app/event/order/OrderProcessEvent.php

@@ -11,7 +11,6 @@ class OrderProcessEvent
 {
     public function orderComplete($params)
     {
-        dump($params);
         try {
             $userId = JwtToken::getCurrentId();
         } catch (\Exception $e) {