123

xx-app/xx-app-api/pom.xml

@@ -17,6 +17,11 @@
         <artifactId>xx-campsite-api</artifactId>
         <version>2.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+        <groupId>com.xxfc.platform</groupId>
+        <artifactId>xx-tour-api</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </dependency>
    </dependencies>
 
 </project>
\ No newline at end of file

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppHomeController.java

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.xxfc.platform.app.biz.CofigBiz;
 import com.xxfc.platform.app.entity.Cofig;
 import com.xxfc.platform.campsite.feign.CampsiteFeign;
+import com.xxfc.platform.tour.feign.TourFeign;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,9 @@ public class AppHomeController extends BaseController<CofigBiz,Cofig> {
     @Autowired
     CampsiteFeign campsiteFeign;
 
+    @Autowired
+    TourFeign tourFeign;
+
     @RequestMapping(value ="/app/unauth/goodList",method = RequestMethod.GET)
     @IgnoreUserToken
     public ObjectRestResponse<List<GoodDataVO>> goodList(
@@ -40,9 +44,9 @@ public class AppHomeController extends BaseController<CofigBiz,Cofig> {
     ){
         List<GoodDataVO> list=new ArrayList<>();
         if (type==2){
-            list=campsiteFeign.goodList(page,limit);
+            list=tourFeign.goodList(page,limit);
         }else if (type==3){
-
+            list=campsiteFeign.goodList(page,limit);
         }
         return  new ObjectRestResponse<>().rel(true).data(list);
     }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/feign/TourFeign.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.tour.feign;
 
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.tour.dto.TourSpePriceDTO;
 import com.xxfc.platform.tour.entity.TourGood;
@@ -10,6 +11,7 @@ import com.xxfc.platform.tour.entity.TourUser;
 import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
 import com.xxfc.platform.tour.vo.TourGoodOrderVo;
 import com.xxfc.platform.tour.vo.TourSpePriceVo;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -83,4 +85,9 @@ public interface TourFeign {
      */
     @GetMapping("/tourGood/verfication/orders")
     PageDataVO<TourGoodOrderVo> findTourGoodOrders(@RequestParam Map<String,Object> tourGoodOrderFindVo);
+
+    @ApiOperation("首页旅游列表")
+    @GetMapping(value = "/tourGood/app/shopList")
+    public List<GoodDataVO> goodList(@RequestParam(value = "page", defaultValue = "1") Integer page,
+                                     @RequestParam(value = "limit",defaultValue = "4") Integer limit);
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.constant.RestCode;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.tour.dto.*;
 import com.xxfc.platform.tour.entity.*;
@@ -310,6 +311,16 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
         }
     }
 
+    /**
+     * 首页旅游列表
+     * @param page
+     * @param limit
+     * @return
+     */
+    public  List<GoodDataVO> getAllByHome(Integer page, Integer limit){
+        return  mapper.findAllByHome((page-1)*limit,limit);
+    };
+
 }
 
 

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodMapper.java

 package com.xxfc.platform.tour.mapper;
 
+import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.xxfc.platform.tour.dto.GoodSearchDTO;
 import com.xxfc.platform.tour.entity.TourGood;
 import com.xxfc.platform.tour.vo.TourGoodVo;
@@ -25,4 +26,12 @@ public interface TourGoodMapper extends Mapper<TourGood> {
 
 	//获取商品列表
     public List<TourGoodVo> findGoodList(@Param("params") GoodSearchDTO tourGoodDTO);
+
+    /**
+     * 首页旅游列表
+     * @param start
+     * @param size
+     * @return
+     */
+    List<GoodDataVO> findAllByHome(@Param("start") Integer start, @Param("size") Integer size);
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodController.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.tour.rest;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.xxfc.platform.tour.biz.TourGoodBiz;
 import com.xxfc.platform.tour.dto.GoodSearchDTO;
 import com.xxfc.platform.tour.entity.TourGood;
@@ -44,10 +45,11 @@ public class TourGoodController extends BaseController<TourGoodBiz, TourGood> {
         return ObjectRestResponse.succ(baseBiz.getOne(id));
     }
 
-    @ApiOperation("首页查询旅游路线列表")
-    @RequestMapping(value = "/app/goodList", method = RequestMethod.POST)
-    public List<TourGoodVo> goodList(@RequestBody GoodSearchDTO dto) {
-        return baseBiz.getAll(dto).getData();
+    @ApiOperation("首页旅游列表")
+    @GetMapping(value = "/app/shopList")
+    public List<GoodDataVO> goodList(@RequestParam(value = "page", defaultValue = "1") Integer page,
+                                     @RequestParam(value = "limit",defaultValue = "4") Integer limit) {
+        return baseBiz.getAllByHome(page,limit);
     }
 
 

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodMapper.xml

@@ -77,6 +77,19 @@
 
     </select>
 
+    <!--首页查询全部-->
+    <select id="findAllByHome" resultType="com.github.wxiaoqi.security.common.vo.GoodDataVO">
+        SELECT g.id as `id`,g.name as `name`,g.cover as `imgUrl`,g.price,
+        REPLACE(GROUP_CONCAT( DISTINCT t.`name`),',','|')as name1
+          from tour_good g
+          LEFT JOIN tour_good_tag tag ON g.id=tag.good_id
+        LEFT JOIN tour_tag t ON tag.tag_id=t.id
+         where g.recommend=1
+         GROUP BY g.id
+        ORDER BY g.rank DESC ,g.id DESC
+        limit #{start,jdbcType=INTEGER},#{size,jdbcType=INTEGER}
+    </select>
+
     <select id="getOne" resultMap="tourGoodMap">
     SELECT *  FROM tour_good  WHERE  id =#{id} and is_del=0
 </select>