diff --git a/admin/controllers/appdistribution/Distribution.php b/admin/controllers/appdistribution/Distribution.php index dee7b8ed..b80f520f 100755 --- a/admin/controllers/appdistribution/Distribution.php +++ b/admin/controllers/appdistribution/Distribution.php @@ -18,6 +18,10 @@ class Distribution extends AppBase $this->load->model('app/User_account_model', 'mdUserAccount'); $this->load->model('app/User_accountlog_model', 'mdUserAccountLog'); $this->load->model('app/Deal_log_model', 'mdDealLog'); + $this->load->model('receiver/order/receiver_orders_model', 'mdOrders'); + $this->load->model('auto/auto_series_model'); + $this->load->model('auto/auto_brand_model'); + $this->load->model('auto/auto_attr_model'); if ($this->app_id) { $this->load->model($this->mdApp->appConfig()[$this->app_id]['model'], 'mdAppUser'); if ($this->app_info()['lock_fans'] == 1) { @@ -254,9 +258,28 @@ class Distribution extends AppBase $count = $this->mdDealLog->count($where); if ($count) { $res = $this->mdDealLog->select($where, 'id DESC', $params['page'], $params['size'], 'cf_sid,type,status,money,c_time'); + $o_ids = array_column($res,'cf_sid') ? implode("','",array_column($res,'cf_sid')) : ''; + if($o_ids){ + $o_where = [ + "sid in ('{$o_ids}')" => null + ]; + $order_rows = $this->mdOrders->map('sid','',$o_where,'','','','id,sid,name,mobile,brand_id,s_id,v_id,cor_id,incor_id,c_time'); + } foreach ($res as $key => $value) { $setValue = array(); + $order = $order_rows[$value['cf_sid']] ? $order_rows[$value['cf_sid']][0] : []; $expect_money = 0.00; + $setValue['name'] = $order['name']; + $setValue['mobile'] = $order['mobile']; + $setValue['order_time'] = $order['c_time'] ? date('Y.m.d H:i',$order['c_time']) : ''; + $car = ''; + if($order){ + $brand = $this->auto_brand_model->get(['id'=>$order['brand_id']],'name'); + $series = $this->auto_series_model->get(['id'=>$order['s_id']],'name'); + $version = $this->auto_attr_model->get(["id"=>$order['v_id']]); + $car = "{$brand['name']}·{$series['name']}·{$version['title']}"; + } + $setValue['car'] = $car; $setValue['cf_sid'] = $value['cf_sid']; $setValue['status'] = $value['status']; $setValue['status_name'] = $statusAry[$value['status']]; diff --git a/admin/views/appdistribution/team/get_commission.php b/admin/views/appdistribution/team/get_commission.php index 2c214a63..642b9b69 100755 --- a/admin/views/appdistribution/team/get_commission.php +++ b/admin/views/appdistribution/team/get_commission.php @@ -6,7 +6,7 @@
-
@@ -30,20 +30,24 @@ - + + + + - - + + + + -
购车订单号客户姓名手机号车型订单日期 佣金 状态创建时间