From 5ba231eefdec11e09a795e9f19317e85194187e0 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Thu, 19 Sep 2019 20:38:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=B9=8B=E5=90=8E=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=9C=AA=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/elink/esua/epdc/dao/UserDao.java | 10 ++++++++++
 .../elink/esua/epdc/service/impl/UserServiceImpl.java  |  7 +++++++
 .../src/main/resources/mapper/UserDao.xml              |  7 +++++++
 3 files changed, 24 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
index 2d3431c1f..10deaeb19 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
@@ -40,4 +40,14 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @date 2019/9/12 15:29
      */
     EpdcUserInfoResultDTO selectOneInfoById(String id);
+
+    /***
+     * 删除之前未通过的
+     * @param wxUnionId
+     * @return
+     * @author qushutong
+     * @date 2019/9/19 20:34
+     */
+    void deleteByUnionId(String wxUnionId);
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index 874285ad2..fd8c2ef20 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -143,7 +143,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void audit(UserDTO dto) {
+        //先删除以前审核未通过的那条数据  根据WX_UNION_ID 判断
+        deleteByUnionId(dto);
         UserEntity entity = ConvertUtils.sourceToTarget(dto, UserEntity.class);
         //是否通过审核
         if (YesOrNoEnum.YES.value().equals(dto.getPass())) {
@@ -161,7 +164,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             partyMembersDTO.setGridName(dto.getGrid());
             partyMembersService.save(partyMembersDTO);
         }
+    }
 
+    private void deleteByUnionId(UserDTO dto) {
+        String wxUnionId = dto.getWxUnionId();
+        baseDao.deleteByUnionId(wxUnionId);
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index d5e848354..666f483de 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -25,5 +25,12 @@
         WHERE
             eu.ID = #{id}
     </select>
+    <select id="deleteByUnionId">
+        DELETE
+        FROM
+            epdc_news
+        WHERE
+            WX_UNION_ID = #{wxUnionId}
+    </select>
 
 </mapper>
\ No newline at end of file