From d15cb49cacea57a1bd0c9b3c501da2073d338f00 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 31 Mar 2020 15:39:13 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7-=E7=94=B3=E8=AF=B7=E8=A1=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=95=B0=E6=8D=AE=E3=80=81=E8=A1=8C=E4=B8=BA=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E8=A1=A8=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/ResiPartymemberFeignClient.java     | 10 ++-
 .../ResiPartymemberFeignClientFallBack.java   | 11 ++++
 .../controller/ResiWarmheartedController.java |  5 +-
 .../service/ResiWarmheartedService.java       | 10 +++
 .../impl/ResiWarmheartedServiceImpl.java      | 10 +++
 .../form/ResiWarmheartedSubmitFormDTO.java    | 65 +++++++++++++++++++
 .../result/ResiWarmheartedResultDTO.java      |  2 +-
 .../ResiWarmheartedVisitConstant.java         | 23 ++++++-
 .../ResiWarmheartedApplyController.java       | 10 ++-
 .../dao/ResiWarmheartedApplyDao.java          |  3 +
 .../dao/ResiWarmheartedVisitDao.java          |  4 ++
 .../service/ResiWarmheartedApplyService.java  | 14 +++-
 .../service/ResiWarmheartedVisitService.java  | 11 ++++
 .../impl/ResiWarmheartedApplyServiceImpl.java | 44 ++++++++++++-
 .../impl/ResiWarmheartedVisitServiceImpl.java | 26 +++++++-
 .../warmhearted/ResiWarmheartedApplyDao.xml   | 40 +++++++++++-
 .../warmhearted/ResiWarmheartedVisitDao.xml   | 12 +++-
 17 files changed, 283 insertions(+), 17 deletions(-)
 create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java

diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java
index 042adc8dad..37f65911b8 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java
@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.feign.fallback.ResiPartymemberFeignClientFallBack;
 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.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,7 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping;
  * @Description 居民端陌生人导览  调用epmet-user服务
  * @Author sun
  */
-@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class)
+@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class,url="http://localhost:8096")
 public interface ResiPartymemberFeignClient {
 
     /**
@@ -22,4 +23,11 @@ public interface ResiPartymemberFeignClient {
      **/
     @PostMapping(value = "resi/partymember/resiwarmheartedapply/init")
     Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 居民端-热心居民申请-提交申请数据
+     **/
+    @PostMapping(value = "resi/partymember/resiwarmheartedapply/submit")
+    Result submit(ResiWarmheartedSubmitFormDTO formDTO);
 }
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java
index 6580756d0e..da9c740fd4 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java
@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.feign.ResiPartymemberFeignClient;
 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.springframework.stereotype.Component;
 
@@ -26,4 +27,14 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC
     public Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "init", formDTO);
     }
+
+    /**
+     * @Author sun
+     * @Description 居民端-热心居民申请-提交申请数据
+     * @Date 2020/3/30
+     **/
+    @Override
+    public Result submit(ResiWarmheartedSubmitFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "submit", formDTO);
+    }
 }
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java
index 1d16ebf454..0f3d22fe2f 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java
@@ -5,6 +5,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedService;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,8 +40,8 @@ public class ResiWarmheartedController {
      * @Description 居民端-热心居民申请-提交申请数据
      **/
     @PostMapping("submit")
-    public Result<ResiWarmheartedResultDTO> submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedFormDTO resiWarmheartedFormDTO) {
-        return resiWarmheartedService.init(tokenDTO, resiWarmheartedFormDTO);
+    public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedSubmitFormDTO formDTO) {
+        return resiWarmheartedService.submit(tokenDTO, formDTO);
     }
 
 
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java
index a02d86f29f..12924304d3 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java
@@ -3,6 +3,7 @@ package com.epmet.modules.warmhearted.service;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 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;
 
 /**
@@ -21,4 +22,13 @@ public interface ResiWarmheartedService {
      */
     Result<ResiWarmheartedResultDTO> init(TokenDto tokenDTO, ResiWarmheartedFormDTO formDTO);
 
+    /**
+     * 居民端-热心居民申请-提交申请数据
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
+    Result submit(TokenDto tokenDTO, ResiWarmheartedSubmitFormDTO formDTO);
+
 }
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 c83c97e3af..0239db3aa2 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
@@ -6,6 +6,7 @@ import com.epmet.modules.feign.ResiPartymemberFeignClient;
 import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedService;
 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.springframework.beans.factory.annotation.Autowired;
@@ -30,4 +31,13 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
         formDTO.setUserId(tokenDTO.getUserId());
         return resiPartymemberFeignClient.init(formDTO);
     }
+
+    @Override
+    public Result submit(TokenDto tokenDTO, ResiWarmheartedSubmitFormDTO formDTO) {
+        if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
+            return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.USER_NOT_NULL);
+        }
+        formDTO.setUserId(tokenDTO.getUserId());
+        return resiPartymemberFeignClient.submit(formDTO);
+    }
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java
new file mode 100644
index 0000000000..f631a278b9
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.partymember.dto.warmhearted.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 居民端-热心居民申请-提交申请数据-配置入参
+ * @author sun
+ */
+@Data
+public class ResiWarmheartedSubmitFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id CUSTOMER.id
+     */
+    @NotBlank(message = "客户ID不能为空")
+    private String customerId;
+
+    /**
+     * 网格Id
+     */
+    @NotBlank(message = "网格ID不能为空")
+    private String gridId;
+
+    /**
+     * 热心居民申请行为记录表Id
+     */
+    @NotBlank(message = "行为记录表ID不能为空")
+    private String resiWarmVisitId;
+
+    /**
+     * 申请理由(300字)
+     */
+    @NotBlank(message = "申请理由不能为空")
+    private String reason;
+
+    /**
+     * 用户Id
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java
index d6338f9b26..24cb26bda8 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java
@@ -40,6 +40,6 @@ public class ResiWarmheartedResultDTO implements Serializable {
     /**
      * 热心居民申请访问记录表(resi_warmhearted_visit)Id
      */
-    private String resiWarmheartedVisitId;
+    private String resiWarmVisitId;
 
 }
\ 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 31199697f9..a7da270749 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
@@ -10,6 +10,7 @@ package com.epmet.modules.warmhearted.constant;
 
 /**
  * 常量
+ *
  * @author sun
  * @since 1.0.0
  */
@@ -28,5 +29,25 @@ public interface ResiWarmheartedVisitConstant {
     /**
      * 最后一次操作行为-提交失败
      */
-    String FAILD="faild";
+    String FAILD = "faild";
+
+    /**
+     * 热心居民申请-审核状态-待审核
+     */
+    String UNDER_AUDITTING = "under_auditting";
+
+    /**
+     * 热心居民申请-审核状态-审核通过
+     */
+    String APPROVED = "approved";
+
+    /**
+     * 热心居民申请-审核状态-未通过
+     */
+    String REJECTED = "rejected";
+
+    /**
+     * 数据库操作异常
+     */
+    String OPERATION_EXCEPTION = "数据库操作异常！";
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java
index cf9f8d7b7b..430be44a6c 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java
@@ -29,6 +29,7 @@ import com.epmet.modules.warmhearted.excel.ResiWarmheartedApplyExcel;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -94,8 +95,13 @@ public class ResiWarmheartedApplyController {
     }
 
     @PostMapping("init")
-    public Result<ResiWarmheartedResultDTO> init(@RequestBody ResiWarmheartedFormDTO resiWarmheartedFormDTO){
-        return resiWarmheartedApplyService.getResiWarmheartedApply(resiWarmheartedFormDTO);
+    public Result<ResiWarmheartedResultDTO> init(@RequestBody ResiWarmheartedFormDTO formDTO){
+        return resiWarmheartedApplyService.init(formDTO);
+    }
+
+    @PostMapping("submit")
+    public Result submit(@RequestBody ResiWarmheartedSubmitFormDTO formDTO){
+        return resiWarmheartedApplyService.submit(formDTO);
     }
 
 }
\ No newline at end of file
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 ad326b0f38..8283fc3f4c 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
@@ -18,6 +18,7 @@
 package com.epmet.modules.warmhearted.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
@@ -38,4 +39,6 @@ public interface ResiWarmheartedApplyDao extends BaseDao<ResiWarmheartedApplyEnt
      * @return
      */
     ResiWarmheartedApplyDTO selectResiWarmheartedApply(ResiWarmheartedFormDTO formDTO);
+
+    void 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 acf8b76c7b..23f0295760 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
@@ -18,10 +18,13 @@
 package com.epmet.modules.warmhearted.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedVisitEntity;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import javax.management.relation.RelationSupport;
+
 /**
  * 热心居民申请行为记录表
  *
@@ -32,4 +35,5 @@ import org.apache.ibatis.annotations.Mapper;
 public interface ResiWarmheartedVisitDao extends BaseDao<ResiWarmheartedVisitEntity> {
 
     void saveResiWarmheartedVisit(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
+    void 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/ResiWarmheartedApplyService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java
index de325fdd16..385e1dd47f 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java
@@ -23,13 +23,14 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
 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 java.util.List;
 import java.util.Map;
 
 /**
- * 热心居民申请表 
+ * 热心居民申请表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
@@ -103,5 +104,14 @@ public interface ResiWarmheartedApplyService extends BaseService<ResiWarmhearted
      * @return void
      * @author sun
      */
-    Result<ResiWarmheartedResultDTO> getResiWarmheartedApply(ResiWarmheartedFormDTO formDTO);
+    Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO);
+
+    /**
+     * 居民端-热心居民申请-提交申请数据
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
+    Result submit(ResiWarmheartedSubmitFormDTO formDTO);
 }
\ 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 5547cfa243..cbeecf870f 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
@@ -19,9 +19,11 @@ package com.epmet.modules.warmhearted.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedVisitEntity;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO;
 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 java.util.List;
@@ -103,4 +105,13 @@ public interface ResiWarmheartedVisitService extends BaseService<ResiWarmhearted
      * @author sun
      */
     ResiWarmheartedResultDTO saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO);
