From 24cfd06fcf91fed359dfa9d585cebe286d0e0ba8 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Sat, 11 Apr 2020 13:16:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=B3=A8=E5=86=8C=E3=80=81?= =?UTF-8?q?=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91=E7=94=B3=E8=AF=B7=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=EF=BC=88=E8=BF=94?= =?UTF-8?q?=E5=8F=82=20=E6=8F=90=E7=A4=BA=E8=AF=AD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 4 +++- .../impl/CustomerStaffGridServiceImpl.java | 6 ------ .../modules/exception/ModuleErrorCode.java | 2 -- .../service/impl/ResiRegisterServiceImpl.java | 15 --------------- .../form/ResiWarmheartedFormDTO.java | 5 +++++ .../constant/ResiWarmheartedVisitConstant.java | 2 +- .../impl/ResiWarmheartedApplyServiceImpl.java | 18 ++++++++++++------ .../warmhearted/ResiWarmheartedApplyDao.xml | 3 +++ .../constant/UserResiRegisterConstant.java | 3 +-- .../UserResiRegisterVisitController.java | 2 +- .../service/UserResiRegisterVisitService.java | 2 +- .../service/impl/UserResiInfoServiceImpl.java | 7 +++---- .../impl/UserResiRegisterVisitServiceImpl.java | 15 +++++++++++---- 13 files changed, 41 insertions(+), 43 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index de82024de8..46e63ab382 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -18,7 +18,9 @@ public enum EpmetErrorCode { MOBILE_GET_CODE_ERROR(8104,"获取手机验证码失败"), MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"), - CANNOT_AUDIT_WARM(8201, "只有注册居民才可以申请热心居民，请先完成居民注册"); + CANNOT_AUDIT_WARM(8201, "未注册居民不能申请热心居民，请先完善居民注册。"), + RESI_WARM_INIT(8202, "您的信息已提交成功，请等待后台审核。"), + RESI_WARM_SUBMIT(8203, "热心居民信息已提交成功，请等待后台审核。"); private int code; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java index 6bb2f7243f..467ff9449b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java @@ -120,12 +120,6 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl().error(ModuleErrorCode.MOBILE_EXCEPTION); - } formDTO.setUserId(tokenDTO.getUserId()); return epmetUserFeignClient.getVerificationCode(formDTO); } - /** - * 校验手机号是否合规 - * - * @param mobile - * @return - * @Author sun - */ - private static boolean validateMobile(String mobile) { - Pattern pattern = Pattern.compile("^[1][3,4,5,7,8][0-9]{9}$"); - return pattern.matcher(mobile).matches(); - } - } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java index 0b474c8bdd..0b33c41cdd 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java @@ -55,4 +55,9 @@ public class ResiWarmheartedFormDTO implements Serializable { */ private String userId; + /** + * 审核状态 + */ + private String auditStatus; + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java index a7da270749..336b6f6f11 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java @@ -49,5 +49,5 @@ public interface ResiWarmheartedVisitConstant { /** * 数据库操作异常 */ - String OPERATION_EXCEPTION = "数据库操作异常！"; + String OPERATION_EXCEPTION = "数据库操作异常"; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index 9e68e887bf..513a351ab4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -146,28 +146,34 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl().ok(resiWarmheartedResultDTO); + return result.ok(resiWarmheartedResultDTO); } @Override @Transactional(rollbackFor = Exception.class) public Result submit(ResiWarmheartedSubmitFormDTO formDTO) { + Result result = new Result(); //1:将申请记录存入热心居民申请表中 saveResiWarmApply(formDTO); //2:将最后一次操作行为更新到热心居民申请行为记录表中 resiWarmheartedVisitService.updateResiWarmVisit(formDTO); - return new Result(); + result.setCode(EpmetErrorCode.RESI_WARM_SUBMIT.getCode()); + result.setMsg(EpmetErrorCode.RESI_WARM_SUBMIT.getMsg()); + return result; } /** @@ -204,9 +210,9 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl NumConstant.ZERO && NumConstant.ONE_STR.equals(formDTO.getAuditStatus())) { //查询需要添加热心居民角色的userId ResiWarmheartedApplyEntity resiWarmheartedApplyEntity = baseDao.selectById(formDTO.getResiWarmApplyId()); UserRoleDTO dto = new UserRoleDTO(); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml index e4f87e4f27..ba8099f0fb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml @@ -52,6 +52,9 @@ AND rw.user_id = #{userId} + + AND rw.audit_status != #{auditStatus} + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java index 2f48d93d79..183290ec40 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java @@ -36,7 +36,6 @@ public interface UserResiRegisterConstant { */ String FAILD = "faild"; - String MOBILE_EXIST = "该手机号已注册居民，请使用其他手机号注册"; - String UPDATE_EXCEPTION = "用户居民注册访问记录表更新数据失败"; + String UPDATE_EXCEPTION = "用户居民注册访问记录表数据更新失败"; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java index 8b9971f8bd..aea84d1a23 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java @@ -95,6 +95,6 @@ public class UserResiRegisterVisitController { @PostMapping("init") public Result init(@RequestBody ResiRegisterFormDTO resiRegisterFormDTO){ - return userResiRegisterVisitService.saveUserResiRegisterVisit(resiRegisterFormDTO); + return userResiRegisterVisitService.init(resiRegisterFormDTO); } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java index 62c385b557..579cb1e1c3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java @@ -107,7 +107,7 @@ public interface UserResiRegisterVisitService extends BaseService saveUserResiRegisterVisit(ResiRegisterFormDTO formDTO); + Result init(ResiRegisterFormDTO formDTO); /** * 居民端-居民注册信息提交-更新访问行为记录表数据 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 8c937bc084..6ca4a3ae2b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -145,7 +145,6 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl map = (Map) result.getData(); - if(null == map) { + if (null == map || null == map.get("code")) { result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getMsg()); return result; @@ -271,7 +271,6 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl list = userResiInfoDao.selectResiInfoByMobile(mobile); if (list.size() > 0) { bl = false; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java index a24c454e82..1182611384 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java @@ -117,9 +117,16 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl saveUserResiRegisterVisit(ResiRegisterFormDTO formDTO) { + public Result init(ResiRegisterFormDTO formDTO) { Date date = new Date(); UserResiRegisterVisitEntity entity = new UserResiRegisterVisitEntity(); entity.setCustomerId(formDTO.getCustomerId()); @@ -130,7 +137,7 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl().ok(resiRegisterResultDTO); @@ -151,7 +158,7 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl