From 6d85e681bb7a4c2aba7558b943f84741be1416bf Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 07 三月 2025 18:34:06 +0800 Subject: [PATCH] 2.0新增 --- DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java index b1a075b..6a82ee6 100644 --- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java +++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java @@ -9,6 +9,7 @@ import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService; import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar; import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService; +import com.stylefeng.guns.modular.system.dao.TNoticesMapper; import com.stylefeng.guns.modular.system.dao.TUseMoneyMapper; import com.stylefeng.guns.modular.system.model.*; import com.stylefeng.guns.modular.system.util.ALiSendSms; @@ -77,7 +78,24 @@ private IOrderLogisticsService orderLogisticsService; @Autowired private IInviteService inviteService; + @Autowired + private TNoticesMapper noticesMapper; + @ResponseBody + @PostMapping("/api/user/allert") + @ApiOperation(value = "获取公告弹窗", tags = {"司机端-2.0新增"}, notes = "") + public ResultUtil<List<TNotices>> allert(){ + try { + List<TNotices> tNotices = noticesMapper.selectList(new EntityWrapper<TNotices>() + .eq("type", 2).eq("isDriver",2) + .eq("isShow", 1).ne("flag", 3).eq("isAlert",1).eq("isDelete", 1) + ); + return ResultUtil.success(tNotices); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } /** * 获取用户邀请二维码 * @param request @@ -99,11 +117,12 @@ if (userInfo.getCode()==null){ userInfo = driverService.generateCode(userInfo); } + driverService.generateCode(userInfo); Map<String, String> res = new HashMap<>(); res.put("code",userInfo.getCode()); int i = inviteService.selectCount(new EntityWrapper<Invite>() .eq("inviteUserId", uid) - .eq("useType", 2)); + .eq("userType", 2)); res.put("inviteNumber",i+""); return ResultUtil.success(res); @@ -111,6 +130,17 @@ e.printStackTrace(); return ResultUtil.runErr(); } + } + @ResponseBody + @PostMapping("/api/auser/testCode") + @ApiOperation(value = "测试小程序二维码", tags = {"司机端-2.0新增"}, notes = "") + @ApiImplicitParams({ + @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") + }) + public ResultUtil testCode(){ + String s = driverService.generateQrCodeTemp(); + return ResultUtil.success(s); + } /** @@ -138,6 +168,7 @@ startTime = startTime + " 00:00:00"; endTime = endTime + " 23:59:59"; } + pageNum = (pageNum - 1) * size; List<Invite> invites = inviteService.inviteList(uid,startTime,endTime,pageNum,size); for (Invite invite : invites) { // 将手机号phone中间四位替换为* -- Gitblit v1.7.1