admin/liche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit-admin-order_detail

Browse Source
This commit is contained in:
lccsw
2022-04-13 14:52:50 +08:00
parent 01406cac41
commit b6f4c824d3
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/controllers/receiver/orderv2/Orders.php
-1
View File
@@ -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) {
admin/libraries/Ordersv2List.php
+10 -1
View File
@@ -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;
}
}