From 8fe560bb1f084050a47ee9565d60ca2c16847a05 Mon Sep 17 00:00:00 2001
From: lccsw <1127794702@qq.com>
Date: Tue, 23 Nov 2021 11:42:02 +0800
Subject: [PATCH] add-admin-export_order
---
admin/controllers/receiver/Orders.php | 32 ++++----
admin/controllers/receiver/order/Agent.php | 32 ++++----
admin/controllers/receiver/order/Bill.php | 32 ++++----
admin/controllers/receiver/order/Ckcar.php | 32 ++++----
admin/controllers/receiver/order/Deal.php | 32 ++++----
admin/controllers/receiver/order/Delivery.php | 32 ++++----
admin/controllers/receiver/order/Loan.php | 32 ++++----
admin/controllers/receiver/order/Refund.php | 32 ++++----
admin/controllers/receiver/order/Sign.php | 32 ++++----
admin/libraries/OrdersList.php | 73 +++++++++++++++++--
admin/views/receiver/order/lists.php | 12 ++-
admin/views/receiver/orders/lists.php | 10 ++-
api/controllers/wxapp/licheb/Cusorder.php | 3 +-
13 files changed, 253 insertions(+), 133 deletions(-)
diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php
index 8c025d7d..d8e61247 100644
--- a/admin/controllers/receiver/Orders.php
+++ b/admin/controllers/receiver/Orders.php
@@ -380,21 +380,27 @@ class Orders extends HD_Controller
$params['page'] = 1;
$params['size'] = 10000;
$indexs = [];
- $fieldAry = $this->orderslist->get_fields($params['status_pid'], 1);
- foreach ($fieldAry as $key => $value) {
- $indexs[$key] = $value['title'];
- }
- $this->load->library('OrdersList');
- $result = $this->orderslist->lists($params['status_pid'], $params);
- $fileName = $result['_title'];
- foreach ($result['lists'] as $key => $value) {
- $temp = array();
- foreach ($fieldAry as $key2 => $value2) {
- $temp[$key2] = $value[$key2];
+ if($params['export_type']){
+ $result = $this->orderslist->export_data($params['status_pid'], $params);
+ $fileName = '保险明细';
+ $data = $result['data'];
+ $indexs = $result['indexs'];
+ }else{
+ $fieldAry = $this->orderslist->get_fields($params['status_pid'], 1);
+ foreach ($fieldAry as $key => $value) {
+ $indexs[$key] = $value['title'];
}
- $data[] = $temp;
+ $result = $this->orderslist->lists($params['status_pid'], $params);
+ $fileName = $result['_title'];
+ foreach ($result['lists'] as $key => $value) {
+ $temp = array();
+ foreach ($fieldAry as $key2 => $value2) {
+ $temp[$key2] = $value[$key2];
+ }
+ $data[] = $temp;
+ }
+ array_unshift($data, $indexs);
}
- array_unshift($data, $indexs);
$this->load->library('excel');
return $this->excel->out_csv($data, $indexs, $fileName . "_" . date('YmdHis'));
}
diff --git a/admin/controllers/receiver/order/Agent.php b/admin/controllers/receiver/order/Agent.php
index 5d4bfa05..32d93319 100644
--- a/admin/controllers/receiver/order/Agent.php
+++ b/admin/controllers/receiver/order/Agent.php
@@ -54,21 +54,27 @@ class Agent extends HD_Controller{
$params['page'] = 1;
$params['size'] = 10000;
$indexs = [];
- $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
- foreach ($fieldAry as $key => $value) {
- $indexs[$key] = $value['title'];
- }
- $this->load->library('OrdersList');
- $result = $this->orderslist->lists($this->status_pid, $params);
- $fileName = $result['_title'];
- foreach ($result['lists'] as $key => $value) {
- $temp = array();
- foreach ($fieldAry as $key2 => $value2) {
- $temp[$key2] = $value[$key2];
+ if($params['export_type']){
+ $result = $this->orderslist->export_data($this->status_pid, $params);
+ $fileName = '保险明细';
+ $data = $result['data'];
+ $indexs = $result['indexs'];
+ }else{
+ $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
+ foreach ($fieldAry as $key => $value) {
+ $indexs[$key] = $value['title'];
}
- $data[] = $temp;
+ $result = $this->orderslist->lists($this->status_pid, $params);
+ $fileName = $result['_title'];
+ foreach ($result['lists'] as $key => $value) {
+ $temp = array();
+ foreach ($fieldAry as $key2 => $value2) {
+ $temp[$key2] = $value[$key2];
+ }
+ $data[] = $temp;
+ }
+ array_unshift($data, $indexs);
}
- array_unshift($data, $indexs);
$this->load->library('excel');
return $this->excel->out_csv($data, $indexs, $fileName . "_" . date('YmdHis'));
}
diff --git a/admin/controllers/receiver/order/Bill.php b/admin/controllers/receiver/order/Bill.php
index 16217aaf..c78a8f10 100644
--- a/admin/controllers/receiver/order/Bill.php
+++ b/admin/controllers/receiver/order/Bill.php
@@ -63,21 +63,27 @@ class Bill extends HD_Controller
$params['page'] = 1;
$params['size'] = 10000;
$indexs = [];
- $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
- foreach ($fieldAry as $key => $value) {
- $indexs[$key] = $value['title'];
- }
- $this->load->library('OrdersList');
- $result = $this->orderslist->lists($this->status_pid, $params);
- $fileName = $result['_title'];
- foreach ($result['lists'] as $key => $value) {
- $temp = array();
- foreach ($fieldAry as $key2 => $value2) {
- $temp[$key2] = $value[$key2];
+ if($params['export_type']){
+ $result = $this->orderslist->export_data($this->status_pid, $params);
+ $fileName = '保险明细';
+ $data = $result['data'];
+ $indexs = $result['indexs'];
+ }else{
+ $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
+ foreach ($fieldAry as $key => $value) {
+ $indexs[$key] = $value['title'];
}
- $data[] = $temp;
+ $result = $this->orderslist->lists($this->status_pid, $params);
+ $fileName = $result['_title'];
+ foreach ($result['lists'] as $key => $value) {
+ $temp = array();
+ foreach ($fieldAry as $key2 => $value2) {
+ $temp[$key2] = $value[$key2];
+ }
+ $data[] = $temp;
+ }
+ array_unshift($data, $indexs);
}
- array_unshift($data, $indexs);
$this->load->library('excel');
return $this->excel->out_csv($data, $indexs, $fileName . "_" . date('YmdHis'));
}
diff --git a/admin/controllers/receiver/order/Ckcar.php b/admin/controllers/receiver/order/Ckcar.php
index 51af6530..c36ac678 100644
--- a/admin/controllers/receiver/order/Ckcar.php
+++ b/admin/controllers/receiver/order/Ckcar.php
@@ -62,21 +62,27 @@ class Ckcar extends HD_Controller
$params['page'] = 1;
$params['size'] = 10000;
$indexs = [];
- $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
- foreach ($fieldAry as $key => $value) {
- $indexs[$key] = $value['title'];
- }
- $this->load->library('OrdersList');
- $result = $this->orderslist->lists($this->status_pid, $params);
- $fileName = $result['_title'];
- foreach ($result['lists'] as $key => $value) {
- $temp = array();
- foreach ($fieldAry as $key2 => $value2) {
- $temp[$key2] = $value[$key2];
+ if($params['export_type']){
+ $result = $this->orderslist->export_data($this->status_pid, $params);
+ $fileName = '保险明细';
+ $data = $result['data'];
+ $indexs = $result['indexs'];
+ }else{
+ $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
+ foreach ($fieldAry as $key => $value) {
+ $indexs[$key] = $value['title'];
}
- $data[] = $temp;
+ $result = $this->orderslist->lists($this->status_pid, $params);
+ $fileName = $result['_title'];
+ foreach ($result['lists'] as $key => $value) {
+ $temp = array();
+ foreach ($fieldAry as $key2 => $value2) {
+ $temp[$key2] = $value[$key2];
+ }
+ $data[] = $temp;
+ }
+ array_unshift($data, $indexs);
}
- array_unshift($data, $indexs);
$this->load->library('excel');
return $this->excel->out_csv($data, $indexs, $fileName . "_" . date('YmdHis'));
}
diff --git a/admin/controllers/receiver/order/Deal.php b/admin/controllers/receiver/order/Deal.php
index 50b40dbe..40bab391 100644
--- a/admin/controllers/receiver/order/Deal.php
+++ b/admin/controllers/receiver/order/Deal.php
@@ -64,21 +64,27 @@ class Deal extends HD_Controller
$params['page'] = 1;
$params['size'] = 10000;
$indexs = [];
- $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
- foreach ($fieldAry as $key => $value) {
- $indexs[$key] = $value['title'];
- }
- $this->load->library('OrdersList');
- $result = $this->orderslist->lists($this->status_pid, $params);
- $fileName = $result['_title'];
- foreach ($result['lists'] as $key => $value) {
- $temp = array();
- foreach ($fieldAry as $key2 => $value2) {
- $temp[$key2] = $value[$key2];
+ if($params['export_type']){
+ $result = $this->orderslist->export_data($this->status_pid, $params);
+ $fileName = '保险明细';
+ $data = $result['data'];
+ $indexs = $result['indexs'];
+ }else{
+ $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
+ foreach ($fieldAry as $key => $value) {
+ $indexs[$key] = $value['title'];
}
- $data[] = $temp;
+ $result = $this->orderslist->lists($this->status_pid, $params);
+ $fileName = $result['_title'];
+ foreach ($result['lists'] as $key => $value) {
+ $temp = array();
+ foreach ($fieldAry as $key2 => $value2) {
+ $temp[$key2] = $value[$key2];
+ }
+ $data[] = $temp;
+ }
+ array_unshift($data, $indexs);
}
- array_unshift($data, $indexs);
$this->load->library('excel');
return $this->excel->out_csv($data, $indexs, $fileName . "_" . date('YmdHis'));
}
diff --git a/admin/controllers/receiver/order/Delivery.php b/admin/controllers/receiver/order/Delivery.php
index f64b6d3e..97a75d00 100644
--- a/admin/controllers/receiver/order/Delivery.php
+++ b/admin/controllers/receiver/order/Delivery.php
@@ -62,21 +62,27 @@ class Delivery extends HD_Controller
$params['page'] = 1;
$params['size'] = 10000;
$indexs = [];
- $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
- foreach ($fieldAry as $key => $value) {
- $indexs[$key] = $value['title'];
- }
- $this->load->library('OrdersList');
- $result = $this->orderslist->lists($this->status_pid, $params);
- $fileName = $result['_title'];
- foreach ($result['lists'] as $key => $value) {
- $temp = array();
- foreach ($fieldAry as $key2 => $value2) {
- $temp[$key2] = $value[$key2];
+ if($params['export_type']){
+ $result = $this->orderslist->export_data($this->status_pid, $params);
+ $fileName = '保险明细';
+ $data = $result['data'];
+ $indexs = $result['indexs'];
+ }else{
+ $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
+ foreach ($fieldAry as $key => $value) {
+ $indexs[$key] = $value['title'];
}
- $data[] = $temp;
+ $result = $this->orderslist->lists($this->status_pid, $params);
+ $fileName = $result['_title'];
+ foreach ($result['lists'] as $key => $value) {
+ $temp = array();
+ foreach ($fieldAry as $key2 => $value2) {
+ $temp[$key2] = $value[$key2];
+ }
+ $data[] = $temp;
+ }
+ array_unshift($data, $indexs);
}
- array_unshift($data, $indexs);
$this->load->library('excel');
return $this->excel->out_csv($data, $indexs, $fileName . "_" . date('YmdHis'));
}
diff --git a/admin/controllers/receiver/order/Loan.php b/admin/controllers/receiver/order/Loan.php
index a4c0cdef..dab6be48 100644
--- a/admin/controllers/receiver/order/Loan.php
+++ b/admin/controllers/receiver/order/Loan.php
@@ -62,21 +62,27 @@ class Loan extends HD_Controller
$params['page'] = 1;
$params['size'] = 10000;
$indexs = [];
- $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
- foreach ($fieldAry as $key => $value) {
- $indexs[$key] = $value['title'];
- }
- $this->load->library('OrdersList');
- $result = $this->orderslist->lists($this->status_pid, $params);
- $fileName = $result['_title'];
- foreach ($result['lists'] as $key => $value) {
- $temp = array();
- foreach ($fieldAry as $key2 => $value2) {
- $temp[$key2] = $value[$key2];
+ if($params['export_type']){
+ $result = $this->orderslist->export_data($this->status_pid, $params);
+ $fileName = '保险明细';
+ $data = $result['data'];
+ $indexs = $result['indexs'];
+ }else{
+ $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
+ foreach ($fieldAry as $key => $value) {
+ $indexs[$key] = $value['title'];
}
- $data[] = $temp;
+ $result = $this->orderslist->lists($this->status_pid, $params);
+ $fileName = $result['_title'];
+ foreach ($result['lists'] as $key => $value) {
+ $temp = array();
+ foreach ($fieldAry as $key2 => $value2) {
+ $temp[$key2] = $value[$key2];
+ }
+ $data[] = $temp;
+ }
+ array_unshift($data, $indexs);
}
- array_unshift($data, $indexs);
$this->load->library('excel');
return $this->excel->out_csv($data, $indexs, $fileName . "_" . date('YmdHis'));
}
diff --git a/admin/controllers/receiver/order/Refund.php b/admin/controllers/receiver/order/Refund.php
index 26e63013..895fe6a9 100644
--- a/admin/controllers/receiver/order/Refund.php
+++ b/admin/controllers/receiver/order/Refund.php
@@ -63,21 +63,27 @@ class Refund extends HD_Controller
$params['page'] = 1;
$params['size'] = 10000;
$indexs = [];
- $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
- foreach ($fieldAry as $key => $value) {
- $indexs[$key] = $value['title'];
- }
- $this->load->library('OrdersList');
- $result = $this->orderslist->lists($this->status_pid, $params);
- $fileName = $result['_title'];
- foreach ($result['lists'] as $key => $value) {
- $temp = array();
- foreach ($fieldAry as $key2 => $value2) {
- $temp[$key2] = $value[$key2];
+ if($params['export_type']){
+ $result = $this->orderslist->export_data($this->status_pid, $params);
+ $fileName = '保险明细';
+ $data = $result['data'];
+ $indexs = $result['indexs'];
+ }else{
+ $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
+ foreach ($fieldAry as $key => $value) {
+ $indexs[$key] = $value['title'];
}
- $data[] = $temp;
+ $result = $this->orderslist->lists($this->status_pid, $params);
+ $fileName = $result['_title'];
+ foreach ($result['lists'] as $key => $value) {
+ $temp = array();
+ foreach ($fieldAry as $key2 => $value2) {
+ $temp[$key2] = $value[$key2];
+ }
+ $data[] = $temp;
+ }
+ array_unshift($data, $indexs);
}
- array_unshift($data, $indexs);
$this->load->library('excel');
return $this->excel->out_csv($data, $indexs, $fileName . "_" . date('YmdHis'));
}
diff --git a/admin/controllers/receiver/order/Sign.php b/admin/controllers/receiver/order/Sign.php
index a206e911..b11cb9ea 100644
--- a/admin/controllers/receiver/order/Sign.php
+++ b/admin/controllers/receiver/order/Sign.php
@@ -63,21 +63,27 @@ class Sign extends HD_Controller
$params['page'] = 1;
$params['size'] = 10000;
$indexs = [];
- $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
- foreach ($fieldAry as $key => $value) {
- $indexs[$key] = $value['title'];
- }
- $this->load->library('OrdersList');
- $result = $this->orderslist->lists($this->status_pid, $params);
- $fileName = $result['_title'];
- foreach ($result['lists'] as $key => $value) {
- $temp = array();
- foreach ($fieldAry as $key2 => $value2) {
- $temp[$key2] = $value[$key2];
+ if($params['export_type']){
+ $result = $this->orderslist->export_data($this->status_pid, $params);
+ $fileName = '保险明细';
+ $data = $result['data'];
+ $indexs = $result['indexs'];
+ }else{
+ $fieldAry = $this->orderslist->get_fields($this->status_pid, 1);
+ foreach ($fieldAry as $key => $value) {
+ $indexs[$key] = $value['title'];
}
- $data[] = $temp;
+ $result = $this->orderslist->lists($this->status_pid, $params);
+ $fileName = $result['_title'];
+ foreach ($result['lists'] as $key => $value) {
+ $temp = array();
+ foreach ($fieldAry as $key2 => $value2) {
+ $temp[$key2] = $value[$key2];
+ }
+ $data[] = $temp;
+ }
+ array_unshift($data, $indexs);
}
- array_unshift($data, $indexs);
$this->load->library('excel');
return $this->excel->out_csv($data, $indexs, $fileName . "_" . date('YmdHis'));
}
diff --git a/admin/libraries/OrdersList.php b/admin/libraries/OrdersList.php
index ab1ae7c7..0df93fef 100644
--- a/admin/libraries/OrdersList.php
+++ b/admin/libraries/OrdersList.php
@@ -13,6 +13,7 @@ class OrdersList
{
$this->ci = &get_instance();
$this->ci->load->model('receiver/order/receiver_orders_model', 'mdOrders');
+ $this->ci->load->model('receiver/order/receiver_order_agents_model', 'order_agents_model');
$this->ci->load->model('app/licheb/app_licheb_users_model', 'mdLichebUsers');
$this->ci->load->model('receiver/receiver_customers_model', 'mdCustomers');
$this->ci->load->model('receiver/receiver_clues_cfrom_model', 'mdCluesCfrom');
@@ -221,7 +222,7 @@ class OrdersList
$count = $this->ci->mdOrders->count($where);
$lists = [];
if ($count) {
- $fileds = "id,rid,name,mobile,brand_id,s_id,v_id,cor_id,incor_id,price,deposit,payway,status,c_time,biz_id";
+ $fileds = "id,rid,name,mobile,brand_id,s_id,v_id,cor_id,incor_id,price,deposit,payway,status,c_time,biz_id,bill_time";
$rows = $this->ci->mdOrders->select($where, "c_time desc", $page, $size, $fileds);
//客户来源
$str_rids = implode(',', array_unique(array_column($rows, 'rid')));
@@ -257,6 +258,8 @@ class OrdersList
$series_name = isset($series[$val['s_id']]) ? $series[$val['s_id']][0]['name'] : '';
$v_name = isset($attr[$val['v_id']]) ? $attr[$val['v_id']][0]['title'] : '';
$cor_name = isset($attr[$val['cor_id']]) ? $attr[$val['cor_id']][0]['title'] : '';
+ $fields['o_id'] = $val['id'];
+ $fields['bill_time'] = $val['bill_time'];
$fields['mobile'] = $val['mobile'];
$fields['name'] = $size > 1000 ? $val['name']
: '' . $val['name'] . '
' . $val['mobile'] . '';
@@ -434,7 +437,7 @@ class OrdersList
$lists = [];
if ($count) {
$fileds = "$t1.id,$t1.o_id,$t1.status,";
- $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time, {$t2}.admin_id,{$t2}.order_time";
+ $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time, {$t2}.admin_id,{$t2}.order_time,{$t2}.bill_time";
$rows = $this->ci->order_signs_model->select_order($where, "$t2.c_time desc", $page, $size, $fileds);
$brand_arr = $series_arr = $v_arr = $cor_arr = $incor_arr = array();
$admin_ids = array();
@@ -495,6 +498,8 @@ class OrdersList
$series_name = isset($series[$val['s_id']]) ? $series[$val['s_id']][0]['name'] : '';
$v_name = isset($attr[$val['v_id']]) ? $attr[$val['v_id']][0]['title'] : '';
$cor_name = isset($attr[$val['cor_id']]) ? $attr[$val['cor_id']][0]['title'] : '';
+ $fields['o_id'] = $val['o_id'];
+ $fields['bill_time'] = $val['bill_time'];
$fields['mobile'] = $val['mobile'];
$fields['name'] = $size > 1000 ? $val['name']
: '' . $val['name'] . '
' . $val['mobile'] . '';
@@ -666,7 +671,7 @@ class OrdersList
if ($count) {
$this->ci->load->model('sys/sys_finance_model');
$fileds = "$t1.o_id,$t1.title,$t1.year,$t1.first_price,$t1.status,$t1.c_time,";
- $fileds .= "$t2.rid,$t2.id,$t2.name,$t2.mobile,$t2.sid,$t2.finance_id,$t2.money_json";
+ $fileds .= "$t2.rid,$t2.id,$t2.name,$t2.mobile,$t2.sid,$t2.finance_id,$t2.money_json,$t2.bill_time";
$rows = $this->ci->order_loans_model->select_order($where, "$t2.c_time desc", $page, $size, $fileds);
//客户来源
$str_rids = implode(',', array_unique(array_column($rows, 'rid')));
@@ -686,6 +691,8 @@ class OrdersList
$fields = array();
$money_json = json_decode($val['money_json'], true);
$price_loan = $money_json['price_loan'] ? $money_json['price_loan'] : 0;
+ $fields['o_id'] = $val['o_id'];
+ $fields['bill_time'] = $val['bill_time'];
$fields['mobile'] = $val['mobile'];
$fields['name'] = $size > 1000 ? $val['name']
: '' . $val['name'] . '
' . $val['mobile'] . '';
@@ -850,7 +857,7 @@ class OrdersList
$lists = [];
if ($count) {
$fileds = "$t1.o_id,$t1.status,$t1.c_time,";
- $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time";
+ $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time,$t2.bill_time";
$rows = $this->ci->order_ckcars_model->select_order($where, "$t2.c_time desc", $page, $size, $fileds);
//客户来源
$str_rids = implode(',', array_unique(array_column($rows, 'rid')));
@@ -886,6 +893,8 @@ class OrdersList
$series_name = isset($series[$val['s_id']]) ? $series[$val['s_id']][0]['name'] : '';
$v_name = isset($attr[$val['v_id']]) ? $attr[$val['v_id']][0]['title'] : '';
$cor_name = isset($attr[$val['cor_id']]) ? $attr[$val['cor_id']][0]['title'] : '';
+ $fields['o_id'] = $val['o_id'];
+ $fields['bill_time'] = $val['bill_time'];
$fields['mobile'] = $val['mobile'];
$fields['name'] = $size > 1000 ? $val['name']
: '' . $val['name'] . '
' . $val['mobile'] . '';
@@ -1063,7 +1072,7 @@ class OrdersList
$lists = [];
if ($count) {
$fileds = "$t1.o_id,$t1.status,$t1.c_time,";
- $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time";
+ $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time,$t2.bill_time";
$rows = $this->ci->order_bills_model->select_order($where, "$t2.c_time desc", $page, $size, $fileds);
//客户来源
$str_rids = implode(',', array_unique(array_column($rows, 'rid')));
@@ -1099,6 +1108,8 @@ class OrdersList
$series_name = isset($series[$val['s_id']]) ? $series[$val['s_id']][0]['name'] : '';
$v_name = isset($attr[$val['v_id']]) ? $attr[$val['v_id']][0]['title'] : '';
$cor_name = isset($attr[$val['cor_id']]) ? $attr[$val['cor_id']][0]['title'] : '';
+ $fields['o_id'] = $val['o_id'];
+ $fields['bill_time'] = $val['bill_time'];
$fields['mobile'] = $val['mobile'];
$fields['name'] = $size > 1000 ? $val['name']
: '' . $val['name'] . '
' . $val['mobile'] . '';
@@ -1267,7 +1278,7 @@ class OrdersList
$lists = [];
if ($count) {
$fileds = "$t1.o_id,$t1.status,$t1.c_time,";
- $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time";
+ $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time,$t2.bill_time";
$rows = $this->ci->order_agents_model->select_order($where, "$t2.c_time desc", $page, $size, $fileds);
//客户来源
$str_rids = implode(',', array_unique(array_column($rows, 'rid')));
@@ -1303,6 +1314,8 @@ class OrdersList
$series_name = isset($series[$val['s_id']]) ? $series[$val['s_id']][0]['name'] : '';
$v_name = isset($attr[$val['v_id']]) ? $attr[$val['v_id']][0]['title'] : '';
$cor_name = isset($attr[$val['cor_id']]) ? $attr[$val['cor_id']][0]['title'] : '';
+ $fields['o_id'] = $val['o_id'];
+ $fields['bill_time'] = $val['bill_time'];
$fields['mobile'] = $val['mobile'];
$fields['name'] = $size > 1000 ? $val['name']
: '' . $val['name'] . '
' . $val['mobile'] . '';
@@ -1470,7 +1483,7 @@ class OrdersList
$lists = [];
if ($count) {
$fileds = "$t1.o_id,$t1.status,$t1.c_time,";
- $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time";
+ $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time,$t2.bill_time";
$rows = $this->ci->order_deliverys_model->select_order($where, "$t2.c_time desc", $page, $size, $fileds);
//客户来源
$str_rids = implode(',', array_unique(array_column($rows, 'rid')));
@@ -1506,6 +1519,8 @@ class OrdersList
$series_name = isset($series[$val['s_id']]) ? $series[$val['s_id']][0]['name'] : '';
$v_name = isset($attr[$val['v_id']]) ? $attr[$val['v_id']][0]['title'] : '';
$cor_name = isset($attr[$val['cor_id']]) ? $attr[$val['cor_id']][0]['title'] : '';
+ $fields['o_id'] = $val['o_id'];
+ $fields['bill_time'] = $val['bill_time'];
$fields['mobile'] = $val['mobile'];
$fields['name'] = $size > 1000 ? $val['name']
: '' . $val['name'] . '
' . $val['mobile'] . '';
@@ -1578,7 +1593,49 @@ class OrdersList
}
return $fields;
}
-
+ /*
+ * 导出数据
+ */
+ public function export_data($pid,$params){
+ $indexs = [
+ 'name' => '客户姓名',
+ 'mobile' => '手机号',
+ 'c_time' => '订单时间',
+ 'bill_time' => '开票时间',
+ 'if_ins_db' => '是否代办',
+ 'company' => '保险公司',
+ 'business_risk' => '商业险金额',
+ 'ins_risk' => '交强险金额'
+ ];
+ $result = $this->lists($pid, $params);
+ foreach ($result['lists'] as $key => $value) {
+ $temp = [
+ 'name' => $value['name'],
+ 'mobile' => $value['mobile'],
+ 'c_time' => $value['c_time'],
+ 'if_ins_db' => '',
+ 'company' => '',
+ 'business_risk' => '',
+ 'ins_risk' => ''
+ ];
+ $temp['bill_time'] = $value['bill_time'] != '0000-00-00 00:00:00' ? $value['bill_time'] : '';
+ $agent = $this->ci->order_agents_model->get(['o_id' => $value['o_id']],'jsondata');
+ if($agent){
+ $agent_jsondata = $agent['jsondata'] ? json_decode($agent['jsondata'], true) : '';
+ if ($agent_jsondata['if_ins_db']) {
+ $temp['if_ins_db'] = '是';
+ $agent_jsondata['company'] && $temp['company'] = $agent_jsondata['company'];
+ $agent_jsondata['ins_risk'] && $temp['ins_risk'] = $agent_jsondata['ins_risk'];
+ $agent_jsondata['business_risk'] && $temp['business_risk'] = $agent_jsondata['business_risk'];
+ }else{
+ $temp['if_ins_db'] = '否';
+ }
+ }
+ $data[] = $temp;
+ }
+ array_unshift($data, $indexs);
+ return ['data'=>$data,'indexs'=>$indexs];
+ }
}
?>
diff --git a/admin/views/receiver/order/lists.php b/admin/views/receiver/order/lists.php
index a1b97094..b68ab6d3 100644
--- a/admin/views/receiver/order/lists.php
+++ b/admin/views/receiver/order/lists.php
@@ -260,7 +260,11 @@
-
+
+
@@ -370,7 +374,7 @@
});
}
},
- export_out: function () {
+ export_out: function (type) {
var count = ;
if (count > 10000) {
layer.msg('单次导出数据不能超过10000');
@@ -378,9 +382,9 @@
}
var href = $.menu.parseUri(window.location.href);
- href = href.replace("orders?", "order//export?") + "";
+ href = href.replace("orders?", "order//export?") + ""+"&export_type="+type;
- href = href.replace("?", "/export?");
+ href = href.replace("?", "/export?export_type="+type+"&");
window.location.href = href;
},
diff --git a/admin/views/receiver/orders/lists.php b/admin/views/receiver/orders/lists.php
index 9e418ce0..05999811 100644
--- a/admin/views/receiver/orders/lists.php
+++ b/admin/views/receiver/orders/lists.php
@@ -219,7 +219,11 @@
-
+
+
@@ -341,14 +345,14 @@
});
}
},
- export_out: function () {
+ export_out: function (type) {
var count = ;
if (count > 10000) {
layer.msg('单次导出数据不能超过10000');
return false;
}
var href = $.menu.parseUri(window.location.href);
- href = href.replace("orders?", "orders/export?");
+ href = href.replace("orders?", "orders/export?export_type="+type+"&");
window.location.href = href;
},
init_brands: function () {
diff --git a/api/controllers/wxapp/licheb/Cusorder.php b/api/controllers/wxapp/licheb/Cusorder.php
index 51e10d44..ba298235 100644
--- a/api/controllers/wxapp/licheb/Cusorder.php
+++ b/api/controllers/wxapp/licheb/Cusorder.php
@@ -501,7 +501,8 @@ class Cusorder extends Wxapp{
'srv_ids' => $row['srv_ids'] ? explode(',',$row['srv_ids']) : [],
'fine_ids' => $row['fine_ids'] ? explode(',',$row['fine_ids']) : [],
'cus_id' => $row['rid'],
- 'edit_status' => $row['status'] > 2 ? 0 : 1
+ 'edit_status' => $row['status'] > 2 ? 0 : 1,
+ 'status' => $row['status']
];
$inten_money && $data['inten_money'] = $inten_money;
return $data;