Merge remote-tracking branch 'origin/dev' into dev

luo

2024-01-30 cf487b4baf05048e8929b47d73efc83d6a09162c

 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();