+
+    /**
+     * 居民端-热心居民申请提交-更新行为记录数据
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
+    void updateResiWarmVisit(ResiWarmheartedSubmitFormDTO formDTO);
 }
\ 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/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
index b8dff8b2c8..2017b9a869 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
@@ -19,12 +19,14 @@ package com.epmet.modules.warmhearted.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant;
 import com.epmet.modules.warmhearted.dao.ResiWarmheartedApplyDao;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
 import com.epmet.modules.warmhearted.redis.ResiWarmheartedApplyRedis;
@@ -32,6 +34,7 @@ import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedVisitService;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
 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.springframework.beans.factory.annotation.Autowired;
@@ -39,9 +42,13 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * 热心居民申请表
  *
@@ -51,6 +58,7 @@ import java.util.Map;
 @Service
 public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmheartedApplyDao, ResiWarmheartedApplyEntity> implements ResiWarmheartedApplyService {
 
+    private static final Logger log = LoggerFactory.getLogger(ResiWarmheartedApplyServiceImpl.class);
     @Autowired
     private ResiWarmheartedApplyRedis resiWarmheartedApplyRedis;
     @Autowired
@@ -112,7 +120,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result<ResiWarmheartedResultDTO> getResiWarmheartedApply(ResiWarmheartedFormDTO formDTO) {
+    public Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO) {
         //1:热心居民申请行为记录表新增数据
         ResiWarmheartedResultDTO resiWarmheartedResultDTO = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO);
         //2:查询是否已申请热心居民
@@ -126,5 +134,39 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
         return new Result<ResiWarmheartedResultDTO>().ok(resiWarmheartedResultDTO);
     }
 
+    @Override
+    public Result submit(ResiWarmheartedSubmitFormDTO formDTO) {
+        //1:将申请记录存入热心居民申请表中
+        saveResiWarmApply(formDTO);
+        //2:将最后一次操作行为更新到热心居民申请行为记录表中
+        resiWarmheartedVisitService.updateResiWarmVisit(formDTO);
+        return new Result();
+    }
+
+    /**
+     * 热心居民申请表新增数据
+     * @param formDTO
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveResiWarmApply(ResiWarmheartedSubmitFormDTO formDTO) {
+        Date date = new Date();
+        ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = new ResiWarmheartedApplyDTO();
+        resiWarmheartedApplyDTO.setCustomerId(formDTO.getCustomerId());
+        resiWarmheartedApplyDTO.setGridId(formDTO.getGridId());
+        resiWarmheartedApplyDTO.setUserId(formDTO.getUserId());
+        resiWarmheartedApplyDTO.setReason(formDTO.getReason());
+        resiWarmheartedApplyDTO.setResiWarmVisitId(formDTO.getResiWarmVisitId());
+        resiWarmheartedApplyDTO.setAuditStatus(ResiWarmheartedVisitConstant.UNDER_AUDITTING);
+        //UUID
+        resiWarmheartedApplyDTO.setId(IdWorker.get32UUID());
+        resiWarmheartedApplyDTO.setDelFlag(NumConstant.ZERO);
+        resiWarmheartedApplyDTO.setRevision(NumConstant.ZERO);
+        resiWarmheartedApplyDTO.setCreatedBy(formDTO.getUserId());
+        resiWarmheartedApplyDTO.setCreatedTime(date);
+        resiWarmheartedApplyDTO.setUpdatedBy(formDTO.getUserId());
+        resiWarmheartedApplyDTO.setUpdatedTime(date);
+        resiWarmheartedApplyDao.saveResiWarmApply(resiWarmheartedApplyDTO);
+    }
 
 }
\ 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 b2841e1b14..c9a5b1ec0b 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
@@ -25,6 +25,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant;
 import com.epmet.modules.warmhearted.dao.ResiWarmheartedVisitDao;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedVisitEntity;
@@ -32,6 +33,7 @@ import com.epmet.modules.warmhearted.redis.ResiWarmheartedVisitRedis;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedVisitService;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO;
 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.springframework.beans.factory.annotation.Autowired;
@@ -73,8 +75,8 @@ public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmhea
         return ConvertUtils.sourceToTarget(entityList, ResiWarmheartedVisitDTO.class);
     }
 
-    private QueryWrapper<ResiWarmheartedVisitEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<ResiWarmheartedVisitEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<ResiWarmheartedVisitEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -130,8 +132,26 @@ public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmhea
         resiWarmheartedVisitDTO.setUpdatedTime(date);
         resiWarmheartedVisitDao.saveResiWarmheartedVisit(resiWarmheartedVisitDTO);
         ResiWarmheartedResultDTO resiWarmheartedResultDTO = new ResiWarmheartedResultDTO();
-        resiWarmheartedResultDTO.setResiWarmheartedVisitId(resiWarmheartedVisitDTO.getId());
+        resiWarmheartedResultDTO.setResiWarmVisitId(resiWarmheartedVisitDTO.getId());
         return 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);
+    }
+
 }
\ No newline at end of file
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 609c5ba8ee..3947be348a 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
@@ -26,9 +26,9 @@
         rw.grid_id AS "gridid",
         rw.user_id AS "userid",
         rw.reason AS "reason",
-        rw.audit_status AS "auditstatus",
-        rw.refuse_reason AS "refusereason",
-        rw.resi_warm_visit_id AS "resiwarmvisitid",
+        rw.audit_status AS "auditStatus",
+        rw.refuse_reason AS "refuseReason",
+        rw.resi_warm_visit_id AS "resiWarmVisitId",
         rw.del_flag AS "delflag",
         rw.revision AS "revision",
         rw.created_by AS "createdby",
@@ -37,6 +37,40 @@
         rw.updated_time AS "updatedtime"
     </sql>
 
+    <insert id="saveResiWarmApply" parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO">
+        INSERT INTO resi_warmhearted_apply (
+            id,
+            customer_id,
+            grid_id,
+            user_id,
+            reason,
+            audit_status,
+            refuse_reason,
+            resi_warm_visit_id,
+            del_flag,
+            revision,
+            created_by,
+            created_time,
+            updated_by,
+            updated_time
+        )VALUES(
+            #{id},
+            #{customerId},
+            #{gridId},
+            #{userId},
+            #{reason},
+            #{auditStatus},
+            #{refuseReason},
+            #{resiWarmVisitId},
+            #{delFlag},
+            #{revision},
+            #{createdBy},
+            #{createdTime},
+            #{updatedBy},
+            #{updatedTime}
+        )
+    </insert>
+
     <select id="selectResiWarmheartedApply" parameterType="com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO"
             resultType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO">
         SELECT
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedVisitDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedVisitDao.xml
index ff6c879e83..a5ca41604e 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedVisitDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedVisitDao.xml
@@ -19,7 +19,8 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <insert id="saveResiWarmheartedVisit" parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO">
+    <insert id="saveResiWarmheartedVisit"
+            parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO">
         INSERT INTO resi_warmhearted_visit (
             id,
             customer_id,
@@ -50,5 +51,14 @@
             #{updatedTime}
         )
     </insert>
+    <update id="updateResiWarmVisitById"
+            parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO">
+        UPDATE resi_warmhearted_visit
+        SET operate_visit = #{operateVisit},
+         updated_by = #{updatedBy},
+         updated_time = #{updatedTime}
+        WHERE
+            id = #{id}
+    </update>
 
 </mapper>
\ No newline at end of file

From e2c0ae6071ca624453e21e26f583cee71712ea06 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Tue, 31 Mar 2020 16:13:11 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E7=BB=84=E9=95=BF=E5=90=8C=E6=84=8F?=
 =?UTF-8?q?=E5=85=A5=E7=BE=A4=E3=80=81=E6=8B=92=E7=BB=9D=E5=85=A5=E7=BE=A4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/dao/ResiGroupMemberDao.java        | 10 ++++++++
 .../impl/ResiGroupMemberServiceImpl.java      | 24 ++++++++++++++++++-
 .../epmet/modules/utils/ModuleConstant.java   | 10 ++++++++
 .../mapper/member/ResiGroupMemberDao.xml      | 12 ++++++++++
 4 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
index 308999e187..6c7d8bf7b5 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
@@ -86,4 +86,14 @@ public interface ResiGroupMemberDao extends BaseDao<ResiGroupMemberEntity> {
 	 * @Date 2020/3/31 14:52
 	 **/
 	GroupMemeberOperationDTO selectGroupMemberOperationUnderAudit(@Param("userId") String userId, @Param("groupId") String groupId);
+
+	/**
+	 * @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO
+	 * @param groupId
+	 * @param userId
+	 * @Author yinzuomei
+	 * @Description 根据组id+用户id查询成员信息
+	 * @Date 2020/3/31 16:06
+	 **/
+	ResiGroupMemberDTO selectGroupMemberInfo(@Param("groupId") String groupId, @Param("userId")String userId);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index b217cc764f..2d274d18f4 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -36,6 +36,7 @@ import com.epmet.modules.member.entity.ResiGroupMemberEntity;
 import com.epmet.modules.member.redis.ResiGroupMemberRedis;
 import com.epmet.modules.member.service.GroupMemeberOperationService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
+import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.resi.group.constant.EnterGroupTypeConstant;
 import com.epmet.resi.group.constant.LeaderFlagConstant;
 import com.epmet.resi.group.constant.MemberStateConstant;
@@ -236,10 +237,20 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 **/
 	@Override
 	public Result agreeApply(AgreeApplyFormDTO agreeApplyFormDTO) {
-		//修改操作状态
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(agreeApplyFormDTO.getApplyId());
+		//当前申请单是否是待审核
+		if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
+			return new Result().error(ModuleConstant.APPLY_NOEXISTS);
+		}
+		//只有群主才可以审批入群申请
+		ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), agreeApplyFormDTO.getUserId());
+		if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) {
+			return new Result().error(ModuleConstant.CANNOT_AUDIT_APPLY);
+		}
+		//修改操作状态
 		groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
 		groupMemeberOperationDTO.setUpdatedBy(agreeApplyFormDTO.getUserId());
+		groupMemeberOperationDTO.setOperateUserId(agreeApplyFormDTO.getUserId());
 		groupMemeberOperationService.update(groupMemeberOperationDTO);
 		//加入群成员关系表
 		ResiGroupMemberDTO resiGroupMemberDTO = new ResiGroupMemberDTO();
@@ -268,9 +279,20 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	@Override
 	public Result disAgreeApply(DisagreeApplyFormDTO disagreeApplyFormDTO) {
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(disagreeApplyFormDTO.getApplyId());
+		//当前申请单是否是待审核
+		if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
+			return new Result().error(ModuleConstant.APPLY_NOEXISTS);
+		}
+		//只有群主才可以审批入群申请
+		ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), disagreeApplyFormDTO.getUserId());
+		if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) {
+			return new Result().error(ModuleConstant.CANNOT_AUDIT_APPLY);
+		}
+		//修改操作状态
 		groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.REJECTED);
 		groupMemeberOperationDTO.setOperateDes(disagreeApplyFormDTO.getOperateDesc());
 		groupMemeberOperationDTO.setUpdatedBy(disagreeApplyFormDTO.getUserId());
+		groupMemeberOperationDTO.setOperateUserId(disagreeApplyFormDTO.getUserId());
 		groupMemeberOperationService.update(groupMemeberOperationDTO);
 		return new Result();
 	}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
