From b6df6d726a43e5983c8868236079817e5fc6a66d Mon Sep 17 00:00:00 2001 From: yujintao Date: Fri, 27 Sep 2019 09:55:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=B6=88=E6=81=AF=EF=BC=9B=E5=85=B6=E4=BB=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/async/AppUserTask.java | 23 +++ .../esua/epdc/feign/UserFeignClient.java | 17 +- .../fallback/UserFeignClientFallback.java | 9 +- .../epdc/service/impl/MessageServiceImpl.java | 162 ++++++++++++++++-- ...TO.java => EpdcDeleteWxFormIdFormDTO.java} | 2 +- .../EpdcUserRegisterAuditMsgResultDTO.java | 49 ++++++ .../controller/EpdcAppUserController.java | 14 ++ .../EpdcAppUserWxFormIdController.java | 4 +- .../java/com/elink/esua/epdc/dao/UserDao.java | 11 ++ .../elink/esua/epdc/service/UserService.java | 11 ++ .../epdc/service/impl/UserServiceImpl.java | 7 + .../src/main/resources/mapper/UserDao.xml | 23 +++ 12 files changed, 307 insertions(+), 25 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/AppUserTask.java rename esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/{EpdcUserWxFormIdFormDTO.java => EpdcDeleteWxFormIdFormDTO.java} (85%) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserRegisterAuditMsgResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/AppUserTask.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/AppUserTask.java new file mode 100644 index 000000000..540ba9ee5 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/AppUserTask.java @@ -0,0 +1,23 @@ +package com.elink.esua.epdc.async; + +import com.elink.esua.epdc.feign.UserFeignClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; + +/** + * @author work@yujt.net.cn + * @date 19/09/26 15:50 + */ +@Component +public class AppUserTask { + + @Autowired + private UserFeignClient userFeignClient; + + + @Async + public void updateUserLoginInfo(){ + + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 53902d85f..1bfd22d3b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -5,9 +5,10 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.UserWxFormIdDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserWxFormIdFormDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcDeleteWxFormIdFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserSaveWxFormIdFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO; import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -105,15 +106,15 @@ public interface UserFeignClient { Result updateMobileOrAvatar(@RequestBody UserDTO userDTO); /** - * 根据ID获取用户信息 + * 用户注册审核之后，查询用户审核结果，用于发送服务消息和短信消息 * - * @param id - * @return com.elink.esua.epdc.commons.tools.utils.Result + * @param userId + * @return com.elink.esua.epdc.commons.tools.utils.Result * @author work@yujt.net.cn - * @date 2019/9/25 15:29 + * @date 2019/9/27 09:22 */ - @GetMapping(value = "app-user/user/{id}") - Result getUserById(@PathVariable("id") String id); + @GetMapping("app-user/epdc-app/user/registerResult/{userId}") + Result getUserRegisterAuditResult(@PathVariable("userId") String userId); /** * 完成推送之后删除用过的formid @@ -124,7 +125,7 @@ public interface UserFeignClient { * @date 2019/9/26 14:15 */ @PostMapping(value = "app-user/epdc-app/wxformid/deleteById", consumes = MediaType.APPLICATION_JSON_VALUE) - Result deleteWxFormIdById(EpdcUserWxFormIdFormDTO dto); + Result deleteWxFormIdById(EpdcDeleteWxFormIdFormDTO dto); /** * 新增一条 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index b1fd78208..9f94134fb 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -6,9 +6,10 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.UserWxFormIdDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserWxFormIdFormDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcDeleteWxFormIdFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserSaveWxFormIdFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO; import com.elink.esua.epdc.feign.UserFeignClient; import org.springframework.stereotype.Component; @@ -56,12 +57,12 @@ public class UserFeignClientFallback implements UserFeignClient { } @Override - public Result getUserById(String id) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserById", id); + public Result getUserRegisterAuditResult(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserRegisterAuditResult", userId); } @Override - public Result deleteWxFormIdById(EpdcUserWxFormIdFormDTO dto) { + public Result deleteWxFormIdById(EpdcDeleteWxFormIdFormDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "deleteWxFormIdById", dto); } 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 ad85afe22..9d9e0adb8 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 @@ -1,26 +1,31 @@ package com.elink.esua.epdc.service.impl; -import cn.binarywang.wx.miniapp.api.WxMaMsgService; import cn.binarywang.wx.miniapp.api.WxMaService; +import cn.binarywang.wx.miniapp.bean.WxMaTemplateData; import cn.binarywang.wx.miniapp.bean.WxMaUniformMessage; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.UserWxFormIdDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcDeleteWxFormIdFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO; import com.elink.esua.epdc.dto.form.EpdcRegisterResultSmsFormDTO; import com.elink.esua.epdc.enums.AppUserAuditStateEnum; import com.elink.esua.epdc.feign.MessageFeignClient; import com.elink.esua.epdc.feign.UserFeignClient; import com.elink.esua.epdc.service.MessageService; +import com.google.common.collect.Lists; +import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author yujintao * @email yujintao@elink-cn.com * @date 2019/9/11 21:03 */ +@Slf4j @Service public class MessageServiceImpl implements MessageService { @@ -55,22 +60,159 @@ public class MessageServiceImpl implements MessageService { if (null == userAuditStateEnum || userAuditStateEnum.equals(AppUserAuditStateEnum.UNDER_AUDIT)) { return new Result().error("审核状态无效"); } - Result userResult = userFeignClient.getUserById(userId); + Result userResult = userFeignClient.getUserRegisterAuditResult(userId); if (!userResult.success() || null == userResult.getData()) { return new Result().error("查询用户信息失败"); } - UserDTO userDto = userResult.getData(); + // 用户审核结果 + EpdcUserRegisterAuditMsgResultDTO registerAuditResultDto = userResult.getData(); switch (userAuditStateEnum) { case AUDIT_FAILURE: EpdcRegisterResultSmsFormDTO form = new EpdcRegisterResultSmsFormDTO(); - form.setMobile(userDto.getMobile()); - form.setReason(userDto.getRemark()); - return this.messageFeignClient.registerFailure(form); + form.setMobile(registerAuditResultDto.getMobile()); + form.setReason(registerAuditResultDto.getRemark()); + // 发送审核失败短信 + this.messageFeignClient.registerFailure(form); + if (StringUtils.isNotBlank(registerAuditResultDto.getWxFormId())) { + this.sendRegisterFailureMaMsg(registerAuditResultDto); + this.deleteWxFormId(registerAuditResultDto.getWxFormIdId()); + } + return new Result(); case AUDIT_SUCCESS: - return this.messageFeignClient.registerSuccess(userDto.getMobile()); + // 发送审核成功信息 + this.messageFeignClient.registerSuccess(registerAuditResultDto.getMobile()); + if (StringUtils.isNotBlank(registerAuditResultDto.getWxFormId())) { + this.sendRegisterSuccessMaMsg(registerAuditResultDto); + this.deleteWxFormId(registerAuditResultDto.getWxFormIdId()); + } + return new Result(); default: - return new Result().error("短信发送失败"); + return new Result().error("发送审核结果信息失败"); + } + } + + /** + * 删除用过的wxFormId + * + * @param id 存放formId的数据库表主键 + * @return void + * @author work@yujt.net.cn + * @date 2019/9/27 09:33 + */ + private void deleteWxFormId(String id) { + EpdcDeleteWxFormIdFormDTO dto = new EpdcDeleteWxFormIdFormDTO(); + dto.setId(id); + userFeignClient.deleteWxFormIdById(dto); + } + + /** + * 注册失败的小程序服务消息 + * + * @param registerAuditResultDto + * @return void + * @author work@yujt.net.cn + * @date 2019/9/26 17:26 + */ + private void sendRegisterFailureMaMsg(EpdcUserRegisterAuditMsgResultDTO registerAuditResultDto) { + /*姓名，手机号，申请时间，审核时间，不通过原因，审核结果 jL6UPR2ZBcZT8Qu2UijcApvUI2xa3K68paDl8ZZV7as*/ + + List dataList = this.getWxMaTemplateData(registerAuditResultDto); + + WxMaTemplateData templateData = new WxMaTemplateData(); + templateData.setName("keyword5"); + templateData.setValue(registerAuditResultDto.getRemark()); + templateData.setColor("#FF4500"); + dataList.add(templateData); + + templateData = new WxMaTemplateData(); + templateData.setName("keyword6"); + templateData.setValue("注册失败"); + dataList.add(templateData); + + WxMaUniformMessage message = WxMaUniformMessage.builder() + .isMpTemplateMsg(false) + .toUser(registerAuditResultDto.getWxOpenId()) + .formId(registerAuditResultDto.getWxFormId()) + .templateId("jL6UPR2ZBcZT8Qu2UijcApvUI2xa3K68paDl8ZZV7as") + .page("/pages/index/index") + .data(dataList) + .emphasisKeyword("keyword6.DATA") + .build(); + try { + wxMaService.getMsgService().sendUniformMsg(message); + } catch (WxErrorException e) { + log.error("->sendRegisterFailureMaMsg::发送小程序服务通知失败::userId:::{}::errorMsg::{}", + registerAuditResultDto.getUserId(), e.getMessage()); } } + + /** + * 注册成功的小程序服务消息 + * + * @param registerAuditResultDto + * @return void + * @author work@yujt.net.cn + * @date 2019/9/26 17:26 + */ + private void sendRegisterSuccessMaMsg(EpdcUserRegisterAuditMsgResultDTO registerAuditResultDto) { + /*姓名，手机号，申请时间，审核时间，审核结果 jL6UPR2ZBcZT8Qu2UijcAoGddYg70BGAyFZXyr4XBSY*/ + + List dataList = this.getWxMaTemplateData(registerAuditResultDto); + + WxMaTemplateData templateData = new WxMaTemplateData(); + templateData.setName("keyword5"); + templateData.setValue("注册成功"); + dataList.add(templateData); + + WxMaUniformMessage message = WxMaUniformMessage.builder() + .isMpTemplateMsg(false) + .toUser(registerAuditResultDto.getWxOpenId()) + .formId(registerAuditResultDto.getWxFormId()) + .templateId("jL6UPR2ZBcZT8Qu2UijcAoGddYg70BGAyFZXyr4XBSY") + .page("/pages/index/index") + .data(dataList) + .emphasisKeyword("keyword5.DATA") + .build(); + try { + wxMaService.getMsgService().sendUniformMsg(message); + } catch (WxErrorException e) { + log.error("->sendRegisterSuccessMaMsg::发送小程序服务通知失败::userId:::{}::errorMsg::{}", + registerAuditResultDto.getUserId(), e.getMessage()); + } + } + + /** + * 因为注册审核的两个模版消息的前四项关键词是一样的，所以抽出了方法 + * + * @param registerAuditResultDto + * @return java.util.List + * @author work@yujt.net.cn + * @date 2019/9/26 17:24 + */ + private List getWxMaTemplateData(EpdcUserRegisterAuditMsgResultDTO registerAuditResultDto) { + List dataList = Lists.newArrayList(); + + WxMaTemplateData templateData = new WxMaTemplateData(); + templateData.setName("keyword1"); + templateData.setValue(registerAuditResultDto.getRealName()); + dataList.add(templateData); + + templateData = new WxMaTemplateData(); + templateData.setName("keyword2"); + templateData.setValue(registerAuditResultDto.getMobile()); + dataList.add(templateData); + + templateData = new WxMaTemplateData(); + templateData.setName("keyword3"); + templateData.setValue(registerAuditResultDto.getCreatedTime()); + dataList.add(templateData); + + templateData = new WxMaTemplateData(); + templateData.setName("keyword4"); + templateData.setValue(registerAuditResultDto.getRegisterTime()); + dataList.add(templateData); + + return dataList; + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserWxFormIdFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcDeleteWxFormIdFormDTO.java similarity index 85% rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserWxFormIdFormDTO.java rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcDeleteWxFormIdFormDTO.java index 5f42ecc77..3f19c69eb 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserWxFormIdFormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcDeleteWxFormIdFormDTO.java @@ -11,7 +11,7 @@ import java.io.Serializable; * @Description: 发送完消息之后删除 */ @Data -public class EpdcUserWxFormIdFormDTO implements Serializable { +public class EpdcDeleteWxFormIdFormDTO implements Serializable { private static final long serialVersionUID = 1708791774502867360L; diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserRegisterAuditMsgResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserRegisterAuditMsgResultDTO.java new file mode 100644 index 000000000..45ec1f693 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserRegisterAuditMsgResultDTO.java @@ -0,0 +1,49 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 用于发送关于用户注册审核结果的服务通知 + * + * @author work@yujt.net.cn + * @date 19/09/27 9:03 + */ +@Data +public class EpdcUserRegisterAuditMsgResultDTO implements Serializable { + + private static final long serialVersionUID = -5435160234376760275L; + + private String userId; + + private String realName; + + private String mobile; + + private String state; + + /** + * 审核时间 + */ + private String registerTime; + + /** + * 提交注册时间 + */ + private String createdTime; + + /** + * 审核备注 + */ + private String remark; + + private String wxOpenId; + + private String wxFormId; + + /** + * 存放wxFormId的表的主键 + */ + private String wxFormIdId; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java index 13f10c623..91973dbf6 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java @@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO; import com.elink.esua.epdc.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -116,4 +117,17 @@ public class EpdcAppUserController { public Result verifyUserRegisterData(@RequestBody EpdcUserRegistFormDTO formDto) { return userService.verifyUserRegisterData(formDto); } + + /** + * 用户注册审核之后，查询用户审核结果，用于发送服务消息和短信消息 + * + * @param userId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/9/27 09:13 + */ + @GetMapping("registerResult/{userId}") + public Result getUserRegisterAuditResult(@PathVariable("userId") String userId) { + return userService.getUserRegisterAuditResult(userId); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserWxFormIdController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserWxFormIdController.java index 8c4f8076e..205963ec1 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserWxFormIdController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserWxFormIdController.java @@ -22,7 +22,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.UserWxFormIdDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserWxFormIdFormDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcDeleteWxFormIdFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserSaveWxFormIdFormDTO; import com.elink.esua.epdc.service.UserWxFormIdService; import org.springframework.beans.BeanUtils; @@ -51,7 +51,7 @@ public class EpdcAppUserWxFormIdController { * @date 2019/9/26 14:15 */ @PostMapping("deleteById") - public Result deleteById(@RequestBody EpdcUserWxFormIdFormDTO dto) { + public Result deleteById(@RequestBody EpdcDeleteWxFormIdFormDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); userWxFormIdService.deleteById(dto.getId()); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java index 10deaeb19..211072bc3 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -19,8 +19,10 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO; import com.elink.esua.epdc.entity.UserEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 用户信息表 @@ -50,4 +52,13 @@ public interface UserDao extends BaseDao { */ void deleteByUnionId(String wxUnionId); + /** + * 用户注册审核之后，查询用户审核结果，用于发送服务消息和短信消息 + * + * @param userId + * @return com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO + * @author work@yujt.net.cn + * @date 2019/9/27 09:14 + */ + EpdcUserRegisterAuditMsgResultDTO getUserRegisterAuditResult(@Param("userId") String userId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java index 5893553c2..29ca14f88 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO; import com.elink.esua.epdc.entity.UserEntity; import java.util.List; @@ -122,4 +123,14 @@ public interface UserService extends BaseService { * @date 2019/9/24 13:57 */ Result getUserForLoginByOpenId(String openId); + + /** + * 用户注册审核之后，查询用户审核结果，用于发送服务消息和短信消息 + * + * @param userId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/9/27 09:13 + */ + Result getUserRegisterAuditResult(String userId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index f40e253af..5ab74bf14 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -35,6 +35,7 @@ import com.elink.esua.epdc.dto.PartyMembersDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO; import com.elink.esua.epdc.entity.UserEntity; import com.elink.esua.epdc.enums.AppUserAuditStateEnum; import com.elink.esua.epdc.redis.UserRedis; @@ -263,4 +264,10 @@ public class UserServiceImpl extends BaseServiceImpl implem } return new Result(); } + + @Override + public Result getUserRegisterAuditResult(String userId) { + EpdcUserRegisterAuditMsgResultDTO dto = this.baseDao.getUserRegisterAuditResult(userId); + return new Result().ok(dto); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index fb3f51e11..10d88c231 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -34,4 +34,27 @@ AND STATE = '2' + + \ No newline at end of file