From 41e54b06a2e3efe0208e096f0535a3b82df086d9 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 3 Apr 2020 15:52:26 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E8=AF=9D=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/feign/MessageFeignClient.java   |  2 +-
 .../topic/controller/ResiTopicController.java |  6 ++---
 .../impl/ResiTopicCommentServiceImpl.java     |  4 +++-
 .../service/impl/ResiTopicServiceImpl.java    |  4 +++-
 .../mapper/topic/ResiTopicCommentDao.xml      |  3 ++-
 .../resources/mapper/topic/ResiTopicDao.xml   | 23 +++++++++++--------
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/MessageFeignClient.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/MessageFeignClient.java
index 82a9516e7a..cfa79bf8cc 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/MessageFeignClient.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/MessageFeignClient.java
@@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class, url = "http://localhost:8085")
+@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class)
 public interface MessageFeignClient {
 
     /**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
index 037c619647..794a319cc0 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
@@ -53,7 +53,7 @@ public class ResiTopicController {
      * @Date 2020.04.01 23:48
      **/
     @PostMapping("gettopicdetail")
-    public Result<ResiTopicDetailResultDTO> getTopicDetail(@LoginUser TokenDto tokenDto, @RequestParam("topicId")String topicId ){
+    public Result<ResiTopicDetailResultDTO> getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody String topicId ){
         return topicService.getTopicDetail(tokenDto,topicId);
     }
 
@@ -80,7 +80,7 @@ public class ResiTopicController {
      * @Date 2020.04.02 00:01
      **/
     @PostMapping("getlatesttentopics")
-    Result<List<ResiTopicInfoResultDTO>> getLatestTenTopics(@LoginUser  TokenDto tokenDto,@RequestParam("groupId") String groupId){
+    Result<List<ResiTopicInfoResultDTO>> getLatestTenTopics(@LoginUser  TokenDto tokenDto,@RequestBody String groupId){
         return topicService.getLatestTenTopics(tokenDto,groupId);
     }
 
@@ -121,7 +121,7 @@ public class ResiTopicController {
      * @Date 2020.04.01 14:17
      **/
     @PostMapping("cancelhiddentopics")
-    Result cancelHiddenTopics(@LoginUser TokenDto tokenDto,@RequestParam("topicIds") List<String> topicIds){
+    Result cancelHiddenTopics(@LoginUser TokenDto tokenDto,@RequestBody List<String> topicIds){
         return topicService.cancelHiddenTopics(tokenDto,topicIds);
     }
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
index 1ec3799550..c8f36d1194 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
@@ -125,6 +125,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
      * @Date 2020.03.31 17:36
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result commentTopic(TokenDto tokenDto, ResiPublishCommentFormDTO resiCommentFormDTO) {
         //1.判断当前用户是否被禁言
         ResiTopicDTO topic = resiTopicService.get(resiCommentFormDTO.getTopicId());
@@ -133,7 +134,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
         }
 
         ResiGroupMemberDTO resiGroupMemberDTO =
-                resiGroupMemberService.getResiGroupMember(tokenDto.getUserId() , topic.getGroupId());
+                resiGroupMemberService.getResiGroupMember( topic.getGroupId() ,tokenDto.getUserId() );
         //查看当前用户是否被禁言或者被移除
         if(null != resiGroupMemberDTO){
             if(MemberStateConstant.SILENT.equals(resiGroupMemberDTO.getStatus())){
@@ -155,6 +156,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
         }
         ResiTopicCommentEntity comment = ConvertUtils.sourceToTarget(resiCommentFormDTO,ResiTopicCommentEntity.class);
         comment.setStatus(TopicConstant.PUBLISHMENT);
+        comment.setCreatedBy(tokenDto.getUserId());
         baseDao.insertOne(comment);
 
         return new Result();
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 002e943564..4c99c89a92 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -311,6 +311,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      * @Date 2020.04.01 14:17
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result cancelHiddenTopics(TokenDto tokenDto, List<String> topicIds) {
 
         //1.1拿到组Id
@@ -346,10 +347,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      * @Date 2020.04.01 15:37
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result closeTopic(TokenDto tokenDto, ResiTopicOperationFormDTO closeFormDTO) {
 
         //1.1拿到组Id
-        ResiTopicEntity topic = baseDao.selectById(tokenDto.getUserId());
+        ResiTopicEntity topic = baseDao.selectById(closeFormDTO.getTopicId());
 
         //1.2校验身份，是否是该话题所属群组的组长
         Result verifyError = verifyLeader(topic,tokenDto.getUserId());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml
index adf7e2aeae..6341ac2c68 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml
@@ -9,7 +9,7 @@
             select replace(uuid(),'-','') AS ID
         </selectKey>
 
-        INSERT INTO resi_topic_operation
+        INSERT INTO resi_topic_comment
         <trim prefix="(" suffix=")" suffixOverrides=",">
             id,
             <if test ='null != topicId'>
@@ -53,6 +53,7 @@
     </insert>
     <!-- 分页查询某个话题下的评论列表 -->
     <select id="getCommentList" parameterType="com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO" resultType="com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO">
+        SELECT
         ID AS commentId,
         COMMENT_CONTENT,
         STATUS AS commentStatus,
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
index b1e4e7186f..2f8bccd497 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
@@ -132,13 +132,14 @@
         RESI_TOPIC
         <where>
             DEL_FLAG = '0'
+            AND GROUP_ID = #{groupId}
             <if test='"hidden" != status'>
                 AND <![CDATA[ STATUS <> 'hidden' ]]>
             </if>
-            AND GROUP_ID = #{groupId}
             <if test='null != status and "" != status'>
                 AND STATUS = #{status}
             </if>
+
         </where>
         ORDER BY
         CREATED_TIME DESC
@@ -162,7 +163,7 @@
            TOPIC_CONTENT = #{topicContent} ,
         </if>
         UPDATED_BY = #{updatedBy} ,
-        UPDATED_DATE = NOW()
+        UPDATED_TIME = NOW()
       </set>
       WHERE
         ID = #{id}
@@ -175,17 +176,19 @@
             RESI_TOPIC
             SET
             STATUS = #{status},
-            UPDATED_DATE = NOW(),
+            UPDATED_TIME = NOW(),
             UPDATED_BY = #{updatedBy}
-            WHERE
+            <where>
             ID
-        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
-            ${item}
-        </foreach>
+            <foreach collection="list" item="item" index="index" open="in (" separator="," close=")">
+                #{item}
+            </foreach>
             AND
             DEL_FLAG = '0'
-            AND
-            STATUS = 'hidden'
+            <if test='"discussing" == status'>
+                AND STATUS = 'hidden'
+            </if>
+            </where>
     </update>
 
     <!-- 批量更新 -->
@@ -215,7 +218,7 @@
                 </foreach>
             </trim>
         </trim>
-            updated_date = now()
+            updated_time = now()
         where
         <foreach collection="list" separator="or" item="i" index="index" >
             id=#{i.id}

From 5f51e472e3d18e9a04a55a67583eeea21f1e09c0 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Fri, 3 Apr 2020 16:25:50 +0800
Subject: [PATCH 2/7] =?UTF-8?q?messagepom=E6=96=87=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/epmet-message/epmet-message-server/pom.xml | 9 +++++----
 epmet-module/oper-crm/oper-crm-server/pom.xml           | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml
index 96c2afded9..b7e4160de0 100644
--- a/epmet-module/epmet-message/epmet-message-server/pom.xml
+++ b/epmet-module/epmet-message/epmet-message-server/pom.xml
@@ -118,11 +118,9 @@
     <profiles>
         <profile>
             <id>dev</id>
-
-            <activation>
+            <!--<activation>
                 <activeByDefault>true</activeByDefault>
-            </activation>
-
+            </activation>-->
             <properties>
                 <server.port>8085</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
@@ -150,6 +148,9 @@
         </profile>
         <profile>
             <id>test</id>
+            <!--<activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>-->
             <properties>
                 <server.port>8085</server.port>
                 <spring.profiles.active>test</spring.profiles.active>
diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index 8473caf7e8..b791a4c7f2 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-server/pom.xml
@@ -92,9 +92,9 @@
     <profiles>
         <profile>
             <id>dev</id>
-            <activation>
+            <!--<activation>
                 <activeByDefault>true</activeByDefault>
-            </activation>
+            </activation>-->
             <properties>
                 <server.port>8090</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
@@ -122,9 +122,9 @@
         </profile>
         <profile>
             <id>test</id>
-            <!--<activation>
+            <activation>
                 <activeByDefault>true</activeByDefault>
-            </activation>-->
+            </activation>
             <properties>
                 <server.port>8090</server.port>
                 <spring.profiles.active>test</spring.profiles.active>

From df9d7706e522f6a75f505248bed502326e9b5250 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Fri, 3 Apr 2020 16:26:49 +0800
Subject: [PATCH 3/7] =?UTF-8?q?opercrm=E8=AF=AF=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/oper-crm/oper-crm-server/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index b791a4c7f2..8473caf7e8 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-server/pom.xml
@@ -92,9 +92,9 @@
     <profiles>
         <profile>
             <id>dev</id>
-            <!--<activation>
+            <activation>
                 <activeByDefault>true</activeByDefault>
-            </activation>-->
+            </activation>
             <properties>
                 <server.port>8090</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
@@ -122,9 +122,9 @@
         </profile>
         <profile>
             <id>test</id>
-            <activation>
+            <!--<activation>
                 <activeByDefault>true</activeByDefault>
-            </activation>
+            </activation>-->
             <properties>
                 <server.port>8090</server.port>
                 <spring.profiles.active>test</spring.profiles.active>

From 264816ac21099b60f42c0cfed3d61ec9b0e2bdda Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Fri, 3 Apr 2020 16:27:37 +0800
Subject: [PATCH 4/7] =?UTF-8?q?messagepom=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/epmet-message/epmet-message-server/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml
index b7e4160de0..fcfbbc9cc4 100644
--- a/epmet-module/epmet-message/epmet-message-server/pom.xml
+++ b/epmet-module/epmet-message/epmet-message-server/pom.xml
@@ -118,9 +118,9 @@
     <profiles>
         <profile>
             <id>dev</id>
-            <!--<activation>
+            <activation>
                 <activeByDefault>true</activeByDefault>
-            </activation>-->
+            </activation>
             <properties>
                 <server.port>8085</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
@@ -148,9 +148,9 @@
         </profile>
         <profile>
             <id>test</id>
-            <!--<activation>
+            <activation>
                 <activeByDefault>true</activeByDefault>
-            </activation>-->
+            </activation>
             <properties>
                 <server.port>8085</server.port>
                 <spring.profiles.active>test</spring.profiles.active>

From 35d3c4393ad69d04967e6d5a00f68d5a2a670929 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 3 Apr 2020 17:03:25 +0800
Subject: [PATCH 5/7] =?UTF-8?q?message=E7=9A=84pom=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A<activation>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/epmet-message/epmet-message-server/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml
index 96c2afded9..d0491e382b 100644
--- a/epmet-module/epmet-message/epmet-message-server/pom.xml
+++ b/epmet-module/epmet-message/epmet-message-server/pom.xml
@@ -118,11 +118,9 @@
     <profiles>
         <profile>
             <id>dev</id>
-
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-
             <properties>
                 <server.port>8085</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
@@ -150,6 +148,9 @@
         </profile>
         <profile>
             <id>test</id>
+            <!--<activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>-->
             <properties>
                 <server.port>8085</server.port>
                 <spring.profiles.active>test</spring.profiles.active>

From dcd471f5103db8fb36270bd4e8e3d85e4649170a Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 3 Apr 2020 17:22:07 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/modules/topic/controller/ResiTopicController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
index 794a319cc0..b19c8f6623 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
@@ -53,7 +53,7 @@ public class ResiTopicController {
      * @Date 2020.04.01 23:48
      **/
     @PostMapping("gettopicdetail")
-    public Result<ResiTopicDetailResultDTO> getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody String topicId ){
+    public Result<ResiTopicDetailResultDTO> getTopicDetail(@LoginUser TokenDto tokenDto, @RequestParam("topicId") String topicId ){
         return topicService.getTopicDetail(tokenDto,topicId);
     }
 
@@ -80,7 +80,7 @@ public class ResiTopicController {
      * @Date 2020.04.02 00:01
      **/
     @PostMapping("getlatesttentopics")
-    Result<List<ResiTopicInfoResultDTO>> getLatestTenTopics(@LoginUser  TokenDto tokenDto,@RequestBody String groupId){
+    Result<List<ResiTopicInfoResultDTO>> getLatestTenTopics(@LoginUser  TokenDto tokenDto,@RequestParam("groupId") String groupId){
         return topicService.getLatestTenTopics(tokenDto,groupId);
     }
 

From 7a8510ffc8beaafc676d06df54d78efe555ee380 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 3 Apr 2020 18:39:49 +0800
Subject: [PATCH 7/7] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/modules/feign/ResiPartymemberFeignClient.java    | 2 +-
 .../modules/partymember/redis/PartymemberInfoRedis.java    | 7 ++++++-
 .../service/impl/PartyMemberConfirmServiceImpl.java        | 6 ++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

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 3393371ca6..51796840f4 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
@@ -74,6 +74,6 @@ public interface ResiPartymemberFeignClient {
      * @param partyMemberInfoDTO 参数
      * @return Result
      */
-    @PostMapping("extra")
+    @PostMapping("/resi/partymember/confirm/extra")
     Result partyMemberInfoExtra(@RequestBody PartymemberInfoDTO partyMemberInfoDTO);
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java
index 02adb2ee95..d97754ad04 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java
@@ -47,7 +47,7 @@ public class PartymemberInfoRedis {
 
     public void setUserMobileCode(String userId, String mobile, String code){
         String key = RedisKeys.getUserMobileCodeKey(userId, mobile, code);
-        redisUtils.set(key, code);
+        redisUtils.set(key, code, RedisUtils.MINUTE_TEN_EXPIRE);
     }
 
     public String getUserMobileCode(String userId, String mobile, String code){
@@ -55,4 +55,9 @@ public class PartymemberInfoRedis {
         return (String) redisUtils.get(key);
     }
 
+    public void delUserMobileCode(String userId, String mobile, String code){
+        String key = RedisKeys.getUserMobileCodeKey(userId, mobile, code);
+        redisUtils.delete(key);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
index 5b061faca6..9ba74dda60 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
@@ -55,8 +55,6 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 	@Autowired
 	private EpmetMessageFeignClient messageFeignClient;
 
-	private final static String BENCHMARK = "110010";
-
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Result<PartyMemberInitResultDTO> init(PartyMemberInitFromDTO fromDto) {
@@ -143,6 +141,10 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getValue());
 			result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getName());
 			return result;
+		} else {
+			partyMemberInfoRedis.delUserMobileCode(partyMemberInfoDTO.getUserId(),
+					partyMemberInfoDTO.getMobile(),
+					partyMemberInfoDTO.getCode());
 		}
 
 		//获取党员基本信息