diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java
index 704e248062..d4488e08de 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java
@@ -24,30 +24,60 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
     @Autowired
     private EpmetUserFeignClient epmetUserFeignClient;
 
+    /**
+     * @param
+     * @Author sun
+     * @Description 居民端-居民注册页面初始化-居民注册访问记录表新增数据
+     **/
     @Override
     public Result<ResiRegisterResultDTO> init(TokenDto tokenDTO, ResiRegisterFormDTO formDTO) {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result<ResiRegisterResultDTO>().error(ModuleConstant.USER_NOT_NULL);
         }
+        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+                || StringUtils.isBlank(formDTO.getGridId())
+                || StringUtils.isBlank(formDTO.getVisitFrom())) {
+            return new Result<ResiRegisterResultDTO>().error(ModuleConstant.PARAMETER_EXCEPTION);
+        }
         formDTO.setUserId(tokenDTO.getUserId());
         return epmetUserFeignClient.init(formDTO);
     }
 
+    /**
+     * @param
+     * @Author sun
+     * @Description 居民端-居民注册信息提交
+     **/
     @Override
-    public Result submit(TokenDto tokenDTO, UserResiInfoDTO userResiInfoDTO) {
+    public Result submit(TokenDto tokenDTO, UserResiInfoDTO formDTO) {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result<ResiRegisterResultDTO>().error(ModuleConstant.USER_NOT_NULL);
         }
-        userResiInfoDTO.setUserId(tokenDTO.getUserId());
-        return epmetUserFeignClient.submit(userResiInfoDTO);
+        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+                || StringUtils.isBlank(formDTO.getGridId())
+                || StringUtils.isBlank(formDTO.getResiVisitId())) {
+            return new Result<ResiRegisterResultDTO>().error(ModuleConstant.PARAMETER_EXCEPTION);
+        }
+        formDTO.setUserId(tokenDTO.getUserId());
+        return epmetUserFeignClient.submit(formDTO);
     }
 
+    /**
+     * @param
+     * @Author sun
+     * @Description 居民端-居民注册根据手机号获取验证码
+     **/
     @Override
     public Result getVerificationCode(TokenDto tokenDTO, VerificationCodeFormDTO formDTO) {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result().error(ModuleConstant.USER_NOT_NULL);
         }
+        if (null == formDTO || StringUtils.isBlank(formDTO.getMobile())
+                || StringUtils.isBlank(formDTO.getResiVisitId())) {
+            return new Result<ResiRegisterResultDTO>().error(ModuleConstant.PARAMETER_EXCEPTION);
+        }
         formDTO.setUserId(tokenDTO.getUserId());
         return epmetUserFeignClient.getVerificationCode(formDTO);
     }
+
 }
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
index 7c826f258c..fdf94c1efa 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
@@ -27,4 +27,9 @@ public interface ModuleConstant extends Constant {
 	 * 接口只限居民端调用
 	 */
 	String FOR_RESI_CALL="当前接口只限居民端调用";
+
+	/**
+	 * 参数异常-必要参数存在空值
+	 */
+	String PARAMETER_EXCEPTION="必要参数存在空值，请检查参数赋值情况！";
 }
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java
index 0239db3aa2..ae2ac8809f 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java
@@ -2,6 +2,7 @@ package com.epmet.modules.warmhearted.service.impl;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.modules.feign.ResiPartymemberFeignClient;
 import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedService;
@@ -23,20 +24,41 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
     @Autowired
     private ResiPartymemberFeignClient resiPartymemberFeignClient;
 
+    /**
+     * @param
+     * @Author sun
+     * @Description 居民端-热心居民申请页面初始化-查询有无申请、新增访问行为记录数据
+     **/
     @Override
     public Result<ResiWarmheartedResultDTO> init(TokenDto tokenDTO, ResiWarmheartedFormDTO formDTO) {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.USER_NOT_NULL);
         }
+        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+                || StringUtils.isBlank(formDTO.getGridId())
+                || StringUtils.isBlank(formDTO.getVisitFrom())) {
+            return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.PARAMETER_EXCEPTION);
+        }
         formDTO.setUserId(tokenDTO.getUserId());
         return resiPartymemberFeignClient.init(formDTO);
     }
 
+    /**
+     * @param
+     * @Author sun
+     * @Description 居民端-热心居民申请-提交申请数据
+     **/
     @Override
     public Result submit(TokenDto tokenDTO, ResiWarmheartedSubmitFormDTO formDTO) {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.USER_NOT_NULL);
         }
+        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+                || StringUtils.isBlank(formDTO.getGridId())
+                || StringUtils.isBlank(formDTO.getResiWarmVisitId())
+                || StringUtils.isBlank(formDTO.getReason())) {
+            return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.PARAMETER_EXCEPTION);
+        }
         formDTO.setUserId(tokenDTO.getUserId());
         return resiPartymemberFeignClient.submit(formDTO);
     }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java
index 8283fc3f4c..de03c5259e 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java
@@ -40,5 +40,5 @@ public interface ResiWarmheartedApplyDao extends BaseDao<ResiWarmheartedApplyEnt
      */
     ResiWarmheartedApplyDTO selectResiWarmheartedApply(ResiWarmheartedFormDTO formDTO);
 