index 805b1496d7..e1678d364a 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
@@ -67,4 +67,14 @@ public interface ModuleConstant extends Constant {
 	 * customerId不能为空
 	 */
 	String CUSTOMERID_NOT_NULL="客户id不能为空";
+
+	/**
+	 * 组长审批时校验申请单是否存在
+	 */
+	String APPLY_NOEXISTS="申请单被删除";
+
+	/**
+	 * 组长审批时校验当前用户身份
+	 */
+	String CANNOT_AUDIT_APPLY="只有群主才可以审批入群申请";
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
index 4a47034b33..11c6f10481 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
@@ -81,4 +81,16 @@
         and gmo.CUSTOMER_USER_ID=#{userId}
         and gmo.GROUP_ID=#{groupId}
     </select>
+
+    <!-- 根据组id+用户id查询成员信息   -->
+    <select id="selectGroupMemberInfo"parameterType="map" resultType="com.epmet.resi.group.dto.member.ResiGroupMemberDTO">
+         SELECT
+            rgm.*
+        FROM
+            resi_group_member rgm
+        WHERE
+            rgm.DEL_FLAG = '0'
+            AND rgm.RESI_GROUP_ID = #{groupId}
+            AND rgm.CUSTOMER_USER_ID=#{userId}
+    </select>
 </mapper>

From e18a2e61164de7f320681ed00751263dec82a731 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Tue, 31 Mar 2020 16:32:45 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiGroupMemberServiceImpl.java  | 15 +++++++++++++++
 .../mapper/member/ResiGroupMemberDao.xml          |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index 2d274d18f4..f3d6f585a5 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -210,6 +210,13 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		int pageIndex = (groupMemberListFormDTO.getPageNo() - NumConstant.ONE) * groupMemberListFormDTO.getPageSize();
 		groupMemberListFormDTO.setPageNo(pageIndex);
 		List<GroupMemberListResultDTO> list = baseDao.selectListGroupMember(groupMemberListFormDTO);
+		if (null != list && list.size() > 0) {
+			for (GroupMemberListResultDTO groupMemberListResultDTO : list) {
+				groupMemberListResultDTO.setUserShowName("测试昵称");
+				groupMemberListResultDTO.setHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132");
+
+			}
+		}
 		return new Result<List<GroupMemberListResultDTO>>().ok(list);
 	}
 
@@ -225,6 +232,12 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		int pageIndex = (applyingMemberFormDTO.getPageNo() - NumConstant.ONE) * applyingMemberFormDTO.getPageSize();
 		applyingMemberFormDTO.setPageNo(pageIndex);
 		List<ApplyingMemberResultDTO> list = baseDao.selectListApplyingMember(applyingMemberFormDTO);
+		if (null != list && list.size() > 0) {
+			for (ApplyingMemberResultDTO applyingMemberResultDTO : list) {
+				applyingMemberResultDTO.setApplyUserName("测试昵称");
+				applyingMemberResultDTO.setApplyUserHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132");
+			}
+		}
 		return new Result<List<ApplyingMemberResultDTO>>().ok(list);
 	}
 
@@ -266,6 +279,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
                 groupMemeberOperationDTO.getCustomerUserId(),
 				agreeApplyFormDTO.getCustomerId());
 		baseDao.updateResiGroupStatistical(groupMemeberOperationDTO.getGroupId(), userRoleDTO);
+		//给用户发送消息 TODO
 		return new Result();
 	}
 
@@ -294,6 +308,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		groupMemeberOperationDTO.setUpdatedBy(disagreeApplyFormDTO.getUserId());
 		groupMemeberOperationDTO.setOperateUserId(disagreeApplyFormDTO.getUserId());
 		groupMemeberOperationService.update(groupMemeberOperationDTO);
+		//给用户发送消息 TODO
 		return new Result();
 	}
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
index 11c6f10481..b175972d81 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
@@ -83,7 +83,7 @@
     </select>
 
     <!-- 根据组id+用户id查询成员信息   -->
-    <select id="selectGroupMemberInfo"parameterType="map" resultType="com.epmet.resi.group.dto.member.ResiGroupMemberDTO">
+    <select id="selectGroupMemberInfo" parameterType="map" resultType="com.epmet.resi.group.dto.member.ResiGroupMemberDTO">
          SELECT
             rgm.*
         FROM

From eaf00d671cec2148e1b95f3e35586ccf59609427 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Tue, 31 Mar 2020 16:49:46 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=85=A5=E7=BE=A4?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=E9=81=BF=E5=85=8D=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/modules/member/dao/ResiGroupMemberDao.java   |  2 +-
 .../service/impl/ResiGroupMemberServiceImpl.java       | 10 +++++++---
 .../java/com/epmet/modules/utils/ModuleConstant.java   |  5 +++++
 .../resources/mapper/member/ResiGroupMemberDao.xml     |  5 +++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
index 6c7d8bf7b5..737474d53d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
@@ -85,7 +85,7 @@ public interface ResiGroupMemberDao extends BaseDao<ResiGroupMemberEntity> {
 	 * @Description 查看用户是否存在有效的入群申请
 	 * @Date 2020/3/31 14:52
 	 **/
-	GroupMemeberOperationDTO selectGroupMemberOperationUnderAudit(@Param("userId") String userId, @Param("groupId") String groupId);
+	GroupMemeberOperationDTO selectGroupMemberOperationLatest(@Param("userId") String userId, @Param("groupId") String groupId);
 
 	/**
 	 * @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index f3d6f585a5..25d308c595 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -48,6 +48,7 @@ import com.epmet.resi.group.dto.member.form.*;
 import com.epmet.resi.group.dto.member.result.ApplyingMemberResultDTO;
 import com.epmet.resi.group.dto.member.result.GroupMemberListResultDTO;
 import org.apache.commons.lang3.StringUtils;
+import org.bouncycastle.math.raw.Mod;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -176,14 +177,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 				return errorResult;
 			}
 		}
-		//校验是否存在待审核的入群记录
-		GroupMemeberOperationDTO groupMember = baseDao.selectGroupMemberOperationUnderAudit(applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId());
-		if(null!=groupMember){
+		//查看用户最新一条成员处理记录，避免重复申请
+		GroupMemeberOperationDTO groupMember = baseDao.selectGroupMemberOperationLatest(applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId());
+		if(null!=groupMember&&MemberStateConstant.UNDER_AUDITTING.equals(groupMember.getOperateStatus())){
 			Result errorResult = new Result();
 			errorResult.setCode(EpmetErrorCode.ALREADY_APPLIED_GROUP.getValue());
 			errorResult.setMsg(EpmetErrorCode.ALREADY_APPLIED_GROUP.getName());
 			return errorResult;
 		}
+		if(null!=groupMember&&MemberStateConstant.APPROVED.equals(groupMember.getOperateStatus())){
+			return new Result().error(ModuleConstant.ALREADY_IN_GROUP);
+		}
 		//插入一条待审核的记录
 		GroupMemeberOperationDTO groupMemeberOperation = new GroupMemeberOperationDTO();
 		groupMemeberOperation.setGroupId(applyJoinGroupFormDTO.getGroupId());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
index e1678d364a..646ec81fa3 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
@@ -77,4 +77,9 @@ public interface ModuleConstant extends Constant {
 	 * 组长审批时校验当前用户身份
 	 */
 	String CANNOT_AUDIT_APPLY="只有群主才可以审批入群申请";
+
+	/**
+	 * 申请入群是校验是否已经在群内
+	 */
+	String ALREADY_IN_GROUP="已经在群内，无需申请";
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
index b175972d81..2ae5acd289 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
@@ -74,12 +74,13 @@
     </select>
 
     <!--  查看用户是否存在有效的入群申请  -->
-    <select id="selectGroupMemberOperationUnderAudit" parameterType="map" resultType="com.epmet.resi.group.dto.member.GroupMemeberOperationDTO">
+    <select id="selectGroupMemberOperationLatest" parameterType="map" resultType="com.epmet.resi.group.dto.member.GroupMemeberOperationDTO">
         select gmo.* from group_memeber_operation gmo
         where gmo.DEL_FLAG='0'
-        and gmo.OPERATE_STATUS='under_auditting'
         and gmo.CUSTOMER_USER_ID=#{userId}
         and gmo.GROUP_ID=#{groupId}
+        order by gmo.CREATED_TIME desc
+        limit 1
     </select>
 
     <!-- 根据组id+用户id查询成员信息   -->

From 45eb15732426265a3585bcef3725ce46c873bef1 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Tue, 31 Mar 2020 17:08:05 +0800
Subject: [PATCH 5/9] =?UTF-8?q?selectOperUserInfoById=E5=85=A5=E5=8F=82?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAuser.id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/OperUserDao.java            | 6 +++---
 .../src/main/resources/mapper/OperUserDao.xml               | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/OperUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/OperUserDao.java
index aea4b58d61..c084343bb8 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/OperUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/OperUserDao.java
@@ -32,8 +32,8 @@ import org.apache.ibatis.annotations.Mapper;
 public interface OperUserDao extends BaseDao<OperUserEntity> {
 	/**
 	 * 根据id查询运营人员信息
-	 * @param id
+	 * @param userId
 	 * @return OperUserDTO
 	 */
-	OperUserDTO selectOperUserInfoById(String id);
-}
\ No newline at end of file
+	OperUserDTO selectOperUserInfoById(String userId);
+}
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/OperUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/OperUserDao.xml
index f249294836..53c8b07fed 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/OperUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/OperUserDao.xml
@@ -30,8 +30,8 @@
         FROM
             oper_user
         WHERE
-            id = #{id}
+            USER_ID = #{userId}
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>

