edit-admin-list

admin/controllers/receiver/Customer.php

@@ -25,6 +25,8 @@ class Customer extends HD_Controller
         $this->load->model('receiver/receiver_xz_model');
         $this->load->model('app/licheb/app_licheb_users_model');
         $this->load->model("biz/biz_model");
+
+        $this->load->model('auto/auto_brand_model');
         $this->log_dir = 'receiver_' . get_class($this);
     }
 
@@ -43,6 +45,7 @@ class Customer extends HD_Controller
         !$params['qdjl_id'] && $params['qdjl_id'] = '';
         !$params['level'] && $params['level'] = '';
         !$params['cf_clues'] && $params['cf_clues'] = '';
+        !$params['brand_id'] && $params['brand_id'] = '';
         $page = $params['page'] = $params['page'] ? intval($params['page']) : 1;
         $size = $params['size'] = $params['size'] ? intval($params['size']) : 20;
 
@@ -66,6 +69,7 @@ class Customer extends HD_Controller
         !$params['search_tp'] && $params['search_tp'] = 'mobile';
         strlen($params['status']) && $where["status"] = $params['status'];
         $params['cf_title'] && $where['cf_title'] = $params['cf_title'];
+        $params['brand_id'] && $where['brand_id'] = $params['brand_id'];
         if ($params['qdjl_id']) {
             $re_bu = $this->app_licheb_users_model->get(array('id' => $params['qdjl_id']));
             if ($re_bu['biz_id']) {
@@ -212,6 +216,7 @@ class Customer extends HD_Controller
         $show_info['levelAry'] = $this->customers_model->get_sdata('level');
         $show_info['cfCluesAry'] = $this->customers_model->get_sdata('cfrom_clues');
         $show_info['cfTitleAry'] = $this->customers_model->get_sdata('cfrom');
+        $show_info['brandAry'] = $this->auto_brand_model->select(['status'=>1],'id desc','','','id,name');
         $this->data['show_info'] = $show_info;
         $this->data['lists'] = $lists;
         $this->data['pager'] = array('count' => ceil($count / $size), 'curr' => $page, 'totle' => $count);
@@ -228,7 +233,6 @@ class Customer extends HD_Controller
     {
         $id = $this->input->get('id');
 
-        $this->load->model('auto/auto_brand_model');
         $this->load->model('auto/auto_series_model');
         $this->load->model('auto/auto_attr_model');
 

admin/controllers/receiver/Orders.php

@@ -753,6 +753,8 @@ class Orders extends HD_Controller
                     ];
                 }
             }
+            $sum = $this->app_liche_orders_model->sum('total_price',$where);
+            $this->data['total_price'] = $sum['total_price'];
             $this->data['list'] = $list;
             $hasNext = ceil($count / $size) > $page ? 1 : 0;
             $this->data['commonPage'] = array('page' => $page, 'pageLimit' => $size, 'pageCount' => $count, 'hasNext' => $hasNext);

admin/views/receiver/customer/lists.php

@@ -121,6 +121,15 @@
                     </select>
                 </div>
             </div>
+            <div class="am-form-group fl">
+                <label class="am-para-label w100">车型品牌：</label>
+                <div class="am-para-inline w100">
+                    <select name="brand_id" v-model="params.brand_id">
+                        <option value=''>请选择</option>
+                        <option :value="v.id" v-for="(v,i) in show_info.brandAry">{{v.name}}</option>
+                    </select>
+                </div>
+            </div>
             <? foreach ($searchTimeAry as $key => $value) { ?>
                 <div id="show-<?= $key ?>" style="display:<?= $params[$key] ? 'block' : 'none' ?>">
                     <div class="am-form-group" style="margin-bottom: 0px;"></div>

admin/views/receiver/orders/paylog.php

@@ -40,6 +40,7 @@
                 </ul>
             </nav>
         </div>
+        <div class="align-r ml15" v-if="total_price">收款总额{{total_price}}</div>
     </div>
 </div>
 
@@ -50,7 +51,8 @@
             data:{
                 id:<?=$id?$id:''?>,
                 page: [],
-                list:[]
+                list:[],
+                total_price: ''
             },
             mounted: function () {
                 this.getData(1);
@@ -62,6 +64,7 @@
                         if(result.code){
                             that.list = result.data.list;
                             that.page = result.data.commonPage;
+                            that.total_price = result.data.total_price;
                         }
                     });
                 },

common/libraries/Qyrobot.php

@@ -69,14 +69,14 @@ class Qyrobot{
             'status' => 1,
             'pay_price>=' => 100
         ];
-        $where['c_time>='] = strtotime(date('Y-m-d 00:00:00'));
-        $where['c_time<='] = time();
+        $where['pay_time>='] = date('Y-m-d 00:00:00');
+        $where['pay_time<='] = date('Y-m-d H:i:s');
         $today_count = $this->ci->app_liche_orders_model->count($where);//今日成交订单数
         $where['c_time>='] = strtotime(date('Y-m-01 00:00:00'));
         $month_count = $this->ci->app_liche_orders_model->count($where);//本月成交订单数
 
         //意向金等于定金的支付订单
-        $sql = "select count(*) as total from lc_app_liche_orders as a left join lc_receiver_orders as b on a.o_id=b.id and a.total_price=b.deposit where a.type=4 and a.status=1 and a.pay_price>=0 and a.c_time>=".strtotime(date('Y-m-d 00:00:00'));
+        $sql = "select count(*) as total from lc_app_liche_orders as a left join lc_receiver_orders as b on a.o_id=b.id and a.total_price=b.deposit where a.type=4 and a.status=1 and a.pay_price>=0 and a.pay_time>=".date('Y-m-d 00:00:00');
         $int_query = $this->ci->db->query($sql)->row_array();
         if($int_query['total']){
             $today_count += $int_query['total'];