From 69ed1360d798be17028dd1faf05c27f1fa5db448 Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Wed, 13 Apr 2022 14:52:50 +0800
Subject: [PATCH] edit-admin-order_detail

---
 admin/controllers/receiver/orderv2/Orders.php |  1 -
 admin/libraries/Ordersv2List.php              | 11 ++++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php
index afa80a95..e9c34a9c 100644
--- a/admin/controllers/receiver/orderv2/Orders.php
+++ b/admin/controllers/receiver/orderv2/Orders.php
@@ -601,7 +601,6 @@ class Orders extends HD_Controller
             $where = [
                 'o_id' => $params['id'],
                 'status' => 1,
-                'pay_price>' => 0
             ];
             $count = $this->app_liche_orders_model->count($where);
             if ($count) {
diff --git a/admin/libraries/Ordersv2List.php b/admin/libraries/Ordersv2List.php
index d7df9df1..6785e1b3 100644
--- a/admin/libraries/Ordersv2List.php
+++ b/admin/libraries/Ordersv2List.php
@@ -24,6 +24,7 @@ class Ordersv2List
         $this->ci->load->model('auto/auto_series_model');
         $this->ci->load->model('auto/auto_brand_model');
         $this->ci->load->model('auto/auto_attr_model');
+        $this->ci->load->model('items/items_model', 'mdItems');
 
         $this->ci->load->library('receiver/orders_v2_entity');
         $this->ci->load->library('receiver/orders_status_entity');
@@ -202,7 +203,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}.order_time,{$this->t1}.bill_time,{$this->t1}.item_id";
         if($params['status_pid']==3){
             $where["{$this->t1}.id in (select o_id from lc_receiver_order_status where pid_status=0 and status=2)"] = null;
         }
@@ -228,6 +229,10 @@ class Ordersv2List
         }
         $lists = [];
         if ($count) {
+            //商品vin
+            $str_item_ids = implode(',', array_unique(array_column($rows, 'item_id')));
+            !$str_item_ids && $str_item_ids = 0;
+            $items = $this->ci->mdItems->map('id', 'vin', array("id in({$str_item_ids})" => null));
             //客户来源
             $str_rids = implode(',', array_unique(array_column($rows, 'customer_id')));
             !$str_rids && $str_rids = 0;
@@ -304,6 +309,7 @@ class Ordersv2List
                 $cf_clues && $fields['cf_name'] .= $cf_clues.'(线下)';
                 $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['vin'] = $items[$val['item_id']] ? $items[$val['item_id']] : '';
                 $lists[] = $fields;
             }
         }
@@ -354,6 +360,9 @@ class Ordersv2List
                 'c_time' => ['title' => '订单时间', 'width' => '9%']];
         }
         $fields = array_merge($fields1, $fields2);
+        if($export){
+            $fields['vin'] = ['title'=>'vin码'];
+        }
         return $fields;
     }
 }