From 49e88798dcea0164f77c59f0be9eefdf67a3d228 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 七月 2024 15:03:10 +0800
Subject: [PATCH] 2.0bug修改
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/IntegralGoodsController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 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 7c0bfba..5c91e22 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,8 @@
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;
@@ -50,11 +52,30 @@
@PostMapping("/queryArea")
@ApiOperation(value = "获取大区列表", tags = {"用户端-积分相关"}, notes = "")
@ApiImplicitParams({
+ @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<List<Area>> queryArea(){
+ public ResultUtil<List<Map<String,Object>>> queryArea(Integer language,HttpServletRequest request){
try {
- return ResultUtil.success(areaService.selectList(new EntityWrapper<Area>()));
+ List<Area> areas = areaService.selectList(new EntityWrapper<Area>());
+ List<Map<String,Object>> result = new ArrayList<>();
+ for (Area area : areas) {
+ Map<String,Object> map = new HashMap<>(2);
+ map.put("id",area.getId());
+ switch (language){
+ case 1:
+ map.put("cityName",area.getChineseName());
+ break;
+ case 2:
+ map.put("cityName",area.getEnglishName());
+ break;
+ case 3:
+ map.put("cityName",area.getFrenchName());
+ break;
+ }
+ result.add(map);
+ }
+ return ResultUtil.success(result);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -145,15 +166,16 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "1=中文，2=英文，3=法语", name = "language", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<IntegralOrderWarpper>> queryConvertHistory(Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<IntegralOrderWarpper>> queryConvertHistory(Integer pageNum, Integer size,Integer language, HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String, Object>> list = integralOrderService.queryConvertHistory(pageNum, size, uid);
+ List<Map<String, Object>> list = integralOrderService.queryConvertHistory(pageNum, size, uid,language);
return ResultUtil.success(IntegralOrderWarpper.getIntegralOrderWarppers(list));
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1