cars

admin/controllers/Common.php

@@ -1140,7 +1140,7 @@ class Common extends CI_Controller
         if ($type == 1) {
             $tp == 0 && $lists[] = array('id' => 0, 'name' => $name ? $name : '选择品牌');
             $res = array();
-            $rows = $this->mdAutoBrand->select($where, 'status desc, id asc', 0, 0, 'id,name');
+            $rows = $this->mdAutoBrand->select($where, 'initial asc', 0, 0, 'id,name');
             foreach ($rows as $v) {
                 $res[] = array(
                     'id' => strlen($status) > 0 ? $v['id'] : " " . $v['id'],
@@ -1149,10 +1149,10 @@ class Common extends CI_Controller
             }
         } else if ($type == 2) {
             $tp == 0 && $lists[] = array('id' => 0, 'name' => $name ? $name : '选择车系');
-            $res = $this->mdAutoSeries->select(array_merge($where, ['brand_id' => $pid]), 'id desc', 0, 0, 'id,name');
+            $res = $this->mdAutoSeries->select(array_merge($where, ['brand_id' => $pid]), 'id asc', 0, 0, 'id,name');
         } else if ($type == 3) {
             $tp == 0 && $lists[] = array('id' => 0, 'name' => $name ? $name : '选择车型');
-            $res = $this->mdAutoCar->select(array_merge($where, ['series_id' => $pid]), 'id desc', 0, 0, 'id,name');
+            $res = $this->mdAutoCar->select(array_merge($where, ['series_id' => $pid]), 'id asc', 0, 0, 'id,name');
         }
         foreach ($res as $key => $value) {
             $lists[] = array('id' => $value['id'], 'name' => $value['name']);

admin/controllers/auto/Cars.php

@@ -80,7 +80,6 @@ class Cars extends HD_Controller
                         'brand' => $map_brand[$v['brand_id']],
                         'series' => $map_series[$v['series_id']],
                         'name' => $v['name'],
-                        'third_car_id' => $v['third_car_id'],
                         'status' => $v['status'],
                     );
                 }

admin/controllers/autohome/Customer.php

@@ -22,7 +22,7 @@ class Customer extends HD_Controller
         '10491' => '厦门-蔡文彬',
         '10492' => '厦门-李怀松',
         '10493' => '厦门-哪吒',
-        '10494' => '厦门-古维天',
+        '10494' => '厦门-古惟天',
         '10495' => '厦门-7',
         '10496' => '厦门-8',
         '10497' => '厦门-9',
@@ -405,15 +405,15 @@ class Customer extends HD_Controller
                     continue;
                 }
 
-                if($v['brand_id']){
-                    $brand = $this->auto_brand_model->get(['id' => $v['brand_id']]);
-                    $brand_id = $brand['ah_id'];
-                }
-
-                if($v['series_id']){
-                    $series = $this->auto_series_model->get(['id' => $v['series_id']]);
-                    $series_id = $series['ah_id'];
-                }
+//                if($v['brand_id']){
+//                    $brand = $this->auto_brand_model->get(['id' => $v['brand_id']]);
+//                    $brand_id = $brand['ah_id'];
+//                }
+//
+//                if($v['series_id']){
+//                    $series = $this->auto_series_model->get(['id' => $v['series_id']]);
+//                    $series_id = $series['ah_id'];
+//                }
 
                 $push_data = array(
                     'pushAppKey' => $this->pushAppKey,
@@ -428,9 +428,9 @@ class Customer extends HD_Controller
                     'keyOrderCityId' => $v['city_id'] ? $v['city_id'] : '110100',
                     'keyName' => '客户'.$v['id'],
                     'keyPhone' => $v['mobile'],
-                    'keyPurposeBrandId' => $brand_id ? $brand_id : null,
+                    'keyPurposeBrandId' => $v['brand_id'] ? $v['brand_id'] : null,
                     'keyPurposeFactoryId' => null,
-                    'keyCarAudiId' => $series_id ? $series_id : null,
+                    'keyCarAudiId' => $v['series_id'] ? $v['series_id'] : null,
                     'keyCarTypeId' => null,
                     'keyCardCityId' => $v['city_id'] ? $v['city_id'] : '110100',
                     'keyNewCarRentSupplierId' => 10

admin/views/auto/cars/lists.php

@@ -56,8 +56,7 @@
                         <td>
                             <label><input type="checkbox" name="ids[]" class="ids" :value="v.id"/></label>
                             <span>{{v.id}}</span>
-                        </td>
-                        <td>{{v.third_car_id}}</td>
+                        </td
                         <td>{{v.brand}}</td>
                         <td>{{v.series}}</td>
                         <td>{{v.name}}</td>

api/controllers/wxapp/app/Series.php

@@ -70,7 +70,7 @@ class Series extends Wxapp{
         $keyword && $where["name like '%{$keyword}%'"] = null;
 
         $count = $this->auto_brand_model->count($where);
-        $list = $this->auto_brand_model->select($where,'', 0, 0, 'id,name');
+        $list = $this->auto_brand_model->select($where,'initial asc', 0, 0, 'id,name');
         $data = [
             'list' => $list,
             'total' => $count

common/libraries/receiver/Orders_entity.php

@@ -41,7 +41,7 @@ class Orders_entity
             'buyerType' => $order_row['main_type'] ? 2 : 1,
             'buyerName' => $order_row['name'],
             'buyerPhone' => $order_row['mobile'],
-            'specId' => intval($car_row['third_car_id']),
+            'specId' => intval($car_row['id']),
             'outOrderId' => $order_row['sid'],
             'outLeadId' => $customer_row['cid'],
             'outOrderCreateTime' => date('Y-m-d H:i:s', $order_row['c_time']),