Pu Zhibing
2025-05-16 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc
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();
@@ -163,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();