居民注册、热心居民申请模块接口优化（返参 提示语）

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;

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<CustomerStaffG
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result().error(ModuleConstant.USER_NOT_NULL);
         }
-       /* if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
-                || StringUtils.isBlank(formDTO.getResiWarmApplyId())
-                || StringUtils.isBlank(formDTO.getAuditStatus())
-                || (!NumConstant.ZERO_STR.equals(formDTO.getAuditStatus()) && !NumConstant.ONE_STR.equals(formDTO.getAuditStatus()))) {
-            return new Result().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName());
-        }*/
         formDTO.setUserId(tokenDTO.getUserId());
         return resiPartymemberFeignClient.manageAudit(formDTO);
     }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java

@@ -22,6 +22,4 @@ import com.epmet.commons.tools.exception.ErrorCode;
  */
 public interface ModuleErrorCode extends ErrorCode {
 
-    String PARTICIPATION_EXCEPTION = "参数异常,请检查所传参数是否符合规范以及是否存在空值";
-    String MOBILE_EXCEPTION = "手机号输入不符合规范，请重新输入";
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java

@@ -65,23 +65,8 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
      **/
     @Override
     public Result getVerificationCode(TokenDto tokenDTO, VerificationCodeFormDTO formDTO) {
-        if (!validateMobile(formDTO.getMobile())) {
-            return new Result<ResiRegisterResultDTO>().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();
-    }
-
 }

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;
+
 }

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 = "数据库操作异常";
 }

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<ResiWarmhea
         //1:热心居民申请行为记录表新增数据
         result = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO);
         if (!result.success()) {
-            log.warn(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
+            log.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
         }
         ResiWarmheartedResultDTO resiWarmheartedResultDTO = result.getData();
-        //2:查询是否已申请热心居民
+        //2:查询是否已申请热心居民(不查询审核未通过的)
+        formDTO.setAuditStatus(ResiWarmheartedVisitConstant.REJECTED);
         ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = resiWarmheartedApplyDao.selectResiWarmheartedApply(formDTO);
         if (null == resiWarmheartedApplyDTO || StringUtils.isEmpty(resiWarmheartedApplyDTO.getId())) {
             //是否已申请热心居民 0：否， 1：是
             resiWarmheartedResultDTO.setIsApplied(NumConstant.ZERO_STR);
         } else {
             resiWarmheartedResultDTO.setIsApplied(NumConstant.ONE_STR);
+            result.setCode(EpmetErrorCode.RESI_WARM_INIT.getCode());
+            result.setMsg(EpmetErrorCode.RESI_WARM_INIT.getMsg());
         }
-        return new Result<ResiWarmheartedResultDTO>().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<ResiWarmhea
         if (!StringUtils.isBlank(formDTO.getRefuseReason())) {
             entity.setRefuseReason(formDTO.getRefuseReason());
         }
-        baseDao.updateById(entity);
+        int num = baseDao.updateById(entity);
         //2:审核通过的添加热心居民的角色
-        if (NumConstant.ONE_STR.equals(formDTO.getAuditStatus())) {
+        if (num > NumConstant.ZERO && NumConstant.ONE_STR.equals(formDTO.getAuditStatus())) {
             //查询需要添加热心居民角色的userId
             ResiWarmheartedApplyEntity resiWarmheartedApplyEntity = baseDao.selectById(formDTO.getResiWarmApplyId());
             UserRoleDTO dto = new UserRoleDTO();

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml

@@ -52,6 +52,9 @@
         <if test='userId != "" and userId != null'>
             AND rw.user_id = #{userId}
         </if>
+        <if test='auditStatus != "" and auditStatus != null'>
+            AND rw.audit_status != #{auditStatus}
+        </if>
     </select>
 
 

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 = "用户居民注册访问记录表数据更新失败";
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java

@@ -95,6 +95,6 @@ public class UserResiRegisterVisitController {
 
     @PostMapping("init")
     public Result<ResiRegisterResultDTO> init(@RequestBody ResiRegisterFormDTO resiRegisterFormDTO){
-        return userResiRegisterVisitService.saveUserResiRegisterVisit(resiRegisterFormDTO);
+        return userResiRegisterVisitService.init(resiRegisterFormDTO);
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java

@@ -107,7 +107,7 @@ public interface UserResiRegisterVisitService extends BaseService<UserResiRegist
      * @return void
      * @author sun
      */
-    Result<ResiRegisterResultDTO> saveUserResiRegisterVisit(ResiRegisterFormDTO formDTO);
+    Result<ResiRegisterResultDTO> init(ResiRegisterFormDTO formDTO);
 
     /**
      * 居民端-居民注册信息提交-更新访问行为记录表数据

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -145,7 +145,6 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	/**
 	 * 居民注册信息提交
 	 * @param userResiInfoDTO
-	 * @return
 	 * @Author sun
 	 */
 	@Override
@@ -207,13 +206,14 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		userResiRegisterVisitService.updateResiVisitOperate(verificationCodeFormDTO);
 		//2:判断手机号是否可用
 		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile())) {
-			result.error(UserResiRegisterConstant.MOBILE_EXIST);
+			result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
+			result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getMsg());
 			return result;
 		}
 		//3:调用短信服务 生成验证码发送短信
 		result = messageFeignClient.sendSmsCaptcha(verificationCodeFormDTO.getMobile());
 		Map<String,Object> map = (Map<String, Object>) 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<UserResiInfoDao, Us
 	 */
 	private Boolean getResiInfoByMobile(String mobile) {
 		Boolean bl = true;
-
 		List<UserResiInfoDTO> list = userResiInfoDao.selectResiInfoByMobile(mobile);
 		if (list.size() > 0) {
 			bl = false;

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java

@@ -117,9 +117,16 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 居民端-居民注册页面初始化-居民注册访问记录表新增数据
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result<ResiRegisterResultDTO> saveUserResiRegisterVisit(ResiRegisterFormDTO formDTO) {
+    public Result<ResiRegisterResultDTO> init(ResiRegisterFormDTO formDTO) {
         Date date = new Date();
         UserResiRegisterVisitEntity entity = new UserResiRegisterVisitEntity();
         entity.setCustomerId(formDTO.getCustomerId());
@@ -130,7 +137,7 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
         entity.setLastOperateVisit(UserResiRegisterConstant.INITIALIZE);
         entity.setVisitTime(date);
         //居民注册行为记录表新增数据
-        insert(entity);
+        baseDao.insert(entity);
         ResiRegisterResultDTO resiRegisterResultDTO = new ResiRegisterResultDTO();
         resiRegisterResultDTO.setResiVisitId(entity.getId());
         return new Result<ResiRegisterResultDTO>().ok(resiRegisterResultDTO);
@@ -151,7 +158,7 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
         userResiRegisterVisitDTO.setUpdatedBy(userResiInfoDTO.getUserId());
         userResiRegisterVisitDTO.setUpdatedTime(new Date());
         if(!userResiRegisterVisitDao.updateResiRegisterVisit(userResiRegisterVisitDTO)){
-            log.warn(UserResiRegisterConstant.UPDATE_EXCEPTION);
+            log.error(UserResiRegisterConstant.UPDATE_EXCEPTION);
         }
     }
 
@@ -164,7 +171,7 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
         userResiRegisterVisitDTO.setUpdatedBy(verificationCodeFormDTO.getUserId());
         userResiRegisterVisitDTO.setUpdatedTime(new Date());
         if(!userResiRegisterVisitDao.updateResiRegisterVisit(userResiRegisterVisitDTO)){
-            log.warn(UserResiRegisterConstant.UPDATE_EXCEPTION);
+            log.error(UserResiRegisterConstant.UPDATE_EXCEPTION);
         }
     }