From 623676ee70879648b101166d0f3758d78278f499 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Wed, 1 Apr 2020 00:19:42 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9A=E7=94=9F=E6=88=90=E7=BE=A4=E9=93=BE=E6=8E=A5=E3=80=81?=
 =?UTF-8?q?=E5=90=8C=E6=84=8F=E8=BF=9B=E7=BE=A4=E3=80=81=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E9=82=80=E8=AF=B7=E8=BF=9E=E6=8E=A5=E6=9F=A5=E8=AF=A2=E7=BE=A4?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/exception/EpmetErrorCode.java       |   4 +-
 .../dto/invitation/GroupInvitationDTO.java    | 101 +++++++
 .../form/AccetInvitationFormDTO.java          |  31 +++
 .../form/CreateGroupInvitationFormDTO.java    |  28 ++
 .../invitation/form/LinkGroupInfoFormDTO.java |  27 ++
 .../CreateGroupInvitationResultDTO.java       |  20 ++
 .../result/LinkGroupInfoResultDTO.java        |  51 ++++
 .../group/service/ResiGroupService.java       |  12 +
 .../service/impl/ResiGroupServiceImpl.java    |  18 +-
 .../modules/invitation/controller/.gitkeep    |   0
 .../controller/GroupInvitationController.java |  97 +++++++
 .../com/epmet/modules/invitation/dao/.gitkeep |   0
 .../invitation/dao/GroupInvitationDao.java    |  44 +++
 .../epmet/modules/invitation/entity/.gitkeep  |   0
 .../entity/GroupInvitationEntity.java         |  71 +++++
 .../epmet/modules/invitation/excel/.gitkeep   |   0
 .../service/GroupInvitationService.java       | 128 +++++++++
 .../modules/invitation/service/impl/.gitkeep  |   0
 .../impl/GroupInvitationServiceImpl.java      | 252 ++++++++++++++++++
 .../impl/ResiGroupMemberServiceImpl.java      |  51 +---
 .../epmet/modules/utils/ModuleConstant.java   |   5 +
 .../mapper/invitation/GroupInvitationDao.xml  |  25 ++
 22 files changed, 906 insertions(+), 59 deletions(-)
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/GroupInvitationDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/AccetInvitationFormDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/CreateGroupInvitationFormDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/LinkGroupInfoFormDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/CreateGroupInvitationResultDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java
 delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/.gitkeep
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java
 delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/.gitkeep
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java
 delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/.gitkeep
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/GroupInvitationEntity.java
 delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/excel/.gitkeep
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java
 delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/.gitkeep
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/GroupInvitationDao.xml

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 b9b252dcad..9321d14e60 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
@@ -9,7 +9,9 @@ public enum EpmetErrorCode {
 	CANNOT_JOIN_GROUP(8001, "只有认证党员和居民才可以加入小组，请选择您的身份"),
 	CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组，请选择您的身份"),
 	GROUP_ALREADY_EXISTED(8003,"您的组名已存在，请重新修改"),
-	ALREADY_APPLIED_GROUP(8004,"该群已申请过，请耐心等待审核");
+	ALREADY_APPLIED_GROUP(8004,"该群已申请过，请耐心等待审核"),
+	ONLY_LEADER_CAN_INVITE(8005,"抱歉，只有群主才可以邀请新成员"),
+	LOSE_EFFICACY(8006,"链接已失效");
 
 	private int value;
 	private String name;
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/GroupInvitationDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/GroupInvitationDTO.java
new file mode 100644
index 0000000000..b4bc7fe18a
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/GroupInvitationDTO.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.invitation;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 群邀请记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-31
+ */
+@Data
+public class GroupInvitationDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键（可能跟epmet-user的personnel_invite的[邀请Id]关联）
+     */
+	private String id;
+
+    /**
+     * 邀请人id（customer_user.id）
+     */
+	private String inviterUserId;
+
+    /**
+     * 邀请人所属客户id
+     */
+	private String inviterCustomerId;
+
+    /**
+     * 邀请网格id
+     */
+	private String inviterGridId;
+
+    /**
+     * 邀请小组id(resi_group.id)
+     */
+	private String resiGroupId;
+
+    /**
+     * 邀请内容
+     */
+	private String inviterContent;
+
+    /**
+     * 邀请码有效截止时间（暂定XX天）
+     */
+	private Date validEndTime;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人（customer_user.id）
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间(邀请时间)
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/AccetInvitationFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/AccetInvitationFormDTO.java
new file mode 100644
index 0000000000..532b86c68d
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/AccetInvitationFormDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.resi.group.dto.invitation.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 同意邀请进组
+ * @Author yinzuomei
+ * @Date 2020/3/31 23:45
+ */
+@Data
+public class AccetInvitationFormDTO implements Serializable {
+	private static final long serialVersionUID = 132547449950577938L;
+
+	/**
+	 * 邀请id
+	 */
+	@NotBlank(message="邀请链接id不能为空")
+	private String invitationId;
+
+	/**
+	 * 当前登录用户id由TokenDto赋值
+	 */
+	@NotBlank(message="当前用户id不能为空")
+	private String userId;
+
+	@NotBlank(message = "app不能为空")
+	private String app;
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/CreateGroupInvitationFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/CreateGroupInvitationFormDTO.java
new file mode 100644
index 0000000000..2c474460f0
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/CreateGroupInvitationFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.resi.group.dto.invitation.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 生成邀请链接入参
+ * @Author yinzuomei
+ * @Date 2020/3/31 22:46
+ */
+@Data
+public class CreateGroupInvitationFormDTO implements Serializable {
+	private static final long serialVersionUID = 5703017117444559566L;
+
+	/**
+	 * 要审核的组id
+	 */
+	@NotBlank(message="groupId不能为空")
+	private String groupId;
+
+	/**
+	 * 当前登录用户id由TokenDto赋值
+	 */
+	@NotBlank(message="当前用户id不能为空")
+	private String userId;
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/LinkGroupInfoFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/LinkGroupInfoFormDTO.java
new file mode 100644
index 0000000000..eab8aa8247
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/LinkGroupInfoFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.resi.group.dto.invitation.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 根据群邀请连接查询群基本信息入参DTO
+ * @Author yinzuomei
+ * @Date 2020/3/31 23:12
+ */
+@Data
+public class LinkGroupInfoFormDTO implements Serializable {
+	private static final long serialVersionUID = 7069116393380944951L;
+
+	/**
+	 * 邀请id
+	 */
+	@NotBlank(message="邀请链接id不能为空")
+	private String invitationId;
+
+	/**
+	 * 当前登录用户id由TokenDto赋值
+	 */
+	private String userId;
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/CreateGroupInvitationResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/CreateGroupInvitationResultDTO.java
new file mode 100644
index 0000000000..b8d3a690c0
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/CreateGroupInvitationResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.resi.group.dto.invitation.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 生成邀请链接返参
+ * @Author yinzuomei
+ * @Date 2020/3/31 22:49
+ */
+@Data
+public class CreateGroupInvitationResultDTO implements Serializable {
+	private static final long serialVersionUID = 5142118627780324057L;
+
+	/**
+	 * 邀请id
+	 */
+	private String invitationId;
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java
new file mode 100644
index 0000000000..b856309601
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java
@@ -0,0 +1,51 @@
+package com.epmet.resi.group.dto.invitation.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 根据群邀请连接查询群基本信息入参DTO 小组邀请界面信息
+ * @Author yinzuomei
+ * @Date 2020/3/31 23:18
+ */
+@Data
+public class LinkGroupInfoResultDTO implements Serializable {
+	private static final long serialVersionUID = 8860336693592035343L;
+
+	/**
+	 * 群组id
+	 */
+	private String groupId;
+
+	/**
+	 * 群组头像
+	 */
+	private String groupHeadPhoto;
+
+	/**
+	 * 组长名称！！！！！！！！
+	 * 暂定街道-姓名
+	 */
+	private String leaderName;
+
+	/**
+	 * 群组名称
+	 */
+	private String groupName;
+
+	/**
+	 * 组介绍
+	 */
+	private String groupIntroduction;
+
+	/**
+	 * 成员总数
+	 */
+	private Integer totalMember;
+
+	/**
+	 * 党员总数
+	 */
+	private Integer totalPartyMember;
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
index 73eb3ef5a7..f999d2ed8f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
@@ -24,6 +24,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.modules.group.entity.ResiGroupEntity;
+import com.epmet.resi.group.dto.UserRoleDTO;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.CreatedResultDTO;
@@ -192,4 +193,15 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @Date 2020/3/31 13:22
 	 **/
 	Result disagreeApplyGroup(DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO);
+
+	/**
+	 * @return com.epmet.resi.group.dto.UserRoleDTO
+	 * @param app
+	 * @param userId
+	 * @param customerId
+	 * @Author yinzuomei
+	 * @Description 判断用户当前角色
+	 * @Date 2020/4/1 0:00
+	 **/
+	UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 90b0ece47b..49dcdf4184 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -291,10 +291,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		//1、校验是否同名
 		List<ResiGroupEntity> resiGroupEntityList = this.getResiGroupEntityList(applyCreateGroupFormDTO);
 		if (null != resiGroupEntityList && resiGroupEntityList.size() > 0) {
-			Result errorResult = new Result();
-			errorResult.setCode(EpmetErrorCode.GROUP_ALREADY_EXISTED.getValue());
-			errorResult.setMsg(EpmetErrorCode.GROUP_ALREADY_EXISTED.getName());
-			return errorResult;
+			return new Result().error(EpmetErrorCode.GROUP_ALREADY_EXISTED.getValue(),EpmetErrorCode.GROUP_ALREADY_EXISTED.getName());
 		}
 		//2、插入一条待审核的组信息
 		ResiGroupEntity resiGroupEntity = this.structureResiGroupEntity(applyCreateGroupFormDTO);
@@ -375,10 +372,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		Result<UserResiInfoDTO> result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
 		if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) {
 			logger.info("居民注册信息查询失败");
-			Result errorResult = new Result();
-			errorResult.setCode(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue());
-			errorResult.setMsg(EpmetErrorCode.CANNOT_JOIN_GROUP.getName());
-			return errorResult;
+			return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(),EpmetErrorCode.CANNOT_JOIN_GROUP.getName());
 		}
 		return new Result();
 	}
@@ -413,10 +407,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		}
 		UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(tokenDto.getApp(), tokenDto.getUserId(), customerId);
 		if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) {
-			Result errorResult = new Result();
-			errorResult.setCode(EpmetErrorCode.CANNOT_CREATE_GROUP.getValue());
-			errorResult.setMsg(EpmetErrorCode.CANNOT_CREATE_GROUP.getName());
-			return errorResult;
+			return new Result().error(EpmetErrorCode.CANNOT_CREATE_GROUP.getValue(),EpmetErrorCode.CANNOT_CREATE_GROUP.getName());
 		}
 		return new Result();
 	}
@@ -493,7 +484,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @Description 用户拥有党员或者热心居民标签返回true, 没有权限返回false
 	 * @Date 2020/3/30 16:33
 	 **/
