From cf487b4baf05048e8929b47d73efc83d6a09162c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 30 一月 2024 17:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/IntegralGoodsController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/IntegralGoodsController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/IntegralGoodsController.java
index decc4a1..099fa6a 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/IntegralGoodsController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/IntegralGoodsController.java
@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -54,12 +55,13 @@
@ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<Map<String,Object>> queryArea(Integer language,HttpServletRequest request){
+ public ResultUtil<List<Map<String,Object>>> queryArea(Integer language,HttpServletRequest request){
try {
List<Area> areas = areaService.selectList(new EntityWrapper<Area>());
- Map<String,Object> map = new HashMap<>(2);
+ List<Map<String,Object>> result = new ArrayList<>();
for (Area area : areas) {
- map.put("cityName",area.getId());
+ Map<String,Object> map = new HashMap<>(2);
+ map.put("id",area.getId());
switch (language){
case 1:
map.put("cityName",area.getChineseName());
@@ -71,8 +73,9 @@
map.put("cityName",area.getFrenchName());
break;
}
+ result.add(map);
}
- return ResultUtil.success(map);
+ return ResultUtil.success(result);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
--
Gitblit v1.7.1