修改故障限价

app/adminapi/lists/fault_code/FaultCodeLists.php

@@ -39,7 +39,7 @@ class FaultCodeLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['status','type'],
+            '=' => ['status'],
             '%like%' => ['codes', 'name', 'detail'],
         ];
     }
@@ -48,7 +48,12 @@ class FaultCodeLists extends BaseAdminDataLists implements ListsSearchInterface
     {
         $where = [];
         if (isset($this->params['type_id']) && $this->params['type_id'] !== '') {
-            $where[] = ['type_id', '=', $this->params['type_id']];
+            $pid = FaultType::where('id', $this->params['type_id'])->value('pid');
+            if ($pid == 0) {
+                $where[] = ['type_id', 'in', FaultType::where('pid', $this->params['type_id'])->column('id')];
+            } else {
+                $where[] = ['type_id', '=', $this->params['type_id']];
+            }
         }
         return $where;
     }
@@ -68,7 +73,7 @@ class FaultCodeLists extends BaseAdminDataLists implements ListsSearchInterface
             ->where($this->queryWhere())
             ->field(['*'])
             ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
+            ->order(['id' => 'asc'])
             ->select()
             ->toArray();
     }

app/adminapi/lists/fault_type/FaultTypeLists.php

@@ -81,7 +81,7 @@ class FaultTypeLists extends BaseAdminDataLists implements ListsSearchInterface
             ->field("a.*,b.name as category_name")
             ->limit($this->limitOffset, $this->limitLength)
             ->append(['status_desc'])
-            ->order(['a.sort' => 'desc', 'a.id' => 'desc'])
+            ->order(['a.sort' => 'desc', 'a.id' => 'asc'])
             ->select()
             ->toArray();
         return $lists;

app/adminapi/logic/fault_type/FaultTypeLogic.php

@@ -152,7 +152,7 @@ class FaultTypeLogic extends BaseLogic
     {
         $data = FaultType::where('status',1)
             ->field('id,pid,name,sort,category_type,goods_category_id')
-            ->order(['sort'=> 'desc','id' => 'desc'])
+            ->order(['sort'=> 'desc','id' => 'asc'])
             ->select()
             ->toArray();
         if($search == 'all'){

app/common/command/FaultInit.php

@@ -91,16 +91,16 @@ class FaultInit extends Command
      */
     protected function getData($productId, $category_type, $goods_category_id)
     {
-        $type_list = [
-            '维修项目' => '1',
-            '特殊项目' => '2', 
-            '仅检测' => '3',
-            '仅维修' => '4',
-            '检测+维修' => '5',
-            '服务收费' => '6',
-            '特殊故障' => '7',
-            '产品销售' => '8',
-        ];
+        // $type_list = [
+        //     '维修项目' => '1',
+        //     '特殊项目' => '2', 
+        //     '仅检测' => '3',
+        //     '仅维修' => '4',
+        //     '检测+维修' => '5',
+        //     '服务收费' => '6',
+        //     '特殊故障' => '7',
+        //     '产品销售' => '8',
+        // ];
         $params = [
             'cityId' => '500100',
             'productId' => $productId,
@@ -113,23 +113,30 @@ class FaultInit extends Command
             if (!empty($response['data']['chargingStandardList'])) {
                 $data = $response['data']['chargingStandardList'];
                 foreach($data as $item) {
+                    //一级分类
                     $res = FaultType::create([
                         'name' => $item['productName'], //分类名称
                         'category_type' => $category_type,
                         'goods_category_id' => $goods_category_id,
                         'pid' => 0
                     ]);
-                    $type_id = $res->id;
+                    $pid = $res->id;
 
                     $list = $item['itemTypeList'];//故障限价列表
                     foreach($list as $v) {
-                        $type = isset($type_list[$v['itemTypeName']]) ? $type_list[$v['itemTypeName']] : 0;
+                        //二级分类
+                        $res = FaultType::create([
+                            'name' => $v['itemTypeName'], //分类名称
+                            'category_type' => $category_type,
+                            'goods_category_id' => $goods_category_id,
+                            'pid' => $pid
+                        ]);
+                        $type_id = $res->id;
                         foreach($v['itemList'] as $vv) {
                             FaultCode::create([
                                 'type_id' => $type_id,
                                 'name' => $vv['itemName'],
                                 'price' => $vv['price'],
-                                'type' => $type,
                             ]);
                         }
                     }