diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiMessageController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiMessageController.java index c5e4759b4..c38b3b255 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiMessageController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiMessageController.java @@ -36,13 +36,12 @@ public class ApiMessageController { * 注册审核结果,发送短信 * * @param userId 用户ID - * @param state 审核状态[AppUserAuditStateEnum] * @return com.elink.esua.epdc.commons.tools.utils.Result * @author work@yujt.net.cn * @date 2019/9/25 15:18 */ @GetMapping("sms/registerResult") - public Result sendRegisterResult(String userId, String state) { - return messageService.sendRegisterResult(userId, state); + public Result sendRegisterResult(String userId) { + return messageService.sendRegisterResult(userId); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/MessageService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/MessageService.java index a8f940923..3f361af47 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/MessageService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/MessageService.java @@ -22,10 +22,9 @@ public interface MessageService { * 注册审核结果,发送短信 * * @param userId 用户ID - * @param state 审核状态[AppUserAuditStateEnum] * @return com.elink.esua.epdc.commons.tools.utils.Result * @author work@yujt.net.cn * @date 2019/9/25 15:18 */ - Result sendRegisterResult(String userId, String state); + Result sendRegisterResult(String userId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java index ede2ef118..08297f434 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java @@ -66,31 +66,27 @@ public class MessageServiceImpl implements MessageService { } @Override - public Result sendRegisterResult(String userId, String state) { + public Result sendRegisterResult(String userId) { if (StringUtils.isBlank(userId)) { - return new Result().error("用户ID无效"); - } - AppUserAuditStateEnum userAuditStateEnum = AppUserAuditStateEnum.getEnumByValue(state); - if (null == userAuditStateEnum || userAuditStateEnum.equals(AppUserAuditStateEnum.UNDER_AUDIT)) { - return new Result().error("审核状态无效"); + return new Result().error("用户ID无效,下发审核通知失败"); } Result userResult = userFeignClient.getUserRegisterAuditResult(userId); if (!userResult.success() || null == userResult.getData()) { - return new Result().error("查询用户信息失败"); + return new Result().error("查询用户信息失败,下发审核通知失败"); } // 用户审核结果 EpdcUserRegisterAuditMsgResultDTO registerAuditResultDto = userResult.getData(); if (StringUtils.isBlank(registerAuditResultDto.getWxFormId())) { - return new Result().error("没有可用的wxFormId"); + return new Result().error("没有可用的wxFormId,下发审核通知失败"); } - - if (state.equals(AppUserAuditStateEnum.AUDIT_SUCCESS.value())) { + String auditState = registerAuditResultDto.getState(); + if (AppUserAuditStateEnum.AUDIT_SUCCESS.value().equals(auditState)) { this.sendRegisterSuccessMaMsg(registerAuditResultDto); - } else { + this.deleteWxFormId(registerAuditResultDto.getWxFormIdId()); + } else if (AppUserAuditStateEnum.AUDIT_FAILURE.value().equals(auditState)) { this.sendRegisterFailureMaMsg(registerAuditResultDto); + this.deleteWxFormId(registerAuditResultDto.getWxFormIdId()); } - this.deleteWxFormId(registerAuditResultDto.getWxFormIdId()); - return new Result(); } @@ -144,7 +140,7 @@ public class MessageServiceImpl implements MessageService { try { wxMaService.getMsgService().sendUniformMsg(message); } catch (WxErrorException e) { - log.error("->sendRegisterFailureMaMsg::发送小程序服务通知失败::userId:::{}::errorMsg::{}", + log.error("->sendRegisterFailureMaMsg::发送小程序服务通知失败::userId::{}::errorMsg::{}", registerAuditResultDto.getUserId(), e.getMessage()); } } @@ -179,7 +175,7 @@ public class MessageServiceImpl implements MessageService { try { wxMaService.getMsgService().sendUniformMsg(message); } catch (WxErrorException e) { - log.error("->sendRegisterSuccessMaMsg::发送小程序服务通知失败::userId:::{}::errorMsg::{}", + log.error("->sendRegisterSuccessMaMsg::发送小程序服务通知失败::userId::{}::errorMsg::{}", registerAuditResultDto.getUserId(), e.getMessage()); } }