From 1e4181e2131350b15fd5538532331e333631c64f Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 20 七月 2023 18:00:54 +0800 Subject: [PATCH] 更新接口 --- DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java index 97f1fe5..6d4c164 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java @@ -625,13 +625,13 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil queryHomeNum(HttpServletRequest request){ + public ResultUtil queryHomeNum(Integer language, HttpServletRequest request){ try { Integer uid = driverService.getUserIdFormRedis(request); if(null == uid){ return ResultUtil.tokenErr(); } - Map<String, Object> map = driverService.queryHomeNum(uid); + Map<String, Object> map = driverService.queryHomeNum(uid, language); return ResultUtil.success(map); }catch (Exception e){ e.printStackTrace(); @@ -652,14 +652,14 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<List<BaseWarpper>> queryMyBusiness(HttpServletRequest request){ + public ResultUtil<List<BaseWarpper>> queryMyBusiness(Integer language, HttpServletRequest request){ try { Integer uid = driverService.getUserIdFormRedis(request); if(null == uid){ return ResultUtil.tokenErr(); } // TODO: 2020/7/21 修改为个人中心中设置的接单业务类型。 - List<BaseWarpper> list = driverService.queryMyBusiness(uid); + List<BaseWarpper> list = driverService.queryMyBusiness(uid, language); List<Integer> integers = driverOrdersService.queryOrders(uid); List<BaseWarpper> data = new ArrayList<>(); @@ -843,13 +843,13 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<List<OrdersWarpper>> querySetOrders(HttpServletRequest request){ + public ResultUtil<List<OrdersWarpper>> querySetOrders(Integer language, HttpServletRequest request){ try { Integer uid = driverService.getUserIdFormRedis(request); if(null == uid){ return ResultUtil.tokenErr(); } - List<BaseWarpper> list = driverService.queryMyBusiness(uid); + List<BaseWarpper> list = driverService.queryMyBusiness(uid, language); List<Integer> integers = driverOrdersService.queryOrders(uid); List<OrdersWarpper> data = new ArrayList<>(); for(BaseWarpper b : list){ @@ -1028,7 +1028,7 @@ @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<List<BaseWarpper>> queryActivityIncome(Integer pageNum, Integer size, HttpServletRequest request){ + public ResultUtil<List<BaseWarpper>> queryActivityIncome(Integer pageNum, Integer size, Integer language, HttpServletRequest request){ try { Integer uid = driverService.getUserIdFormRedis(request); if(null == uid){ @@ -1040,7 +1040,7 @@ BaseWarpper baseWarpper = new BaseWarpper(); baseWarpper.setDay(String.valueOf(null != map.get("time") ? map.get("time") : "")); baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0))); - baseWarpper.setName("活动奖励"); + baseWarpper.setName(language == 1 ? "活动奖励" : language == 2 ? "Activity reward" : "Récompenses pour événements"); data.add(baseWarpper); } return ResultUtil.success(data); @@ -1066,7 +1066,7 @@ @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<List<BaseWarpper>> queryTotalRevenue(Integer pageNum, Integer size, HttpServletRequest request){ + public ResultUtil<List<BaseWarpper>> queryTotalRevenue(Integer pageNum, Integer size, Integer language, HttpServletRequest request){ try { Integer uid = driverService.getUserIdFormRedis(request); if(null == uid){ @@ -1080,19 +1080,19 @@ baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0))); switch (Integer.valueOf(String.valueOf(null != map.get("orderType") ? map.get("orderType") : 0))){ case 1: - baseWarpper.setName("专车"); + baseWarpper.setName(language == 1 ? "专车" : language == 2 ? "Special car" : "véhicules"); break; case 2: - baseWarpper.setName("出租车"); + baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi"); break; case 3: - baseWarpper.setName("城际出行"); + baseWarpper.setName(language == 1 ? "城际出行" : language == 2 ? "Intercity travel" : "Mobilité entre villes"); break; case 4: - baseWarpper.setName("市内小件物流"); + baseWarpper.setName(language == 1 ? "市内小件物流" : language == 2 ? "Small parts logistics in the city" : "Logistique de petites pièces dans la ville"); break; case 5: - baseWarpper.setName("跨城小件物流"); + baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville"); break; } Map<String, Object> map1 = new HashMap<>(); -- Gitblit v1.7.1