Merge branch '0328_footcat_fr'

app/Controller/FooterController.php

@@ -144,29 +144,15 @@ class FooterController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if(isset($requireData['name'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'name' =>'required' 
-                ],
-                [
-                    'name.required' => '底部导航名称不能为空'
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-            $data['name'] = $requireData['name'];
-        }
-        if(isset($requireData['website_id'])){
+        if(isset($requireData['name']) && isset($requireData['website_id'])){
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
+                    'name' =>'required',
                     'website_id' =>'required'
                 ],
                 [
+                    'name.required' => '底部导航名称不能为空',
                     'website_id.required' => '网站id不能为空'
                 ]
             );
@@ -174,12 +160,8 @@ class FooterController extends AbstractController
                 $errorMessage = $validator->errors()->first();
                 return Result::error($errorMessage);
             }
-             $data['website_id'] = $requireData['website_id'];
         }
-       
-        $data['id'] = $requireData['id'];
-        // var_dump($data);
-        $result = $this->footerServiceClient->upFooterCategory($data);
+        $result = $this->footerServiceClient->upFooterCategory($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }else{
@@ -224,13 +206,13 @@ class FooterController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'type' =>'required',
+                'type_id' =>'required',
                 'fcat_id' =>'required',
                 'con_title' =>'required',
                 'content' =>'required'
             ],
             [
-                'type.required' => '底部导航类型不能为空',
+                'type_id.required' => '底部导航类型不能为空',
                 'fcat_id.required' => '底部导航id不能为空',
                 'con_title.required' => '内容标题不能为空',
                 'content.required' => '内容不能为空'
@@ -241,11 +223,12 @@ class FooterController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $data['type'] = $requireData['type'];
+        $data['type_id'] = $requireData['type_id'];
         $data['fcat_id'] = $requireData['fcat_id'];
         $data['con_title'] = $requireData['con_title'];
         $data['content'] = $requireData['content'];
-        if($data['type'] == 1){
+        // 内容型：0   列表型：1   列表标头型；2
+        if($data['type_id'] == 1){
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
@@ -255,12 +238,12 @@ class FooterController extends AbstractController
                     'list_title.required' => '列表标题不能为空'
                 ]
             );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-            $data['list_title'] = $requireData['list_title'];
         }
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data['list_title'] = $requireData['list_title'];
         // var_dump($data);
         $result = $this->footerServiceClient->addFooterContent($data);
         if ($result['code']!= ErrorCode::SUCCESS) {
@@ -293,27 +276,41 @@ class FooterController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if(isset($requireData['con_title'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'con_title' =>'required'
-                ],
-                [
-                    'con_title.required' => '内容标题不能为空'
-                ]
-            );
-            if($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-            $data['con_title'] = $requireData['con_title'];
+        $result = $this->footerServiceClient->getFooterContent($requireData);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }else{
+            return Result::success($result['data']);
         }
-        
-        $data['fcat_id'] = $requireData['fcat_id'];
-        $data['page'] = $requireData['page'];
-        $data['pageSize'] = $requireData['pageSize'];
-        $result = $this->footerServiceClient->getFooterContent($data);
+    }
+        /**
+        * 获取某个底部导航（列表）内容
+        * @return array
+        */
+        public function getOneFooterContent()
+        {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required|integer'
+            ],
+            [
+                'id.required' => '底部导航内容id不能为空',
+                'id.integer' => '底部导航内容id必须是整数'
+            ]
+        );
+        if($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data['id'] = $requireData['id'];
+        if($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        // var_dump($data);
+        $result = $this->footerServiceClient->getOneFooterContent($data);
         if ($result['code']!= ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }else{
@@ -331,13 +328,13 @@ class FooterController extends AbstractController
             $requireData,
             [
                 'id' =>'required',
-                'type' =>'required',
+                'type_id' =>'required',
                 'con_title' =>'required',
                 'content' =>'required'
             ],
             [
                 'id.required' => '底部导航内容id不能为空',
-                'type.required' => '底部导航类型不能为空',
+                'type_id.required' => '底部导航类型不能为空',
                 'con_title.required' => '内容标题不能为空',
                 'content.required' => '内容不能为空'
             ]
@@ -346,28 +343,8 @@ class FooterController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $data['id'] = $requireData['id'];
-        $data['type'] = $requireData['type'];
-        $data['con_title'] = $requireData['con_title'];
-        $data['content'] = $requireData['content'];
-        if($data['type'] == 1){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'list_title' =>'required'
-                ],
-                [
-                    'list_title.required' => '列表标题不能为空'
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-            $data['list_title'] = $requireData['list_title'];
-        }
         // var_dump($data);
-        $result = $this->footerServiceClient->upFooterContent($data);
+        $result = $this->footerServiceClient->upFooterContent($requireData);
         if ($result['code']!= ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }else{

app/JsonRpc/FooterService.php

@@ -66,6 +66,14 @@ class FooterService extends AbstractServiceClient implements FooterServiceInterf
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getOneFooterContent(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     /**
      * @param array $data
      * @return mixed

app/JsonRpc/FooterServiceInterface.php

@@ -27,6 +27,10 @@ interface FooterServiceInterface
      /**
      * @param array $data
      */
+    public function getOneFooterContent(array $data);
+     /**
+     * @param array $data
+     */
     public function addFooterContent(array $data);
      /**
      * @param array $data

config/api/footer.php

@@ -21,6 +21,8 @@ Router::addGroup(
         Router::post('/getFooterContent', [FooterController::class, 'getFooterContent']);
         /**添加底部导航（列表）内容 */
         Router::post('/addFooterContent', [FooterController::class, 'addFooterContent']);
+        /**获取底部导航（列表）内容 */
+        Router::post('/getOneFooterContent', [FooterController::class, 'getOneFooterContent']);
         /**修改底部导航（列表）内容 */
         Router::post('/upFooterContent', [FooterController::class, 'upFooterContent']);
         /**删除底部导航（列表）内容 */