Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

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

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xxfc.platform.tour.entity.TourGood;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -20,19 +21,32 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-public class TourGoodBiz extends BaseBiz<TourGoodMapper,TourGood> {
+public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
 
     @Autowired
     private TourGoodMapper tourGoodMapper;
 
-    public PageDataVO<TourGood> getGoodList(int page, int limit , String query , Double latitude, Double longitude, Integer tagId, Double distance){
-        Map<String,Object> params = new HashMap<String,Object>();
-        params.put("query",query);
-        params.put("latitude",latitude);
-        params.put("longitude",longitude);
-        params.put("tagId",tagId);
-        params.put("distance",distance);
-//        List<TourGood> list = tourGoodMapper.getGoodList(params);
-        return  PageDataVO.pageInfo(page, limit, mapper.getGoodList(params));
+    /**
+     * 查询旅游路线列表
+     *
+     * @param page
+     * @param limit
+     * @param query
+     * @param latitude
+     * @param longitude
+     * @param tagId
+     * @param distance
+     * @return
+     */
+    public PageDataVO<TourGood> getGoodList(int page, int limit, String query, Double latitude, Double longitude, Integer tagId, Double distance) {
+        //查询参数
+        Map<String, Object> params = new HashMap<String, Object>();
+        params.put("query", query);
+        params.put("latitude", latitude);
+        params.put("longitude", longitude);
+        params.put("tagId", tagId);
+        params.put("distance", distance);
+//      List<TourGood> list = tourGoodMapper.getGoodList(params);
+        return PageDataVO.pageInfo(page, limit, mapper.getGoodList(params));
     }
 }
\ No newline at end of file

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

@@ -18,5 +18,6 @@ public interface TourGoodMapper extends Mapper<TourGood> {
     //获取商品信息
     public  TourGood getOne(@Param("id")Integer id);
 
+    //查询旅游路线列表
 	public List<TourGood> getGoodList(@Param("params") Map<String,Object> map);
 }

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

@@ -13,17 +13,28 @@ import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("tourGood")
-public class TourGoodController extends BaseController<TourGoodBiz,TourGood> {
+public class TourGoodController extends BaseController<TourGoodBiz, TourGood> {
 
-    @ApiOperation("订单详情")
-    @RequestMapping(value = "/app/unauth/getGoodList",method = RequestMethod.GET)
-    //@GetMapping(value = "/app/unauth/getGoodList")
+    /**
+     * 查询旅游路线列表
+     *
+     * @param page
+     * @param limit
+     * @param query
+     * @param latitude
+     * @param longitude
+     * @param tagId
+     * @param distance
+     * @return
+     */
+    @ApiOperation("查询旅游路线列表")
+    @RequestMapping(value = "/app/unauth/getGoodList", method = RequestMethod.GET)
     @IgnoreClientToken
     @ResponseBody
-    public PageDataVO<TourGood> getGoodList(@RequestParam(value = "page", required=true) Integer page, @RequestParam(value = "limit", required=true) Integer limit ,
-                                            @RequestParam(value = "query") String query , @RequestParam(value = "latitude", required=false) Double latitude, @RequestParam(value = "longitude", required=false) Double longitude,
-                                            @RequestParam(value = "tagId", required=false) Integer tagId, @RequestParam(value = "distance",defaultValue = "10.00") Double distance){
-        //BaseResponse baseResponse = new BaseResponse();
+    public PageDataVO<TourGood> getGoodList(@RequestParam(value = "page", required = true) Integer page, @RequestParam(value = "limit", required = true) Integer limit,
+                                            @RequestParam(value = "query") String query, @RequestParam(value = "latitude", required = false) Double latitude,
+                                            @RequestParam(value = "longitude", required = false) Double longitude, @RequestParam(value = "tagId", required = false) Integer tagId,
+                                            @RequestParam(value = "distance", defaultValue = "10.00") Double distance) {
         return baseBiz.getGoodList(page, limit, query, latitude, longitude, tagId, distance);
     }
 }
\ No newline at end of file

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

@@ -25,6 +25,7 @@
         <result property="unit" column="unit"/>
     </resultMap>
 
+    <!--查询旅游路线列表-->
     <select id="getGoodList" parameterType="java.util.Map" resultMap="tourGoodMap">
         SELECT * from tour_good t
         where  1=1