From 2b2c99e744ed91fae54bc84d638e26e447c60d96 Mon Sep 17 00:00:00 2001 From: 77 <77@77.com> Date: Mon, 29 Apr 2024 23:50:50 +0800 Subject: [PATCH] init --- .../dto/app/user/UpdateUserAuthInfoReq.java | 11 ++++++++-- .../ruoyi/xq/manager/CurrentUserManager.java | 20 +++++++++++++++---- .../xq/service/UserAuthAuditService.java | 6 +++++- .../impl/CardAuthRecordServiceImpl.java | 2 +- .../impl/UserAuthAuditServiceImpl.java | 7 ++++--- 5 files changed, 35 insertions(+), 11 deletions(-) diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserAuthInfoReq.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserAuthInfoReq.java index d36eb7f..fdbc69e 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserAuthInfoReq.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserAuthInfoReq.java @@ -5,11 +5,18 @@ import lombok.Data; @Data public class UpdateUserAuthInfoReq { - @Schema(description = "提交学历认证") - private Boolean pushEducationAuth; + /** + * 单身认证 + */ + @Schema(description = "单身认证") + private Boolean singlePersonAuth; + @Schema(description = "单身认证JSON数据") + private String singleJson; /** * 学历照片 */ + @Schema(description = "提交学历认证") + private Boolean pushEducationAuth; @Schema(description = "学历照片") private String educationPic; @Schema(description = "提交工作认证") diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java index 3280b2e..505c9fd 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.BeanConvertUtil; -import com.ruoyi.common.utils.StringUtils; import com.ruoyi.xq.domain.*; import com.ruoyi.xq.dto.app.common.UserPicturesDTO; import com.ruoyi.xq.dto.app.user.AddPicturesReq; @@ -290,6 +289,19 @@ public class CurrentUserManager { public void updateInfoAuth(UpdateUserAuthInfoReq req) { Long userId = LoginHelper.getUserId(); User user = userService.getById(userId); + if(BooleanUtils.isTrue(req.getSinglePersonAuth())){ // 单身认证 + if(req.getSingleJson() == null){ + throw new ServiceException("请上传车辆认证照片"); + } + boolean update = userAuthService.update(Wrappers.lambdaUpdate(UserAuth.class) + .eq(UserAuth::getUserId, userId) + .in(UserAuth::getSinglePersonAuth, AuditEnum.NO.getCode(), AuditEnum.FAIL.getCode()) + .set(UserAuth::getSinglePersonAuth, AuditEnum.AUDITING.getCode())); + if(!update){ + throw new ServiceException("单身认证正在审核中，请勿重复提交"); + } + userAuthAuditService.saveAuthAudit(user,UserAuthTypeEnum.SINGLE,null,null,req.getSingleJson()); + } if(BooleanUtils.isTrue(req.getPushCarAuth())){ // 车辆认证 if(req.getCarPic() == null){ throw new ServiceException("请上传车辆认证照片"); @@ -325,7 +337,7 @@ public class CurrentUserManager { .in(UserAuth::getEducationAuth, AuditEnum.NO.getCode(), AuditEnum.FAIL.getCode()) .set(UserAuth::getEducationAuth, AuditEnum.AUDITING.getCode())); if(!update){ - throw new ServiceException("房产认证正在审核中，请勿重复提交"); + throw new ServiceException("学历认证正在审核中，请勿重复提交"); } userAuthAuditService.saveAuthAudit(user,UserAuthTypeEnum.EDUCATION,req.getEducationPic()); } @@ -338,7 +350,7 @@ public class CurrentUserManager { .in(UserAuth::getMarriageAuth, AuditEnum.NO.getCode(), AuditEnum.FAIL.getCode()) .set(UserAuth::getMarriageAuth, AuditEnum.AUDITING.getCode())); if(!update){ - throw new ServiceException("房产认证正在审核中，请勿重复提交"); + throw new ServiceException("婚况认证正在审核中，请勿重复提交"); } userAuthAuditService.saveAuthAudit(user,UserAuthTypeEnum.MARRIAGE,req.getMarriagePic()); } @@ -355,7 +367,7 @@ public class CurrentUserManager { .in(UserAuth::getJobAuth, AuditEnum.NO.getCode(), AuditEnum.FAIL.getCode()) .set(UserAuth::getJobAuth, AuditEnum.AUDITING.getCode())); if(!update){ - throw new ServiceException("房产认证正在审核中，请勿重复提交"); + throw new ServiceException("工作认证正在审核中，请勿重复提交"); } String authRemark = String.format("【%s】工作认证", userAuthJobAuthTypeEnum.getText()); userAuthAuditService.saveAuthAudit(user,UserAuthTypeEnum.JOB,req.getJobPic(),authRemark); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserAuthAuditService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserAuthAuditService.java index cf7fe8f..f57694d 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserAuthAuditService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserAuthAuditService.java @@ -16,11 +16,15 @@ import com.ruoyi.xq.enums.user.UserAuthTypeEnum; */ public interface UserAuthAuditService extends IService { - void saveAuthAudit(User user, UserAuthTypeEnum userAuthType, String pic, String remark); + default void saveAuthAudit(User user, UserAuthTypeEnum userAuthType, String pic, String remark){ + saveAuthAudit(user,userAuthType,pic,remark,null); + } default void saveAuthAudit(User user, UserAuthTypeEnum userAuthType, String pic) { saveAuthAudit(user,userAuthType,pic, null); } + void saveAuthAudit(User user, UserAuthTypeEnum userAuthType, String pic, String remark, String authOtherJson); + Page pageAdmin(PageQuery pageQuery, UserAuthAuditAdminVo bo); void auditSuccess(String ids); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/CardAuthRecordServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/CardAuthRecordServiceImpl.java index 7a62adc..9a43902 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/CardAuthRecordServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/CardAuthRecordServiceImpl.java @@ -106,7 +106,7 @@ public class CardAuthRecordServiceImpl extends ServiceImpl