From 48effdca685a209c19dd2a0ccd456470a895784b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 十月 2024 18:01:18 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OpenCityController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 780c6e3..cb3e889 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
@@ -86,9 +86,10 @@
@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, Integer language){
+ public ResultUtil<List<BaseWarpper>> queryBusiness(Double lat, Double lnt, Integer language, HttpServletRequest request){
try {
- List<BaseWarpper> list = openCityBusinessService.queryBusiness(lat, lnt, language);
+ Integer uid = userInfoService.getUserIdFormRedis(request);
+ List<BaseWarpper> list = openCityBusinessService.queryBusiness(uid, lat, lnt, language);
return ResultUtil.success(list);
}catch (Exception e){
e.printStackTrace();
@@ -130,9 +131,10 @@
@ApiImplicitParam(value = "纬度", name = "lat", required = true, dataType = "String"),
@ApiImplicitParam(value = "经度", name = "lnt", required = true, dataType = "String")
})
- public ResultUtil openCity(Double lat, Double lnt, Integer language){
+ public ResultUtil openCity(Double lat, Double lnt, Integer language, HttpServletRequest request){
try {
- City city = openCityService.openCity(lat, lnt, language);
+ Integer uid = userInfoService.getUserIdFormRedis(request);
+ City city = openCityService.openCity(uid, lat, lnt, language);
if(null == city){
return ResultUtil.error("");
}
--
Gitblit v1.7.1