Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/PublicController.php

@@ -1210,5 +1210,61 @@ class PublicController extends AbstractController
         $result = $this->publicServiceClient->upBlackWord($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+
+    /**
+     * 获取ip信息-经纬度
+     * @return array
+     */
+    public function getIpInfo()
+    {
+
+        $result = $this->publicServiceClient->getIpInfo([]);
+        var_dump("========",$result);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /**
+     * 获取天气信息
+     * @return array
+     */
+    public function getWeatherInfo()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'latitude' => 'required',
+                'longitude' => 'required',
+            ],
+            [
+                'latitude.required' => '纬度不能为空',
+                'longitude.required' => '经度不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->getWeatherInfo($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /**
+     * 获取日历信息
+     * @return array
+     */
+    public function getCalendar()
+    {
+        $year = $this->request->input('year', date('Y'));
+        $month = $this->request->input('month', date('m'));
+        $day = $this->request->input('day', date('d'));
+        $hour = $this->request->input('day', date('H'));
+        $data['year'] = $year;
+        $data['month'] = $month;
+        $data['day'] = $day;
+        $data['hour'] = $hour;
+        $result = $this->publicServiceClient->getCalendar($data);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
 }
 

app/Controller/WebController.php

@@ -161,42 +161,25 @@ class WebController extends AbstractController
             $requireData,
             [
                 'level' => 'required',
-                'pageSize' => 'required',
+                'imgnum' => 'required',
+                'textnum' =>'required',
             ],
             [
                 'level.required' => '新闻类型不能为空',
-                'pageSize.required' => '显示条数不能为空',
-
+                'imgnum.required' => '图片新闻条数不能为空',
+                'textnum.required' => '文字新闻条数不能为空'
             ]
         );
         if ($validator->fails()){
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
-        }
-        if(isset($requireData['placeid']) && !empty($requireData['placeid'])){
-            $data =[
-            'website_id'=>Context::get("SiteId"),
-            'level'=>$requireData['level'],
-            'pageSize'=>$requireData['pageSize'],
-            'placeid' => $requireData['placeid'],
-            'id' => $requireData['id'],
-            ];
-            
-        }else{
-            $data = [
-                'website_id'=>Context::get("SiteId"),
-                'level'=>$requireData['level'],
-                'pageSize'=>$requireData['pageSize'],
-                'id' => $requireData['id'],
-            ]; 
-        }
-        $result = $this->newsServiceClient->getWebsiteArticlett($data);
-        // var_dump($result);
+        } 
+        $requireData['website_id'] = Context::get("SiteId");
+        $result = $this->newsServiceClient->getWebsiteArticlett($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }
         return Result::success($result['data']);
-        
     }
 
      /**
@@ -832,4 +815,104 @@ class WebController extends AbstractController
         $result = $this->websiteServiceClient->getWebsiteRoute($requireData); 
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
+
+
+    /*
+     * c端商城-获取商品
+     *
+    * */
+    public function getWebsiteshop()
+    {
+        $requireData = $this->request->all();   
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['website_id'] =  Context::get("SiteId") ?? 2;
+        $result = $this->newsServiceClient->getWebsiteshop($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    /*
+     * c端商城-获取商品分类
+     *
+    * */
+    public function getWebsiteshopCat()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required',
+                'page' =>'required',
+                'pageSize' =>'required'
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'page.required' => '第几页不能为空',
+                'pageSize.required' => '每页数量不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage); 
+        }
+        $requireData['website_id'] =  Context::get("SiteId")?? 2;
+        $result = $this->newsServiceClient->getWebsiteshopCat($requireData); 
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    /*
+     * c端商城-获取商品列表
+     *
+    * */
+    public function getWebsiteshopList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' =>'required',
+                'pageSize' =>'required'
+            ],
+            [
+                'page.required' => 'id不能为空',
+                'pageSize.required' => 'id不能为空',
+            ]
+        );
+        $requireData['website_id'] =  Context::get("SiteId")?? 2;
+        $result = $this->newsServiceClient->getWebsiteshopList($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    /*
+     * c端商城-获取商品详情
+     *
+     * */
+    public function getWebsiteshopInfo()
+    {
+        $requireData = $this->request->all(); 
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required',
+            ], 
+            [
+                'id.required' => 'id不能为空', 
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['website_id'] =  Context::get("SiteId")?? 2;
+        $result = $this->newsServiceClient->getWebsiteshopInfo($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
 }

app/JsonRpc/NewsService.php

@@ -298,6 +298,38 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
      * @return mixed
      */
     public function getWebsiteArticles(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteshop(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteshopCat(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteshopInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteshopList(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }

app/JsonRpc/NewsServiceInterface.php

@@ -132,6 +132,26 @@ interface NewsServiceInterface
    * @return mixed
    */
   public function getWebsiteArticles(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteshop(array $data);
+    /*
+    * @param array $data
+    * @return mixed
+    */
+    public function getWebsiteshopCat(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteshopList(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteshopInfo(array $data);
 
   /**
    * @param array $data

app/JsonRpc/PublicRpcService.php

@@ -320,4 +320,16 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    public function getIpInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getWeatherInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getCalendar(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/PublicRpcServiceInterface.php

@@ -166,5 +166,8 @@ interface PublicRpcServiceInterface
     public function addBlackWord(array $data);
     public function delBlackWord(array $data);
     public function upBlackWord(array $data);
+    public function getIpInfo(array $data);
+    public function getWeatherInfo(array $data);
+    public function getCalendar(array $data);
 
 }

app/JsonRpc/WebsiteService.php

@@ -707,4 +707,5 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data); 
     }
+   
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -463,4 +463,5 @@ interface WebsiteServiceInterface
      * @return mixed
      */
     public function getWebsiteRoute(array $data);
+    
 }

config/api/public.php

@@ -94,6 +94,9 @@ Router::addGroup(
 
         Router::post('/uploadFile', [MinioController::class, 'uploadFiles']);
 
+        Router::get('/getIpInfo', [PublicController::class, 'getIpInfo']);
+        Router::get('/getCalendar', [PublicController::class, 'getCalendar']);
+        Router::get('/getWeatherInfo', [PublicController::class, 'getWeatherInfo']);
 
     }
 );

config/api/web.php

@@ -54,6 +54,15 @@ Router::addGroup(
                 Router::get('/getWebsiteArticles', [WebController::class, 'getWebsiteArticles']);
                 // 匹配路由
                 Router::get('/getWebsiteRoute', [WebController::class, 'getWebsiteRoute']);
+                // 商城
+                // 获取商城首页
+                Router::get('/getWebsiteshop', [WebController::class, 'getWebsiteshop']);
+                // 获取商城栏目
+                Router::get('/getWebsiteshopCat', [WebController::class, 'getWebsiteshopCat']);
+                // 获取商城分类列表
+                Router::get('/getWebsiteshopList', [WebController::class, 'getWebsiteshopList']);
+                // 获取商城分类详情
+                Router::get('/getWebsiteshopInfo', [WebController::class, 'getWebsiteshopInfo']);
             },
     ['middleware' => [WebMiddleware::class]]
 );