From 287cbb376dea7b3972e5f38a38fad043aa4d3b68 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 01 八月 2024 16:05:33 +0800
Subject: [PATCH] 修改2.0 bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OpenCityController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 13b9f60..e15082c 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
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.api;
+import com.stylefeng.guns.modular.system.model.City;
import com.stylefeng.guns.modular.system.service.IOpenCityBusinessService;
import com.stylefeng.guns.modular.system.service.IOpenCityService;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
@@ -124,9 +125,13 @@
})
public ResultUtil openCity(Double lat, Double lnt, Integer language){
try {
- String s = openCityService.openCity(lat, lnt, language);
+ City city = openCityService.openCity(lat, lnt, language);
+ if(null == city){
+ return ResultUtil.error("");
+ }
Map<String, Object> map = new HashMap<>();
- map.put("name", s);
+ map.put("name", language == 1 ? city.getChineseName() : language == 2 ? city.getEnglishName() : city.getFrenchName());
+ map.put("content", language == 1 ? city.getCountryChineseName() : language == 2 ? city.getCountryEnglishName() : city.getCountryFrenchName());
return ResultUtil.success(map);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1