注册审核之后不再发送短信；注册审核时更新审核时间

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java

@@ -6,7 +6,6 @@ import cn.binarywang.wx.miniapp.bean.WxMaUniformMessage;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.EpdcDeleteWxFormIdFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
-import com.elink.esua.epdc.dto.form.EpdcRegisterResultSmsFormDTO;
 import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
 import com.elink.esua.epdc.feign.MessageFeignClient;
 import com.elink.esua.epdc.feign.UserFeignClient;
@@ -66,30 +65,23 @@ public class MessageServiceImpl implements MessageService {
         }
         // 用户审核结果
         EpdcUserRegisterAuditMsgResultDTO registerAuditResultDto = userResult.getData();
+        if (StringUtils.isBlank(registerAuditResultDto.getWxFormId())) {
+            return new Result().error("没有可用的wxFormId");
+        }
 
         switch (userAuditStateEnum) {
             case AUDIT_FAILURE:
-                EpdcRegisterResultSmsFormDTO form = new EpdcRegisterResultSmsFormDTO();
-                form.setMobile(registerAuditResultDto.getMobile());
-                form.setReason(registerAuditResultDto.getRemark());
-                // 发送审核失败短信
-                this.messageFeignClient.registerFailure(form);
-                if (StringUtils.isNotBlank(registerAuditResultDto.getWxFormId())) {
-                    this.sendRegisterFailureMaMsg(registerAuditResultDto);
-                    this.deleteWxFormId(registerAuditResultDto.getWxFormIdId());
-                }
-                return new Result();
+                this.sendRegisterFailureMaMsg(registerAuditResultDto);
+                this.deleteWxFormId(registerAuditResultDto.getWxFormIdId());
+                break;
             case AUDIT_SUCCESS:
-                // 发送审核成功信息
-                this.messageFeignClient.registerSuccess(registerAuditResultDto.getMobile());
-                if (StringUtils.isNotBlank(registerAuditResultDto.getWxFormId())) {
-                    this.sendRegisterSuccessMaMsg(registerAuditResultDto);
-                    this.deleteWxFormId(registerAuditResultDto.getWxFormIdId());
-                }
-                return new Result();
+                this.sendRegisterSuccessMaMsg(registerAuditResultDto);
+                this.deleteWxFormId(registerAuditResultDto.getWxFormIdId());
+                break;
             default:
-                return new Result().error("发送审核结果信息失败");
+                break;
         }
+        return new Result();
     }
 
     /**

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@@ -61,4 +61,14 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @date 2019/9/27 09:14
      */
     EpdcUserRegisterAuditMsgResultDTO getUserRegisterAuditResult(@Param("userId") String userId);
+
+    /**
+     * 根据wxOpenId，删除审核失败的记录
+     *
+     * @param wxOpenId
+     * @return int
+     * @author work@yujt.net.cn
+     * @date 2019/9/27 10:08
+     */
+    int deleteAuditFailureByOpenId(@Param("wxOpenId") String wxOpenId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -47,6 +47,7 @@ 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;
 
@@ -146,8 +147,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void audit(UserDTO dto) {
-        //先删除以前审核未通过的那条数据  根据WX_UNION_ID 判断
-        deleteByUnionId(dto);
+        //先删除以前审核未通过的那条数据
+        this.baseDao.deleteAuditFailureByOpenId(dto.getWxOpenId());
         UserEntity entity = ConvertUtils.sourceToTarget(dto, UserEntity.class);
         //是否通过审核
         if (AppUserAuditStateEnum.AUDIT_SUCCESS.value().equals(dto.getPass())) {
@@ -155,6 +156,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         } else if (AppUserAuditStateEnum.AUDIT_FAILURE.value().equals(dto.getPass())) {
             entity.setState(AppUserAuditStateEnum.AUDIT_FAILURE.value());
         }
+        // createdTime作为提交注册时间，registerTime作为注册审核时间（即注册时间）
+        entity.setRegisterTime(new Date());
         updateById(entity);
         //判断是否是党员
         if (YesOrNoEnum.YES.value().equals(dto.getPartyFlag()) && YesOrNoEnum.YES.value().equals(dto.getPass())) {
@@ -167,10 +170,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
     }
 
-    private void deleteByUnionId(UserDTO dto) {
-        String wxUnionId = dto.getWxUnionId();
-        baseDao.deleteByUnionId(wxUnionId);
-    }
 
     @Override
     public Result<UserDTO> getUserForLoginByOpenId(String openId) {

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -3,6 +3,10 @@
 
 <mapper namespace="com.elink.esua.epdc.dao.UserDao">
 
+    <delete id="deleteAuditFailureByOpenId">
+        DELETE FROM epdc_user WHERE WX_OPEN_ID = #{wxOpenId} AND STATE = '2'
+    </delete>
+
     <select id="selectOneInfoById" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO">
         SELECT
             eu.ID AS id,