-	private UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId) {
+	@Override
+	public UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId) {
 		UserRoleDTO userRoleDTO = new UserRoleDTO();
 		UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO();
 		userRoleFormDTO.setApp(app);
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java
new file mode 100644
index 0000000000..62a9bbd452
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.invitation.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.modules.invitation.service.GroupInvitationService;
+import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO;
+import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO;
+import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO;
+import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO;
+import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 群邀请记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-31
+ */
+@RestController
+@RequestMapping("invitation")
+public class GroupInvitationController {
+
+	@Autowired
+	private GroupInvitationService groupInvitationService;
+
+	/**
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO>
+	 * @Author yinzuomei
+	 * @Description 生成邀请
+	 * @Date 2020/3/31 22:50
+	 **/
+	@PostMapping("creategroupinvitation")
+	public Result<CreateGroupInvitationResultDTO> createGroupInvitation(@LoginUser TokenDto tokenDto,
+																		@RequestBody CreateGroupInvitationFormDTO formDTO) {
+		formDTO.setUserId(tokenDto.getUserId());
+		ValidatorUtils.validateEntity(formDTO);
+		return groupInvitationService.createGroupInvitation(formDTO);
+	}
+
+	/**
+	 * @param tokenDto
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 根据群邀请连接查询群基本信息
+	 * @Date 2020/3/31 23:11
+	 **/
+	@PostMapping("getlinkgroupinfo")
+	public Result<LinkGroupInfoResultDTO> getLinkGroupInfo(@LoginUser TokenDto tokenDto,
+														   @RequestBody LinkGroupInfoFormDTO formDTO) {
+		formDTO.setUserId(tokenDto.getUserId());
+		ValidatorUtils.validateEntity(formDTO);
+		return groupInvitationService.getLinkGroupInfo(formDTO);
+	}
+
+    /**
+     * @param tokenDto
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 同意邀请进组
+     * @Date 2020/3/31 23:47
+     **/
+    @PostMapping("acceptinvitation")
+    public Result accetInvitation(@LoginUser TokenDto tokenDto,
+                                  @RequestBody AccetInvitationFormDTO formDTO) {
+        formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setApp(tokenDto.getApp());
+        ValidatorUtils.validateEntity(formDTO);
+        return groupInvitationService.accetInvitation(formDTO);
+    }
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java
new file mode 100644
index 0000000000..c521956b8b
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.invitation.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.invitation.entity.GroupInvitationEntity;
+import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO;
+import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 群邀请记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-31
+ */
+@Mapper
+public interface GroupInvitationDao extends BaseDao<GroupInvitationEntity> {
+
+	/**
+	 * @param groupId
+	 * @return com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO
+	 * @Author yinzuomei
+	 * @Description 根据群邀请连接查询群基本信息
+	 * @Date 2020/3/31 23:22
+	 **/
+	LinkGroupInfoResultDTO selectLinkGroupInfo(@Param("groupId") String groupId);
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/GroupInvitationEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/GroupInvitationEntity.java
new file mode 100644
index 0000000000..a5f23c21a4
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/GroupInvitationEntity.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.invitation.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 群邀请记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-31
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("group_invitation")
+public class GroupInvitationEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 邀请人id（customer_user.id）
+     */
+	private String inviterUserId;
+
+    /**
+     * 邀请人所属客户id
+     */
+	private String inviterCustomerId;
+
+    /**
+     * 邀请网格id
+     */
+	private String inviterGridId;
+
+    /**
+     * 邀请小组id(resi_group.id)
+     */
+	private String resiGroupId;
+
+    /**
+     * 邀请内容
+     */
+	private String inviterContent;
+
+    /**
+     * 邀请码有效截止时间（暂定XX天）
+     */
+	private Date validEndTime;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/excel/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/excel/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java
new file mode 100644
index 0000000000..adc45ff5b2
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java
@@ -0,0 +1,128 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.invitation.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.modules.invitation.entity.GroupInvitationEntity;
+import com.epmet.resi.group.dto.invitation.GroupInvitationDTO;
+import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO;
+import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO;
+import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO;
+import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO;
+import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 群邀请记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-31
+ */
+public interface GroupInvitationService extends BaseService<GroupInvitationEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<GroupInvitationDTO>
+     * @author generator
+     * @date 2020-03-31
+     */
+    PageData<GroupInvitationDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<GroupInvitationDTO>
+     * @author generator
+     * @date 2020-03-31
+     */
+    List<GroupInvitationDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return GroupInvitationDTO
+     * @author generator
+     * @date 2020-03-31
+     */
+    GroupInvitationDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-31
+     */
+    void save(GroupInvitationDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-31
+     */
+    void update(GroupInvitationDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-03-31
+     */
+    void delete(String[] ids);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO>
+     * @param formDTO
+     * @Author yinzuomei
+     * @Description 生成邀请连接
+     * @Date 2020/3/31 22:50
+     **/
+	Result<CreateGroupInvitationResultDTO> createGroupInvitation(CreateGroupInvitationFormDTO formDTO);
+
+	/**
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO>
+	 * @param formDTO
+	 * @Author yinzuomei
+	 * @Description 根据群邀请连接查询群基本信息
+	 * @Date 2020/3/31 23:20
+	 **/
+    Result<LinkGroupInfoResultDTO> getLinkGroupInfo(LinkGroupInfoFormDTO formDTO);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param formDTO
+     * @Author yinzuomei
+     * @Description 同意邀请进组
+     * @Date 2020/3/31 23:47
+     **/
+	Result accetInvitation(AccetInvitationFormDTO formDTO);
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
new file mode 100644
index 0000000000..8e36224680
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
@@ -0,0 +1,252 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.invitation.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.modules.group.service.ResiGroupService;
+import com.epmet.modules.invitation.dao.GroupInvitationDao;
+import com.epmet.modules.invitation.entity.GroupInvitationEntity;
+import com.epmet.modules.invitation.service.GroupInvitationService;
+import com.epmet.modules.member.dao.ResiGroupMemberDao;
+import com.epmet.modules.member.service.GroupMemeberOperationService;
+import com.epmet.modules.member.service.ResiGroupMemberService;
+import com.epmet.modules.utils.ModuleConstant;
+import com.epmet.resi.group.constant.EnterGroupTypeConstant;
+import com.epmet.resi.group.constant.GroupStateConstant;
+import com.epmet.resi.group.constant.LeaderFlagConstant;
+import com.epmet.resi.group.constant.MemberStateConstant;
+import com.epmet.resi.group.dto.UserRoleDTO;
+import com.epmet.resi.group.dto.group.ResiGroupDTO;
+import com.epmet.resi.group.dto.invitation.GroupInvitationDTO;
+import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO;
+import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO;
+import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO;
+import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO;
+import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO;
+import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
+import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * 群邀请记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-31
+ */
+@Service
+public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationDao, GroupInvitationEntity> implements GroupInvitationService {
+
+	@Autowired
+	private ResiGroupMemberDao resiGroupMemberDao;
+
+	@Autowired
+	private ResiGroupService resiGroupService;
+
+	@Autowired
+	private ResiGroupMemberService resiGroupMemberService;
+
+	@Autowired
+	private GroupMemeberOperationService groupMemeberOperationService;
+
+	@Override
+	public PageData<GroupInvitationDTO> page(Map<String, Object> params) {
+		IPage<GroupInvitationEntity> page = baseDao.selectPage(
+				getPage(params, FieldConstant.CREATED_TIME, false),
+				getWrapper(params)
+		);
+		return getPageData(page, GroupInvitationDTO.class);
+	}
+
+	@Override
+	public List<GroupInvitationDTO> list(Map<String, Object> params) {
+		List<GroupInvitationEntity> entityList = baseDao.selectList(getWrapper(params));
+
+		return ConvertUtils.sourceToTarget(entityList, GroupInvitationDTO.class);
+	}
+
+	private QueryWrapper<GroupInvitationEntity> getWrapper(Map<String, Object> params) {
+		String id = (String) params.get(FieldConstant.ID_HUMP);
+
+		QueryWrapper<GroupInvitationEntity> wrapper = new QueryWrapper<>();
+		wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+		return wrapper;
+	}
+
+	@Override
+	public GroupInvitationDTO get(String id) {
+		GroupInvitationEntity entity = baseDao.selectById(id);
+		return ConvertUtils.sourceToTarget(entity, GroupInvitationDTO.class);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void save(GroupInvitationDTO dto) {
+		GroupInvitationEntity entity = ConvertUtils.sourceToTarget(dto, GroupInvitationEntity.class);
+		insert(entity);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void update(GroupInvitationDTO dto) {
+		GroupInvitationEntity entity = ConvertUtils.sourceToTarget(dto, GroupInvitationEntity.class);
+		updateById(entity);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delete(String[] ids) {
+		// 逻辑删除（@TableLogic 注解）
+		baseDao.deleteBatchIds(Arrays.asList(ids));
+	}
+
+	/**
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO>
+	 * @Author yinzuomei
+	 * @Description 生成邀请连接
+	 * @Date 2020/3/31 22:50
+	 **/
+	@Override
+	public Result<CreateGroupInvitationResultDTO> createGroupInvitation(CreateGroupInvitationFormDTO formDTO) {
+		//1、只有群主可以邀请新成员
+		ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberDao.selectGroupMemberInfo(formDTO.getGroupId(), formDTO.getUserId());
+		if (null == resiGroupMemberDTO) {
+			return new Result<>();
+		}
+		if (null != resiGroupMemberDTO && !LeaderFlagConstant.GROUP_LEADER.equals(resiGroupMemberDTO.getGroupLeaderFlag())) {
+			return new Result<CreateGroupInvitationResultDTO>().error(EpmetErrorCode.ONLY_LEADER_CAN_INVITE.getValue(),
+					EpmetErrorCode.ONLY_LEADER_CAN_INVITE.getName());
+		}
+		//2、审核通过（讨论中）的群才可以分享邀请连接
+		ResiGroupDTO resiGroupDTO = resiGroupService.get(formDTO.getGroupId());
+		if(!GroupStateConstant.GROUP_APPROVED.equals(resiGroupDTO.getState())){
+			return new Result<CreateGroupInvitationResultDTO>().error(ModuleConstant.CANNOT_SHARED);
+		}
+		//3、插入一条邀请记录
+		GroupInvitationEntity groupInvitationEntity = new GroupInvitationEntity();
+		groupInvitationEntity.setInviterUserId(formDTO.getUserId());
+		groupInvitationEntity.setInviterCustomerId(resiGroupDTO.getCustomerId());
+		groupInvitationEntity.setInviterGridId(resiGroupDTO.getGridId());
+		//暂定7天有效期
+		Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + NumConstant.SEVEN);
+		groupInvitationEntity.setValidEndTime(calendar.getTime());
+		insert(groupInvitationEntity);
+		CreateGroupInvitationResultDTO resultDTO = new CreateGroupInvitationResultDTO();
+		resultDTO.setInvitationId(groupInvitationEntity.getId());
+		return new Result<CreateGroupInvitationResultDTO>().ok(resultDTO);
+	}
+
+	/**
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO>
+	 * @Author yinzuomei
+	 * @Description 根据群邀请连接查询群基本信息
+	 * @Date 2020/3/31 23:20
+	 **/
+	@Override
+	public Result<LinkGroupInfoResultDTO> getLinkGroupInfo(LinkGroupInfoFormDTO formDTO) {
+		//校验是否存在该邀请连接
+		Result<GroupInvitationDTO> validResult = this.checkLinkValid(formDTO.getInvitationId());
+		if(!validResult.success()){
+			return new Result<LinkGroupInfoResultDTO>().error(validResult.getCode(),validResult.getMsg());
+		}
+		LinkGroupInfoResultDTO linkGroupInfoResultDTO = baseDao.selectLinkGroupInfo(validResult.getData().getResiGroupId());
+		return new Result<LinkGroupInfoResultDTO>().ok(linkGroupInfoResultDTO);
+	}
+
+	private Result<GroupInvitationDTO> checkLinkValid(String invitationId){
+		//校验是否存在该邀请连接
+		GroupInvitationDTO groupInvitationDTO = this.get(invitationId);
+		//Date1.after(Date2),当Date1大于Date2时，返回TRUE，当小于等于时，返回false；
+		if (null == groupInvitationDTO) {
+			return new Result<GroupInvitationDTO>().error(EpmetErrorCode.LOSE_EFFICACY.getValue(),EpmetErrorCode.LOSE_EFFICACY.getName());
+		}
+		if (null != groupInvitationDTO && groupInvitationDTO.getValidEndTime().after(new Date())) {
+			return new Result<GroupInvitationDTO>().error(EpmetErrorCode.LOSE_EFFICACY.getValue(),EpmetErrorCode.LOSE_EFFICACY.getName());
+		}
+		return new Result<GroupInvitationDTO>().ok(groupInvitationDTO);
+	}
+
+	/**
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 同意邀请进组
+	 * @Date 2020/3/31 23:47
+	 **/
+	@Override
+	public Result accetInvitation(AccetInvitationFormDTO formDTO) {
+		//1、申请是否有效
+		Result<GroupInvitationDTO> validResult = this.checkLinkValid(formDTO.getInvitationId());
+		if(!validResult.success()){
+			return new Result<LinkGroupInfoResultDTO>().error(validResult.getCode(),validResult.getMsg());
+		}
+		//2、校验是否已经注册居民
+		ResiGroupDTO resiGroupDTO = resiGroupService.get(validResult.getData().getResiGroupId());
+		if (null != resiGroupDTO) {
+			UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(formDTO.getApp(),
+					formDTO.getUserId(),
+					resiGroupDTO.getCustomerId());
+			if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
+				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(),EpmetErrorCode.CANNOT_JOIN_GROUP.getName());
+			}
+		}
+		//3、新增一条邀请入群、直接审核通过的入群记录
+		GroupMemeberOperationDTO groupMemeberOperation = new GroupMemeberOperationDTO();
+		groupMemeberOperation.setGroupId(resiGroupDTO.getId());
+		groupMemeberOperation.setCustomerUserId(formDTO.getUserId());
+		groupMemeberOperation.setGroupId(resiGroupDTO.getId());
+		groupMemeberOperation.setOperateStatus(MemberStateConstant.APPROVED);
+		groupMemeberOperation.setEnterGroupType(EnterGroupTypeConstant.INVITED);
+		groupMemeberOperation.setCreatedBy(formDTO.getUserId());
+		groupMemeberOperation.setOperateUserId(formDTO.getUserId());
+		groupMemeberOperationService.save(groupMemeberOperation);
+		//4、直接加入群成员关系表
+		ResiGroupMemberDTO resiGroupMemberDTO = new ResiGroupMemberDTO();
+		resiGroupMemberDTO.setCustomerUserId(groupMemeberOperation.getCustomerUserId());
+		resiGroupMemberDTO.setResiGroupId(groupMemeberOperation.getGroupId());
+		resiGroupMemberDTO.setGroupLeaderFlag(LeaderFlagConstant.GROUP_MEMBER);
+		resiGroupMemberDTO.setEnterGroupType(groupMemeberOperation.getEnterGroupType());
+		resiGroupMemberDTO.setStatus(MemberStateConstant.APPROVED);
+		resiGroupMemberDTO.setCreatedBy(groupMemeberOperation.getCustomerUserId());
+		resiGroupMemberService.save(resiGroupMemberDTO);
+		//5、修改群统计值
+		UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(formDTO.getApp(),
+				formDTO.getUserId(),
+				resiGroupDTO.getCustomerId());
+		resiGroupMemberDao.updateResiGroupStatistical(groupMemeberOperation.getGroupId(), userRoleDTO);
+		//6、发送消息 TODO
+		return new Result();
+	}
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index 25d308c595..142656a51b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -20,15 +20,12 @@ package com.epmet.modules.member.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.UserRoleFormDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.service.ResiGroupService;
 import com.epmet.modules.member.dao.ResiGroupMemberDao;
@@ -48,7 +45,6 @@ import com.epmet.resi.group.dto.member.form.*;
 import com.epmet.resi.group.dto.member.result.ApplyingMemberResultDTO;
 import com.epmet.resi.group.dto.member.result.GroupMemberListResultDTO;
 import org.apache.commons.lang3.StringUtils;
-import org.bouncycastle.math.raw.Mod;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -164,26 +160,20 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 **/
 	@Override
 	public Result applyJoinGroup(ApplyJoinGroupFormDTO applyJoinGroupFormDTO) {
-		//校验是否已经注册
+		//校验是否已经注册居民
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(applyJoinGroupFormDTO.getGroupId());
 		if (null != resiGroupDTO) {
-			UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(applyJoinGroupFormDTO.getApp(),
+			UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(applyJoinGroupFormDTO.getApp(),
 					applyJoinGroupFormDTO.getUserId(),
 					resiGroupDTO.getCustomerId());
 			if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
-				Result errorResult = new Result();
-				errorResult.setCode(EpmetErrorCode.CANNOT_CREATE_GROUP.getValue());
-				errorResult.setMsg(EpmetErrorCode.CANNOT_CREATE_GROUP.getName());
-				return errorResult;
+				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(),EpmetErrorCode.CANNOT_JOIN_GROUP.getName());
 			}
 		}
 		//查看用户最新一条成员处理记录，避免重复申请
 		GroupMemeberOperationDTO groupMember = baseDao.selectGroupMemberOperationLatest(applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId());
 		if(null!=groupMember&&MemberStateConstant.UNDER_AUDITTING.equals(groupMember.getOperateStatus())){
-			Result errorResult = new Result();
-			errorResult.setCode(EpmetErrorCode.ALREADY_APPLIED_GROUP.getValue());
-			errorResult.setMsg(EpmetErrorCode.ALREADY_APPLIED_GROUP.getName());
-			return errorResult;
+			return new Result().error(EpmetErrorCode.ALREADY_APPLIED_GROUP.getValue(),EpmetErrorCode.ALREADY_APPLIED_GROUP.getName());
 		}
 		if(null!=groupMember&&MemberStateConstant.APPROVED.equals(groupMember.getOperateStatus())){
 			return new Result().error(ModuleConstant.ALREADY_IN_GROUP);
@@ -279,7 +269,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		resiGroupMemberDTO.setCreatedBy(groupMemeberOperationDTO.getCustomerUserId());
 		resiGroupMemberService.save(resiGroupMemberDTO);
 		//修改群统计值
-		UserRoleDTO userRoleDTO = checkPartyMemberOrWarmHeated(agreeApplyFormDTO.getApp(),
+		UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(agreeApplyFormDTO.getApp(),
                 groupMemeberOperationDTO.getCustomerUserId(),
 				agreeApplyFormDTO.getCustomerId());
 		baseDao.updateResiGroupStatistical(groupMemeberOperationDTO.getGroupId(), userRoleDTO);
@@ -315,33 +305,4 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		//给用户发送消息 TODO
 		return new Result();
 	}
-
-	private UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId) {
-		UserRoleDTO userRoleDTO = new UserRoleDTO();
-		UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO();
-		userRoleFormDTO.setApp(app);
-		userRoleFormDTO.setCustomerId(customerId);
-		userRoleFormDTO.setUserId(userId);
-		Result<List<UserRoleResultDTO>> userRoleListResult = epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO);
-		if (!userRoleListResult.success()) {
-			logger.info("获取用户角色feign调用失败" + userRoleListResult.getMsg());
-			return userRoleDTO;
-		}
-		List<UserRoleResultDTO> userRoleList = userRoleListResult.getData();
-		if (null == userRoleList || userRoleList.size() == 0) {
-			return userRoleDTO;
-		}
-		for (UserRoleResultDTO userRoleResultDTO : userRoleList) {
-			if (EpmetRoleKeyConstant.PARTYMEMBER.equals(userRoleResultDTO.getRoleKey())) {
-				userRoleDTO.setPartymemberFlag(NumConstant.ONE_STR);
-			}
-			if (EpmetRoleKeyConstant.WARMHEARTED.equals(userRoleResultDTO.getRoleKey())) {
-				userRoleDTO.setWarmHeartedFlag(NumConstant.ONE_STR);
-			}
-			if (EpmetRoleKeyConstant.REGISTERED_RESI.equals(userRoleResultDTO.getRoleKey())) {
-				userRoleDTO.setRegisteredResiFlag(NumConstant.ONE_STR);
-			}
-		}
-		return userRoleDTO;
-	}
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
index 646ec81fa3..c843ba6118 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
@@ -82,4 +82,9 @@ public interface ModuleConstant extends Constant {
 	 * 申请入群是校验是否已经在群内
 	 */
 	String ALREADY_IN_GROUP="已经在群内，无需申请";
+
+	/**
+	 * 生成邀请新成员链接时，判断群状态
+	 */
+	String CANNOT_SHARED="只有讨论中的群才可以邀请新成员";
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/GroupInvitationDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/GroupInvitationDao.xml
new file mode 100644
index 0000000000..b814840946
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/GroupInvitationDao.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.modules.invitation.dao.GroupInvitationDao">
+
+    <!-- 根据群邀请连接查询群基本信息 -根据groupId 查询群基本信息  -->
+    <select id="selectLinkGroupInfo" parameterType="map" resultType="com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO">
+        SELECT
+            rg.id AS groupId,
+            rg.GROUP_HEAD_PHOTO AS groupHeadPhoto,
+            rg.GROUP_NAME AS groupName,
+            rg.GROUP_INTRODUCTION AS groupIntroduction,
+            rgs.TOTAL_MEMBERS AS totalMember,
+            rgs.TOTAL_PARTY_MEMBERS AS totalPartyMember
+        FROM
+            resi_group rg
+            LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )
+        WHERE
+            rg.DEL_FLAG = '0'
+            AND rgs.DEL_FLAG = '0'
+            and rg.id=#{groupId}
+    </select>
+
+
+</mapper>

From d72d4242dd7d5a0500d86d22bf04ec16986ac5ac Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Wed, 1 Apr 2020 00:21:59 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9A=E7=94=9F=E6=88=90=E7=BE=A4=E9=93=BE=E6=8E=A5=E3=80=81?=
 =?UTF-8?q?=E5=90=8C=E6=84=8F=E8=BF=9B=E7=BE=A4=E3=80=81=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E9=82=80=E8=AF=B7=E8=BF=9E=E6=8E=A5=E6=9F=A5=E8=AF=A2=E7=BE=A4?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AFv1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/feign/EpmetUserFeignClient.java    | 2 +-
 .../modules/group/service/impl/ResiGroupServiceImpl.java   | 2 --
 .../member/service/impl/ResiGroupMemberServiceImpl.java    | 7 -------
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index c3f44bbc57..3fe7b82bca 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
  * @dscription
  * @date 2020/3/19 9:32
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, path="/epmetuser", fallback = EpmetUserFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, path="/epmetuser", fallback = EpmetUserFeignClientFallback.class,url = "http://localhost:8087")
 public interface EpmetUserFeignClient {
 
 	/**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 49dcdf4184..0df010297f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -80,8 +80,6 @@ import java.util.Map;
 @Service
 public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGroupEntity> implements ResiGroupService {
 	private Logger logger = LoggerFactory.getLogger(getClass());
-	@Autowired
-	private ResiGroupRedis resiGroupRedis;
 
 	@Autowired
 	private ResiGroupMemberService resiGroupMemberService;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index 142656a51b..c679cb179e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -26,11 +26,9 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.service.ResiGroupService;
 import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.member.entity.ResiGroupMemberEntity;
-import com.epmet.modules.member.redis.ResiGroupMemberRedis;
 import com.epmet.modules.member.service.GroupMemeberOperationService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.modules.utils.ModuleConstant;
@@ -64,8 +62,6 @@ import java.util.Map;
 @Service
 public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberDao, ResiGroupMemberEntity> implements ResiGroupMemberService {
 	private Logger logger = LoggerFactory.getLogger(getClass());
-	@Autowired
-	private ResiGroupMemberRedis resiGroupMemberRedis;
 
 	@Autowired
 	private GroupMemeberOperationService groupMemeberOperationService;
@@ -76,9 +72,6 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	@Autowired
 	private ResiGroupMemberService resiGroupMemberService;
 
-	@Autowired
-	private EpmetUserFeignClient epmetUserFeignClient;
-
 	@Override
 	public PageData<ResiGroupMemberDTO> page(Map<String, Object> params) {
 		IPage<ResiGroupMemberEntity> page = baseDao.selectPage(

From 560310c00a7a5445e59cbadac9200cb5026760b0 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Wed, 1 Apr 2020 09:29:16 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-job-server/src/main/resources/bootstrap.yml       | 2 ++
 .../epmet-message-server/src/main/resources/bootstrap.yml   | 2 ++
 epmet-module/epmet-oss/epmet-oss-server/pom.xml             | 6 ------
 .../epmet-oss-server/src/main/resources/bootstrap.yml       | 2 ++
 .../oper-access-server/src/main/resources/bootstrap.yml     | 2 ++
 .../oper-crm-server/src/main/resources/bootstrap.yml        | 2 ++
 .../oper-customize-server/src/main/resources/bootstrap.yml  | 2 ++
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
index f402978001..2be4349624 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
@@ -4,6 +4,8 @@ server:
     context-path: /job
 
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     name: epmet-job-server
   #环境 dev|test|prod
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
index f34d2325d4..f44a4099e0 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
@@ -4,6 +4,8 @@ server:
     context-path: /message
 
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     name: epmet-message-server
   #环境 dev|test|prod
diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
index 28570008ee..ea11cf21ef 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml
+++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
@@ -92,12 +92,6 @@
             <artifactId>fastdfs-client</artifactId>
             <version>${fastdfs.version}</version>
         </dependency>
-        <!-- 替换Feign原生httpclient -->
-        <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-httpclient</artifactId>
-            <version>10.3.0</version>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
index ff736a728f..eb5ed56fda 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
@@ -4,6 +4,8 @@ server:
     context-path: /oss
 
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     name: epmet-oss-server
   #环境 dev|test|prod
diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
index cfe7b27b8a..9852c40609 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
@@ -4,6 +4,8 @@ server:
     context-path: /oper/access
 
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     name: oper-access-server
   #环境 dev|test|prod
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
index 5979925078..74241043ea 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
@@ -4,6 +4,8 @@ server:
     context-path: /oper/crm
 
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     name: oper-crm-server
   #环境 dev|test|prod
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
index 4cbec67c8a..d64cf2db02 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
@@ -4,6 +4,8 @@ server:
     context-path: /oper/customize
 
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     name: oper-customize-server
   #环境 dev|test|prod

From f60c49c010e040c1e71fc4e9d8f8f20a5700d0c4 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 1 Apr 2020 10:38:13 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF-=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E6=B3=A8=E5=86=8C=E4=BF=A1=E6=81=AF=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3-=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/feign/EpmetUserFeignClient.java   |  8 +++
 .../feign/ResiPartymemberFeignClient.java     |  2 +-
 .../EpmetUserFeignClientFallBack.java         | 13 +++++
 .../controller/ResiRegisterController.java    | 17 +++++-
 .../service/ResiRegisterService.java          | 10 ++++
 .../service/impl/ResiRegisterServiceImpl.java | 10 ++++
 .../java/com/epmet/dto/UserResiInfoDTO.java   | 21 ++++++++
 .../dto/result/ResiRegisterResultDTO.java     |  2 +-
 .../constant/UserResiRegisterConstant.java    |  5 ++
 .../controller/UserResiInfoController.java    | 20 +++++--
 .../com/epmet/dao/RegisterRelationDao.java    |  3 +-
 .../java/com/epmet/dao/UserResiInfoDao.java   |  6 +++
 .../epmet/dao/UserResiRegisterVisitDao.java   |  2 +
 .../service/RegisterRelationService.java      |  8 +++
 .../epmet/service/UserResiInfoService.java    |  9 ++++
 .../service/UserResiRegisterVisitService.java | 11 ++++
 .../impl/RegisterRelationServiceImpl.java     | 35 ++++++++++++
 .../service/impl/UserResiInfoServiceImpl.java | 54 ++++++++++++++++++-
 .../UserResiRegisterVisitServiceImpl.java     | 22 +++++++-
 .../resources/mapper/RegisterRelationDao.xml  | 34 ++++++++++++
 .../main/resources/mapper/UserResiInfoDao.xml | 37 +++++++++++++
 .../mapper/UserResiRegisterVisitDao.xml       |  7 +++
 22 files changed, 323 insertions(+), 13 deletions(-)

diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
index d034f07265..fbb6686ec6 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
@@ -2,6 +2,7 @@ package com.epmet.modules.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
@@ -35,4 +36,11 @@ public interface EpmetUserFeignClient {
      **/
     @PostMapping(value = "epmetuser/userresiregistervisit/init")
     Result<ResiRegisterResultDTO> init(ResiRegisterFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 居民端-居民注册信息提交
+     **/
+    @PostMapping(value = "epmetuser/userresiinfo/submit")
+    Result submit(UserResiInfoDTO userResiInfoDTO);
 }
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java
index 37f65911b8..d22948a183 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping;
  * @Description 居民端陌生人导览  调用epmet-user服务
  * @Author sun
  */
-@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class,url="http://localhost:8096")
+@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class)
 public interface ResiPartymemberFeignClient {
 
     /**
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java
index 190298d177..fddff4a777 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -3,6 +3,7 @@ package com.epmet.modules.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
@@ -39,4 +40,16 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     public Result<ResiRegisterResultDTO> init(ResiRegisterFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "init", formDTO);
     }
+
+    /**
+     * @Author sun
+     * @Description 居民端-居民注册信息提交
+     * @Date 2020/3/30
+     **/
+    @Override
+    public Result submit(UserResiInfoDTO userResiInfoDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "submit", userResiInfoDTO);
+    }
+
+
 }
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java
index 58128b7e19..2bb24c3a1f 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java
@@ -3,9 +3,11 @@ package com.epmet.modules.resiregister.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.modules.resiregister.service.ResiRegisterService;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("resiregister")
 public class ResiRegisterController {
     @Autowired
-    private ResiRegisterService resiMineGridService;
+    private ResiRegisterService resiRegisterService;
 
     /**
      * @param
@@ -32,7 +34,18 @@ public class ResiRegisterController {
      **/
     @PostMapping("init")
     public Result<ResiRegisterResultDTO> init(@LoginUser TokenDto tokenDTO, @RequestBody ResiRegisterFormDTO resiRegisterFormDTO) {
-        return resiMineGridService.init(tokenDTO, resiRegisterFormDTO);
+        return resiRegisterService.init(tokenDTO, resiRegisterFormDTO);
     }
 
+    /**
+     * @param
+     * @Author sun
+     * @Description 居民端-居民注册信息提交
+     **/
+    @PostMapping("submit")
+    public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody UserResiInfoDTO userResiInfoDTO) {
+        return resiRegisterService.submit(tokenDTO, userResiInfoDTO);
+    }
+
+
 }
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java
index 1b439f38db..5c4780b0f1 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java
@@ -2,6 +2,7 @@ package com.epmet.modules.resiregister.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
 
@@ -22,4 +23,13 @@ public interface ResiRegisterService {
      */
     Result<ResiRegisterResultDTO> init(TokenDto tokenDTO, ResiRegisterFormDTO formDTO);
 
+    /**
+     * 居民端-居民注册信息提交
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
+    Result submit(TokenDto tokenDTO, UserResiInfoDTO userResiInfoDTO);
+
 }
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 7b7f1fd0d0..f7324d7c42 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
@@ -2,6 +2,7 @@ package com.epmet.modules.resiregister.service.impl;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -30,4 +31,13 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
         formDTO.setUserId(tokenDTO.getUserId());
         return epmetUserFeignClient.init(formDTO);
     }
+
+    @Override
+    public Result submit(TokenDto tokenDTO, UserResiInfoDTO userResiInfoDTO) {
+        if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
+            return new Result<ResiRegisterResultDTO>().error(ModuleConstant.USER_NOT_NULL);
+        }
+        userResiInfoDTO.setUserId(tokenDTO.getUserId());
+        return epmetUserFeignClient.submit(userResiInfoDTO);
+    }
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java
index b7a16ec445..b3d79d599e 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java
@@ -33,6 +33,11 @@ public class UserResiInfoDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+	/**
+	 * 唯一标识
+	 */
+	private String id;
+
     /**
      * 用户Id(主键) user.id
      */
@@ -108,4 +113,20 @@ public class UserResiInfoDTO implements Serializable {
 	 */
 	private String showName;
 
+	/**
+	 * 客户Id (customer.id)
+	 */
+	private String customerId;
+
+	/**
+	 * 网格Id (customer_grid.id)
+	 */
+	private String gridId;
+
+	/**
+	 * 手机验证码
+	 */
+	private String mobileCode;
+
+
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java
index 81496ffcfc..b84f59a51f 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java
@@ -34,7 +34,7 @@ public class ResiRegisterResultDTO implements Serializable {
     /**
      * 用户居民端注册访问记录表(user_resi_register_visit)Id
      */
-    private String userResiRegisterVisitId;
+    private String resiVisitId;
 
 
 }
\ No newline at end of file
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 bb00c84ef9..3d883da630 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
@@ -34,4 +34,9 @@ public interface UserResiRegisterConstant {
      * 最后一次操作行为-提交失败
      */
     String FAILD="faild";
+
+    /**
+     * 最后一次操作行为-提交失败
+     */
+    String MOBILECODE_EXCEPTION="手机验证码输入错误！";
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java
index 9a032ce2b2..17b7e93685 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java
@@ -51,19 +51,19 @@ public class UserResiInfoController {
     private UserResiInfoService userResiInfoService;
 
     @GetMapping("page")
-    public Result<PageData<UserResiInfoDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<UserResiInfoDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<UserResiInfoDTO> page = userResiInfoService.page(params);
         return new Result<PageData<UserResiInfoDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<UserResiInfoDTO> get(@PathVariable("id") String id){
+    public Result<UserResiInfoDTO> get(@PathVariable("id") String id) {
         UserResiInfoDTO data = userResiInfoService.get(id);
         return new Result<UserResiInfoDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody UserResiInfoDTO dto){
+    public Result save(@RequestBody UserResiInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         userResiInfoService.save(dto);
@@ -71,7 +71,7 @@ public class UserResiInfoController {
     }
 
     @PutMapping
-    public Result update(@RequestBody UserResiInfoDTO dto){
+    public Result update(@RequestBody UserResiInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         userResiInfoService.update(dto);
@@ -79,7 +79,7 @@ public class UserResiInfoController {
     }
 
     @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         userResiInfoService.delete(ids);
@@ -104,4 +104,14 @@ public class UserResiInfoController {
         ValidatorUtils.validateEntity(userResiInfoFormDTO);
         return userResiInfoService.getUserResiInfoDTO(userResiInfoFormDTO);
     }
+
+    /**
+     * @param userResiInfoDTO
+     * @Author sun
+     * @Description 居民端-居民注册信息提交
+     **/
+    @PostMapping("submit")
+    public Result submit(@RequestBody UserResiInfoDTO userResiInfoDTO) {
+        return userResiInfoService.submit(userResiInfoDTO);
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java
index 2b18303846..14bcacd481 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.RegisterRelationDTO;
 import com.epmet.entity.RegisterRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -34,6 +35,6 @@ import java.util.List;
 public interface RegisterRelationDao extends BaseDao<RegisterRelationEntity> {
 
     List<RegisterRelationEntity> getListByUserId(@Param("userId") String userId);
-
+    boolean saveRegisterRelation(RegisterRelationDTO registerRelationDTO);
 	
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
index f4b9ac73d0..aa058b6350 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
@@ -40,4 +40,10 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 * @Date 2020/3/30 11:10
 	 **/
 	UserResiInfoDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
+
+	/**
+	 * @Author sun
+	 * @Description 用户居民端注册信息表新增数据
+	 **/
+	void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java
index e1a13706dc..7c4a768bce 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java
@@ -36,4 +36,6 @@ public interface UserResiRegisterVisitDao extends BaseDao<UserResiRegisterVisitE
     void saveUserResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
 
     List<UserResiRegisterVisitDTO> selectUserResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
+
+    void updateResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java
index 2ba4b0b66d..e40e9ea607 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java
@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.RegisterRelationDTO;
+import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.EnterGridFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.entity.RegisterRelationEntity;
@@ -104,4 +105,11 @@ public interface RegisterRelationService extends BaseService<RegisterRelationEnt
      * @Date 2020.03.30 15:06
      **/
     Result<UserInfoOnEnterGridResultDTO> getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO);
+
+    /**
+     * @Description 居民注册成功-居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
+     * @Param userResiInfoDTO
+     * @Author sun
+     **/
+    Result saveRegisterRelation(UserResiInfoDTO userResiInfoDTO);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java
index 8049e21039..db50e3c714 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java
@@ -103,4 +103,13 @@ public interface UserResiInfoService extends BaseService<UserResiInfoEntity> {
      * @Date 2020/3/30 11:07
      **/
     Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
+
+    /**
+     * 居民端-居民注册信息提交
+     *
+     * @param userResiInfoDTO
+     * @return void
+     * @author sun
+     */
+    Result submit(UserResiInfoDTO userResiInfoDTO);
 }
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 1a9c0e2b6b..9ec73fec91 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
@@ -21,8 +21,10 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserResiRegisterVisitDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
+import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.entity.UserResiRegisterVisitEntity;
 
@@ -105,4 +107,13 @@ public interface UserResiRegisterVisitService extends BaseService<UserResiRegist
      * @author sun
      */
     Result<ResiRegisterResultDTO> saveUserResiRegisterVisit(ResiRegisterFormDTO formDTO);
+
+    /**
+     * 居民端-居民注册信息提交-更新访问行为记录表数据
+     *
+     * @param bl userResiInfoDTO
+     * @return void
+     * @author sun
+     */
+    Result updateResiRegisterVisit(boolean bl, UserResiInfoDTO userResiInfoDTO);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
index df9d5a7ede..507147a3ef 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
@@ -19,7 +19,9 @@ package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -78,6 +80,9 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
     @Autowired
     private UserCustomerDao userCustomerDao;
 
+    @Autowired
+    private RegisterRelationDao registerRelationDao;
+
 
     @Override
     public PageData<RegisterRelationDTO> page(Map<String, Object> params) {
@@ -249,4 +254,34 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         return result;
     }
 
+    /**
+     * @Description 居民注册成功-居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
+     * @Param userResiInfoDTO
+     * @Author sun
+     **/
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result saveRegisterRelation(UserResiInfoDTO userResiInfoDTO) {
+        Date date = new Date();
+        RegisterRelationDTO registerRelationDTO = new RegisterRelationDTO();
+        registerRelationDTO.setCustomerId(userResiInfoDTO.getCustomerId());
+        registerRelationDTO.setGridId(userResiInfoDTO.getGridId());
+        registerRelationDTO.setUserId(userResiInfoDTO.getUserId());
+        //首次注册用户 (0表示不参与计数  1表示参与计数)
+        registerRelationDTO.setFirstRegister(NumConstant.ONE_STR);
+        //注册用户 (0表示不参与计数  1表示参与计数)
+        registerRelationDTO.setRegister(NumConstant.ONE_STR);
+        //参与用户 (0表示不参与计数  1表示参与计数)
+        registerRelationDTO.setParticipation(NumConstant.ONE_STR);
+        registerRelationDTO.setId(IdWorker.get32UUID());
+        registerRelationDTO.setDelFlag(NumConstant.ZERO);
+        registerRelationDTO.setRevision(NumConstant.ZERO);
+        registerRelationDTO.setCreatedBy(userResiInfoDTO.getUserId());
+        registerRelationDTO.setCreatedTime(date);
+        registerRelationDTO.setUpdatedBy(userResiInfoDTO.getUserId());
+        registerRelationDTO.setUpdatedTime(date);
+        registerRelationDao.saveRegisterRelation(registerRelationDTO);
+        return new Result();
+    }
+
 }
\ No newline at end of file
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 2abb58c305..64936242e7 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
@@ -19,23 +19,29 @@ package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.UserResiRegisterConstant;
 import com.epmet.dao.UserResiInfoDao;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.entity.UserResiInfoEntity;
 import com.epmet.redis.UserResiInfoRedis;
+import com.epmet.service.RegisterRelationService;
 import com.epmet.service.UserResiInfoService;
+import com.epmet.service.UserResiRegisterVisitService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -50,6 +56,12 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 
     @Autowired
     private UserResiInfoRedis userResiInfoRedis;
+    @Autowired
+    private UserResiRegisterVisitService userResiRegisterVisitService;
+    @Autowired
+    private UserResiInfoDao userResiInfoDao;
+    @Autowired
+    private RegisterRelationService registerRelationService;
 
     @Override
     public PageData<UserResiInfoDTO> page(Map<String, Object> params) {
@@ -67,8 +79,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
         return ConvertUtils.sourceToTarget(entityList, UserResiInfoDTO.class);
     }
 
-    private QueryWrapper<UserResiInfoEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<UserResiInfoEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<UserResiInfoEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -120,4 +132,42 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
         return new Result<UserResiInfoDTO>().ok(userResiInfoDTO);
     }
 
+    @Override
+    public Result submit(UserResiInfoDTO userResiInfoDTO) {
+        Result result = new Result();
+        //1:手机验证码数据校验//TODO
+
+        //2:验证码校验失败则更新行为记录表数据 返回前台结果
+        if (false) {
+            userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
+            result.setMsg(UserResiRegisterConstant.MOBILECODE_EXCEPTION);
+            return result;
+        }
+        //3:校验成功 数据存入居民注册表 更新行为记录表数据
+        saveUserResiInfo(userResiInfoDTO);
+        result = userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO);
+        //4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
+        result = registerRelationService.saveRegisterRelation(userResiInfoDTO);
+        return result;
+    }
+
+    /**
+     * 居民注册信息表新增数据
+     *
+     * @param userResiInfoDTO
+     * @Author sun
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) {
+        Date date = new Date();
+        userResiInfoDTO.setId(IdWorker.get32UUID());
+        userResiInfoDTO.setDelFlag(NumConstant.ZERO);
+        userResiInfoDTO.setRevision(NumConstant.ZERO);
+        userResiInfoDTO.setCreatedBy(userResiInfoDTO.getUserId());
+        userResiInfoDTO.setCreatedTime(date);
+        userResiInfoDTO.setUpdatedBy(userResiInfoDTO.getUserId());
+        userResiInfoDTO.setUpdatedTime(date);
+        userResiInfoDao.saveUserResiInfo(userResiInfoDTO);
+    }
+
 }
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 38438ec41f..1f2e8efde9 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
@@ -28,8 +28,10 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserResiRegisterConstant;
 import com.epmet.dao.UserResiRegisterVisitDao;
+import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserResiRegisterVisitDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
+import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.entity.UserResiRegisterVisitEntity;
 import com.epmet.redis.UserResiRegisterVisitRedis;
@@ -132,8 +134,26 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
         userResiRegisterVisitDTO.setUpdatedTime(date);
         userResiRegisterVisitDao.saveUserResiRegisterVisit(userResiRegisterVisitDTO);
         ResiRegisterResultDTO resiRegisterResultDTO = new ResiRegisterResultDTO();
-        resiRegisterResultDTO.setUserResiRegisterVisitId(userResiRegisterVisitDTO.getId());
+        resiRegisterResultDTO.setResiVisitId(userResiRegisterVisitDTO.getId());
         return new Result<ResiRegisterResultDTO>().ok(resiRegisterResultDTO);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result updateResiRegisterVisit(boolean bl, UserResiInfoDTO userResiInfoDTO) {
+        UserResiRegisterVisitDTO userResiRegisterVisitDTO = new UserResiRegisterVisitDTO();
+        if (bl) {
+            //最后一次操作行为-提交成功
+            userResiRegisterVisitDTO.setLastOperateVisit(UserResiRegisterConstant.SUCCESS);
+        } else {
+            //最后一次操作行为-提交失败
+            userResiRegisterVisitDTO.setLastOperateVisit(UserResiRegisterConstant.FAILD);
+        }
+        userResiRegisterVisitDTO.setId(userResiInfoDTO.getResiVisitId());
+        userResiRegisterVisitDTO.setUpdatedBy(userResiInfoDTO.getUserId());
+        userResiRegisterVisitDTO.setUpdatedTime(new Date());
+        userResiRegisterVisitDao.updateResiRegisterVisit(userResiRegisterVisitDTO);
+        return new Result();
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml
index 7398491796..b84364b43d 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml
@@ -19,6 +19,40 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <insert id="saveRegisterRelation" parameterType="com.epmet.dto.RegisterRelationDTO">
+        INSERT INTO register_relation (
+            id,
+            customer_id,
+            grid_id,
+            user_id,
+            first_register,
+            register,
+            participation,
+            del_flag,
+            revision,
+            created_by,
+            created_time,
+            updated_by,
+            updated_time
+        )
+        VALUES
+            (
+                #{id},
+                #{customerId},
+                #{gridId},
+                #{userId},
+                #{firstRegister},
+                #{register},
+                #{participation},
+                #{delFlag},
+                #{revision},
+                #{createdBy},
+                #{createdTime},
+                #{updatedBy},
+                #{updatedTime}
+            )
+    </insert>
+
 
     <select id="getListByUserId" parameterType="string" resultType="com.epmet.entity.RegisterRelationEntity">
         SELECT *
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
index ef208b2df9..b73f06276c 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
@@ -19,6 +19,43 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <insert id="saveUserResiInfo" parameterType="com.epmet.dto.UserResiInfoDTO">
+        INSERT INTO user_resi_info (
+            id,
+            user_id,
+            reg_mobile,
+            surname,
+            `name`,
+            street,
+            district,
+            building_address,
+            resi_visit_id,
+            del_flag,
+            revision,
+            created_by,
+            created_time,
+            updated_by,
+            updated_time
+        )
+        VALUES
+            (
+                #{id},
+                #{userId},
+                #{regMobile},
+                #{surname},
+                #{name},
+                #{street},
+                #{district},
+                #{buildingAddress},
+                #{resiVisitId},
+                #{delFlag},
+                #{revision},
+                #{createdBy},
+                #{createdTime},
+                #{updatedBy},
+                #{updatedTime}
+            )
+    </insert>
 
     <!-- 查询用户注册信息   -->
     <select id="selectUserResiInfoDTO" parameterType="com.epmet.dto.form.UserResiInfoFormDTO"
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiRegisterVisitDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiRegisterVisitDao.xml
index 1a1af30845..c05192d53e 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiRegisterVisitDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiRegisterVisitDao.xml
@@ -50,6 +50,13 @@
             #{updatedTime}
         )
     </insert>
+    <update id="updateResiRegisterVisit" parameterType="com.epmet.dto.UserResiRegisterVisitDTO">
+        UPDATE user_resi_register_visit
+        SET last_operate_visit = #{lastOperateVisit},
+            updated_by = #{updatedBy},
+            updated_time = #{updatedTime}
+        WHERE id = #{id}
+    </update>
 
 
 </mapper>
\ No newline at end of file