From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OpenCityController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OpenCityController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OpenCityController.java
index 0628edc..13b9f60 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OpenCityController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OpenCityController.java
@@ -76,10 +76,11 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "纬度", name = "lat", required = true, dataType = "double"),
@ApiImplicitParam(value = "经度", name = "lnt", required = true, dataType = "double"),
+ @ApiImplicitParam(value = "语言类型（1=简体中文，2=英语，3=法语）", name = "language", required = false, dataType = "int"),
})
- public ResultUtil<List<BaseWarpper>> queryBusiness(Double lat, Double lnt){
+ public ResultUtil<List<BaseWarpper>> queryBusiness(Double lat, Double lnt, Integer language){
try {
- List<BaseWarpper> list = openCityBusinessService.queryBusiness(lat, lnt);
+ List<BaseWarpper> list = openCityBusinessService.queryBusiness(lat, lnt, language);
return ResultUtil.success(list);
}catch (Exception e){
e.printStackTrace();
@@ -97,11 +98,12 @@
@PostMapping("/queryBusinessById")
@ApiOperation(value = "选择开通城市获取业务类型", tags = {"用户端-首页"}, notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(value = "开通城市id", name = "id", required = true, dataType = "int")
+ @ApiImplicitParam(value = "开通城市id", name = "id", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "语言类型（1=简体中文，2=英语，3=法语）", name = "language", required = false, dataType = "int"),
})
- public ResultUtil<List<BaseWarpper>> queryBusinessById(Integer id){
+ public ResultUtil<List<BaseWarpper>> queryBusinessById(Integer id, Integer language){
try {
- List<BaseWarpper> list = openCityBusinessService.queryBusinessById(id);
+ List<BaseWarpper> list = openCityBusinessService.queryBusinessById(id, language);
return ResultUtil.success(list);
}catch (Exception e){
e.printStackTrace();
@@ -115,16 +117,16 @@
*/
@ResponseBody
@PostMapping("/openCity")
- @ApiOperation(value = "判断当前是否是开通城市【1.0】", tags = {"用户端-首页"}, notes = "open=1（是），open=2（否）")
+ @ApiOperation(value = "判断当前是否是开通城市【1.0】", tags = {"用户端-首页"})
@ApiImplicitParams({
@ApiImplicitParam(value = "纬度", name = "lat", required = true, dataType = "String"),
@ApiImplicitParam(value = "经度", name = "lnt", required = true, dataType = "String")
})
- public ResultUtil openCity(Double lat, Double lnt){
+ public ResultUtil openCity(Double lat, Double lnt, Integer language){
try {
- boolean b = openCityService.openCity(lat, lnt);
+ String s = openCityService.openCity(lat, lnt, language);
Map<String, Object> map = new HashMap<>();
- map.put("open", b ? 1 : 2);
+ map.put("name", s);
return ResultUtil.success(map);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1