-    void saveResiWarmApply(ResiWarmheartedApplyDTO entity);
+    boolean saveResiWarmApply(ResiWarmheartedApplyDTO entity);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedVisitDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedVisitDao.java
index 23f0295760..812f330d5e 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedVisitDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedVisitDao.java
@@ -34,6 +34,6 @@ import javax.management.relation.RelationSupport;
 @Mapper
 public interface ResiWarmheartedVisitDao extends BaseDao<ResiWarmheartedVisitEntity> {
 
-    void saveResiWarmheartedVisit(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
-    void updateResiWarmVisitById(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
+    boolean saveResiWarmheartedVisit(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
+    boolean updateResiWarmVisitById(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedVisitService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedVisitService.java
index cbeecf870f..4a6a698f00 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedVisitService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedVisitService.java
@@ -104,7 +104,7 @@ public interface ResiWarmheartedVisitService extends BaseService<ResiWarmhearted
      * @return void
      * @author sun
      */
-    ResiWarmheartedResultDTO saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO);
+    Result<ResiWarmheartedResultDTO> saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO);
 
     /**
      * 居民端-热心居民申请提交-更新行为记录数据
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 2017b9a869..f3ce755213 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
@@ -122,7 +122,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
     @Transactional(rollbackFor = Exception.class)
     public Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO) {
         //1:热心居民申请行为记录表新增数据
-        ResiWarmheartedResultDTO resiWarmheartedResultDTO = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO);
+        Result<ResiWarmheartedResultDTO> result = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO);
+        if(!result.success()){
+            log.warn(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
+        }
+        ResiWarmheartedResultDTO resiWarmheartedResultDTO = result.getData();
         //2:查询是否已申请热心居民
         ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = resiWarmheartedApplyDao.selectResiWarmheartedApply(formDTO);
         if (null == resiWarmheartedApplyDTO || StringUtils.isEmpty(resiWarmheartedApplyDTO.getId())) {
@@ -135,6 +139,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result submit(ResiWarmheartedSubmitFormDTO formDTO) {
         //1:将申请记录存入热心居民申请表中
         saveResiWarmApply(formDTO);
@@ -148,7 +153,6 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
      * @param formDTO
      * @return
      */
-    @Transactional(rollbackFor = Exception.class)
     public void saveResiWarmApply(ResiWarmheartedSubmitFormDTO formDTO) {
         Date date = new Date();
         ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = new ResiWarmheartedApplyDTO();
@@ -166,7 +170,9 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
         resiWarmheartedApplyDTO.setCreatedTime(date);
         resiWarmheartedApplyDTO.setUpdatedBy(formDTO.getUserId());
         resiWarmheartedApplyDTO.setUpdatedTime(date);
-        resiWarmheartedApplyDao.saveResiWarmApply(resiWarmheartedApplyDTO);
+        if(!resiWarmheartedApplyDao.saveResiWarmApply(resiWarmheartedApplyDTO)){
+            log.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
+        }
     }
 
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedVisitServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedVisitServiceImpl.java
index c9a5b1ec0b..4399629ea6 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedVisitServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedVisitServiceImpl.java
@@ -36,6 +36,8 @@ import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -54,6 +56,7 @@ import java.util.Map;
 @Service
 public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmheartedVisitDao, ResiWarmheartedVisitEntity> implements ResiWarmheartedVisitService {
 
+    private static final Logger log = LoggerFactory.getLogger(ResiWarmheartedVisitServiceImpl.class);
     @Autowired
     private ResiWarmheartedVisitRedis resiWarmheartedVisitRedis;
     @Autowired
@@ -112,7 +115,7 @@ public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmhea
     }
 
     @Override
-    public ResiWarmheartedResultDTO saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO) {
+    public Result<ResiWarmheartedResultDTO> saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO) {
         Date date = new Date();
         ResiWarmheartedVisitDTO resiWarmheartedVisitDTO = new ResiWarmheartedVisitDTO();
         resiWarmheartedVisitDTO.setCustomerId(formDTO.getCustomerId());
@@ -130,28 +133,24 @@ public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmhea
         resiWarmheartedVisitDTO.setCreatedTime(date);
         resiWarmheartedVisitDTO.setUpdatedBy(formDTO.getUserId());
         resiWarmheartedVisitDTO.setUpdatedTime(date);
-        resiWarmheartedVisitDao.saveResiWarmheartedVisit(resiWarmheartedVisitDTO);
+        if(!resiWarmheartedVisitDao.saveResiWarmheartedVisit(resiWarmheartedVisitDTO)){
+            log.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
+        }
         ResiWarmheartedResultDTO resiWarmheartedResultDTO = new ResiWarmheartedResultDTO();
         resiWarmheartedResultDTO.setResiWarmVisitId(resiWarmheartedVisitDTO.getId());
-        return resiWarmheartedResultDTO;
+        return new Result<ResiWarmheartedResultDTO>().ok(resiWarmheartedResultDTO);
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void updateResiWarmVisit(ResiWarmheartedSubmitFormDTO formDTO) {
         ResiWarmheartedVisitDTO resiWarmheartedVisitDTO = new ResiWarmheartedVisitDTO();
         resiWarmheartedVisitDTO.setOperateVisit(ResiWarmheartedVisitConstant.SUCCESS);
-        /*if (true) {
-            //最后一次操作行为-提交成功
-            resiWarmheartedVisitDTO.setOperateVisit(ResiWarmheartedVisitConstant.SUCCESS);
-        } else {
-            //最后一次操作行为-提交失败
-            resiWarmheartedVisitDTO.setOperateVisit(ResiWarmheartedVisitConstant.FAILD);
-        }*/
         resiWarmheartedVisitDTO.setId(formDTO.getResiWarmVisitId());
         resiWarmheartedVisitDTO.setUpdatedBy(formDTO.getUserId());
         resiWarmheartedVisitDTO.setUpdatedTime(new Date());
-        resiWarmheartedVisitDao.updateResiWarmVisitById(resiWarmheartedVisitDTO);
+        if(!resiWarmheartedVisitDao.updateResiWarmVisitById(resiWarmheartedVisitDTO)){
+            log.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
+        }
     }
 
 }
\ No newline at end of file