From 6fdc607a6d26cf6fa1ddfa2a1b60c912ee84ba1a Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Wed, 10 Aug 2022 16:57:22 +0800
Subject: [PATCH] edit-admin-order_list

---
 admin/libraries/Ordersv2List.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/admin/libraries/Ordersv2List.php b/admin/libraries/Ordersv2List.php
index 11cb1597..b3e787d4 100644
--- a/admin/libraries/Ordersv2List.php
+++ b/admin/libraries/Ordersv2List.php
@@ -219,7 +219,7 @@ class Ordersv2List
         $fileds = "{$this->t1}.id,{$this->t1}.name,{$this->t1}.mobile,{$this->t1}.brand_id,{$this->t1}.s_id,{$this->t1}.v_id,
             {$this->t1}.cor_id,{$this->t1}.incor_id,{$this->t1}.money_json,{$this->t1}.payway,{$this->t1}.status,{$this->t1}.c_time,
             {$this->t1}.biz_id,{$this->t1}.bill_time,{$this->t1}.customer_id,{$this->t1}.owner_name,{$this->t1}.owner_mobile,{$this->t1}.main_type,{$this->t1}.info_json,
-            {$this->t1}.order_time,{$this->t1}.bill_time,{$this->t1}.item_id,{$this->t1}.over_time,{$this->t1}.sale_id,{$this->t1}.finance_id";
+            {$this->t1}.order_time,{$this->t1}.bill_time,{$this->t1}.item_id,{$this->t1}.over_time,{$this->t1}.sale_id,{$this->t1}.finance_id,{$this->t1}.refund_time";
         if(strlen($params['status_pid'])){
             $where["{$this->t1}.brand_id>"] = 0;
         }
@@ -236,6 +236,8 @@ class Ordersv2List
             $orderby = "{$this->t1}.order_time desc";
         } elseif ($params['status_pid'] == 3) { // 开票列表 开票时间排序
             $orderby = "{$this->t1}.bill_time desc";
+        }elseif($params['status_pid'] == 21){ //退款时间排序
+            $orderby = "{$this->t1}.refund_time desc";
         } else {
             $orderby = "{$this->t1}.c_time desc";
         }
@@ -364,7 +366,9 @@ class Ordersv2List
                 $fields['order_time'] = $val['order_time'] != '0000-00-00 00:00:00' ? $val['order_time'] : '';
                 $fields['bill_time'] = $val['bill_time'] != '0000-00-00 00:00:00' ? $val['bill_time'] : '';
                 $fields['over_time'] = $val['over_time'] != '0000-00-00 00:00:00' ? date('Y-m-d',strtotime($val['over_time'])) : '';
+                $fields['refund_time'] = $val['refund_time'] != '0000-00-00 00:00:00' ? date('Y-m-d',strtotime($val['refund_time'])) : '';
                 $fields['vin'] = $items[$val['item_id']] ? $items[$val['item_id']] : '';
+
                 if($size>1000){
                     if($bizs[$val['biz_id']]['type']==3){ //代理店显示渠道经理的姓名
                         $channel_users = $this->ci->app_licheb_channel_biz_model->select(['biz_id'=>$val['biz_id']],'','','','uid');
@@ -583,6 +587,10 @@ class Ordersv2List
                 'of_title' => ['title' => '客户来源', 'width' => '10%'], 'status_name' => ['title' => '状态', 'width' => '9%'],
                 'order_time' => ['title' => '下定时间', 'width' => '9%'],'over_time' => ['title' => '交付截止', 'width' => '9%']
             ];
+            if($status_pid==21){
+                unset($fields2['over_time']);
+                $fields2['refund_time'] = ['title' => '退款时间', 'width' => '9%'];
+            }
         }
         $fields = array_merge($fields1, $fields2);
         if ($export) {