订单导出调整

app/admin/controller/order/WholeController.php

@@ -4619,8 +4619,6 @@ class WholeController extends Curd
             } elseif ($item['order_is_complete'] == 'R') {
                 $systemStatus = '售后已完成';
             }
-//            order_return_refund_json
-//            dump($item);
 
             if (!empty($item['order_return_status']) && $item['order_return_status'] == 'PENDING') {
                 $systemStatus = '售后待处理';
@@ -4672,6 +4670,18 @@ class WholeController extends Curd
             if ($item['order_express_type'] == '自提' && $item['order_status_system'] == 'SENDING') {
                 $item['order_status_system'] = 'PICKUP';
             }
+            // 创建人
+            $orderAddUsername = '';
+            if (!empty($item['order_add_user_id'])) {
+                $orderAddUsername = SysUser::where('user_id', $item['order_add_user_id'])->value('user_name');
+            }
+            // 更新人
+            $orderUpdateUsername = '';
+            if (!empty($item['order_update_user_id'])) {
+                $orderUpdateUsername = SysUser::where('user_id', $item['order_update_user_id'])->value('user_name');
+            }
+
+
             $data[$key] = [
                 'goods_classify' => !empty($goodsClassify) && isset(self::$goodsClassify[$goodsClassify]) ? self::$goodsClassify[$goodsClassify] : '其他订单',
                 'order_id' => $item['order_id'],
@@ -4686,6 +4696,9 @@ class WholeController extends Curd
                 'pay_way' => $item['order_status_payment'] == 'SUCCESS' ? ($payWay ?? '') : '',
                 'pay_times' => $item['order_status_payment'] == 'SUCCESS' || $item['order_status_payment'] == 'FREE' ? ($payTimes ?? '') : '',
                 'order_addtimes' => date('Y-m-d H:i:s', strtotime($item['order_addtimes'])),
+                'order_add_username' => $orderAddUsername,
+                'order_updatetimes' => !empty($item['order_updatetimes']) ? date('Y-m-d H:i:s', $item['order_updatetimes']) : '',
+                'order_update_username' => $orderUpdateUsername
             ];
         }