Commit 2d130ad8 authored by wuwz's avatar wuwz

增加首页标签和距离

parent c4645c26
...@@ -44,13 +44,16 @@ public class AppHomeController extends BaseController<CofigBiz,Cofig> { ...@@ -44,13 +44,16 @@ public class AppHomeController extends BaseController<CofigBiz,Cofig> {
public ObjectRestResponse<List<GoodDataVO>> goodList( public ObjectRestResponse<List<GoodDataVO>> goodList(
@RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "limit",defaultValue = "4") Integer limit, @RequestParam(value = "limit",defaultValue = "4") Integer limit,
@RequestParam(value = "type",defaultValue = "1") Integer type @RequestParam(value = "type",defaultValue = "1") Integer type,
@RequestParam(value = "longitude", required = false) Double longitude,
@RequestParam(value = "latitude", required = false) Double latitude
){ ){
List<GoodDataVO> list=new ArrayList<>(); List<GoodDataVO> list=new ArrayList<>();
if (type==2){ if (type==2){
list=tourFeign.goodList(page,limit); list=tourFeign.goodList(page,limit);
}else if (type==3){ }else if (type==3){
list=campsiteFeign.goodList(page,limit); //list=campsiteFeign.goodList(page,limit);
list=campsiteFeign.goodList(page,limit,longitude,latitude);
}else if (type==4){ }else if (type==4){
return vehicleFeign.goodList(page,limit); return vehicleFeign.goodList(page,limit);
} }
......
...@@ -25,10 +25,16 @@ import java.util.List; ...@@ -25,10 +25,16 @@ import java.util.List;
@FeignClient(name = "xx-campsite",path = "/campsiteShop") @FeignClient(name = "xx-campsite",path = "/campsiteShop")
public interface CampsiteFeign { public interface CampsiteFeign {
/*@ApiOperation("首页营地列表")
@GetMapping(value = "/app/shopList")
List<GoodDataVO> goodList(@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "limit", defaultValue = "4") Integer limit);*/
@ApiOperation("首页营地列表") @ApiOperation("首页营地列表")
@GetMapping(value = "/app/shopList") @GetMapping(value = "/app/shopList")
List<GoodDataVO> goodList(@RequestParam(value = "page", defaultValue = "1") Integer page, List<GoodDataVO> goodList(@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "limit", defaultValue = "4") Integer limit); @RequestParam(value = "limit", defaultValue = "4") Integer limit,
@RequestParam(value = "longitude", required = false) Double longitude,
@RequestParam(value = "latitude", required = false) Double latitude);
@GetMapping(value = "/app/unauth/findRandomVehicle") @GetMapping(value = "/app/unauth/findRandomVehicle")
ObjectRestResponse findRandomVehicle(@RequestParam(value = "number") Integer number); ObjectRestResponse findRandomVehicle(@RequestParam(value = "number") Integer number);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment