Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
bed38200eb
|
@ -118,6 +118,22 @@ public class AppArtificerController {
|
||||||
sort,authentication,by,-1,city,classifyId,phone,1,isStart);
|
sort,authentication,by,-1,city,classifyId,phone,1,isStart);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询附近技师列表
|
||||||
|
* @param page 第几页
|
||||||
|
* @param limit 每页几条
|
||||||
|
* @param artificerName 技师姓名
|
||||||
|
* @param longitude 精度
|
||||||
|
* @param latitude 维度
|
||||||
|
* @param city 城市
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/selectNearByArtificerList")
|
||||||
|
@ApiOperation("查询附近技师列表")
|
||||||
|
public Result selectNearByArtificerList(Integer page, Integer limit, String artificerName, String longitude,String latitude,String city){
|
||||||
|
return artificerService.selectNearByArtificerList(page, limit, artificerName,longitude,latitude,city);
|
||||||
|
}
|
||||||
|
|
||||||
@GetMapping("/selectArtificerMassageList")
|
@GetMapping("/selectArtificerMassageList")
|
||||||
@ApiOperation("查询技师服务列表")
|
@ApiOperation("查询技师服务列表")
|
||||||
public Result selectArtificerMassageList(Long artificerId,Integer status){
|
public Result selectArtificerMassageList(Long artificerId,Integer status){
|
||||||
|
|
|
@ -37,4 +37,6 @@ public interface ArtificerService extends IService<Artificer> {
|
||||||
Result storedValue(String date,String type,String artificerId);
|
Result storedValue(String date,String type,String artificerId);
|
||||||
|
|
||||||
Result selectArtificerByArtificerId(Long artificerId);
|
Result selectArtificerByArtificerId(Long artificerId);
|
||||||
|
|
||||||
|
Result selectNearByArtificerList(Integer page, Integer limit, String artificerName, String longitude, String latitude, String city);
|
||||||
}
|
}
|
|
@ -422,4 +422,11 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
|
||||||
public Result selectArtificerByArtificerId(Long artificerId) {
|
public Result selectArtificerByArtificerId(Long artificerId) {
|
||||||
return Result.success().put("data", baseMapper.selectById(artificerId));
|
return Result.success().put("data", baseMapper.selectById(artificerId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Result selectNearByArtificerList(Integer page, Integer limit, String artificerName, String longitude, String latitude, String city) {
|
||||||
|
Page<Artificer> pages=new Page<>(page,limit);
|
||||||
|
IPage<Artificer> artificerIPage = baseMapper.selectArtificerList(pages, null, artificerName,longitude, latitude, 1, 2, 1, -1, city, null,"",1);
|
||||||
|
return Result.success().put("data",new PageUtils(artificerIPage));
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue