From 4ae63f619955841a94a8100b84674cc8e4d69a0d Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 07 四月 2025 11:42:44 +0800 Subject: [PATCH] 修改短信模版号 --- DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 66 ++++++++++++++++++++++++++++---- 1 files changed, 57 insertions(+), 9 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 6dc4398..1764a8f 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; @@ -23,6 +24,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @@ -76,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 @@ -88,7 +107,7 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<String> getCode(HttpServletRequest request){ + public ResultUtil<Map<String,String>> getCode(HttpServletRequest request){ try { Integer uid = driverService.getUserIdFormRedis(request); if(null == uid){ @@ -98,12 +117,32 @@ if (userInfo.getCode()==null){ userInfo = driverService.generateCode(userInfo); } - return ResultUtil.success(userInfo.getCode()); + 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("userType", 2)); + + res.put("inviteNumber",i+""); + return ResultUtil.success(res); }catch (Exception e){ 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); + + } + /** * 获取用户邀请二维码 * @param request @@ -119,7 +158,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 inviteList(String startTime,String endTime,Integer pageNum,Integer size,HttpServletRequest request){ + public ResultUtil<List<Invite>> inviteList(String startTime,String endTime,Integer pageNum,Integer size,HttpServletRequest request){ try { Integer uid = driverService.getUserIdFormRedis(request); if(null == uid){ @@ -129,7 +168,16 @@ 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中间四位替换为* + String phone = invite.getPhone(); + if (phone != null && phone.length() > 4) { + phone = phone.substring(0, 3) + "****" + phone.substring(7); + invite.setPhone(phone); + } + } return ResultUtil.success(invites); }catch (Exception e){ e.printStackTrace(); @@ -306,22 +354,22 @@ String templateCode = null; switch (type){ case 1: - templateCode = "SMS_476880205";//身份验证 + templateCode = "SMS_482775061";//身份验证 break; case 2: - templateCode = "SMS_476880205";//登录确认 + templateCode = "SMS_482775061";//登录确认 break; case 3: - templateCode = "SMS_476880205";//用户注册 + templateCode = "SMS_482775061";//用户注册 break; case 4: - templateCode = "SMS_476880205";//修改密码 + templateCode = "SMS_482775061";//修改密码 break; case 5: - templateCode = "SMS_476880205";//司机注册成功 + templateCode = "SMS_482775061";//司机注册成功 break; case 6: - templateCode = "SMS_476880205";//司机注册失败 + templateCode = "SMS_482775061";//司机注册失败 break; } String s = aLiSendSms.sendSms(driver.getPhone(), templateCode, "{}"); -- Gitblit v1.7.1