销户

src/main/java/cn/quantgroup/xyqb/controller/ExceptionHandlingController.java

@@ -187,4 +187,14 @@ public class ExceptionHandlingController implements IBaseController {
     public JsonResult handelMissingServletRequestParameterException(MissingServletRequestParameterException re) {
         return JsonResult.buildErrorStateResult(re.getMessage(), null);
     }
+
+    /**
+     * 用户注册登录异常处理
+     * @param e 异常
+     * @return JsonResult<String>
+     */
+    @ExceptionHandler(UserRegisterLoginException.class)
+    public JsonResult<?> handleUserDeregisterException(UserRegisterLoginException e) {
+        return JsonResult.buildErrorStateResult(e.getMessage(), null);
+    }
 }

src/main/java/cn/quantgroup/xyqb/exception/UserRegisterLoginException.java

+package cn.quantgroup.xyqb.exception;
+
+
+/**
+ * 用户销户异常
+ *
+ * @author killer
+ * @date 2021年12月29日14:31:02
+ */
+public class UserRegisterLoginException extends RuntimeException {
+
+    private static final long serialVersionUID = -1L;
+
+    public UserRegisterLoginException(String msg, Throwable t) {
+        super(msg, t);
+    }
+
+    public UserRegisterLoginException(String msg) {
+        super(msg);
+    }
+}

src/main/java/cn/quantgroup/xyqb/repository/IUserDeregisterRecordRepository.java

@@ -14,10 +14,10 @@ import java.util.List;
 public interface IUserDeregisterRecordRepository extends JpaRepository<UserDeregisterRecord, Long> {
 
     /**
-     * 通过userId查询销户记录
+     * 通过用户手机号md5查询销户记录
      *
-     * @param userId 用户Id
+     * @param phoneNo 手机号md5
      * @return List<UserDeregisterRecord>
      */
-    List<UserDeregisterRecord> findByUserId(Long userId);
+    List<UserDeregisterRecord> findByPhoneNo(String phoneNo);
 }

src/main/java/cn/quantgroup/xyqb/service/register/IUserDeregisterService.java

 package cn.quantgroup.xyqb.service.register;
 
+import cn.quantgroup.xyqb.entity.UserDeregisterRecord;
+
+import java.util.List;
+
 /**
  * 销户服务
  *
@@ -9,10 +13,11 @@ package cn.quantgroup.xyqb.service.register;
 public interface IUserDeregisterService {
 
     /**
-     * 用户销户检测
+     * 通过用户手机号md5查询销户记录
      *
-     * @param userId 用户id
-     * @return
+     * @param phoneNo 手机号md5
+     * @return List<UserDeregisterRecord>
      */
-   boolean deregisterCheck(Long userId);
+    List<UserDeregisterRecord> queryByPhoneNo(String phoneNo);
+
 }

src/main/java/cn/quantgroup/xyqb/service/register/impl/IUserDeregisterServiceImpl.java

+package cn.quantgroup.xyqb.service.register.impl;
+
+import cn.quantgroup.xyqb.entity.UserDeregisterRecord;
+import cn.quantgroup.xyqb.repository.IUserDeregisterRecordRepository;
+import cn.quantgroup.xyqb.service.register.IUserDeregisterService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 销户服务实现
+ *
+ * @author killer
+ * @date 2021年12月29日
+ **/
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class IUserDeregisterServiceImpl implements IUserDeregisterService {
+
+    private final IUserDeregisterRecordRepository userDeregisterRecordRepository;
+
+    @Override
+    public List<UserDeregisterRecord> queryByPhoneNo(String phoneNo) {
+        return userDeregisterRecordRepository.findByPhoneNo(phoneNo);
+    }
+}

src/main/java/cn/quantgroup/xyqb/service/register/impl/UserRegisterServiceImpl.java

@@ -4,22 +4,24 @@ import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.entity.Address;
 import cn.quantgroup.xyqb.entity.Contact;
 import cn.quantgroup.xyqb.entity.User;
+import cn.quantgroup.xyqb.entity.UserDeregisterRecord;
 import cn.quantgroup.xyqb.event.RegisterEvent;
 import cn.quantgroup.xyqb.model.UserRegisterParam;
+import cn.quantgroup.xyqb.service.register.IUserDeregisterService;
 import cn.quantgroup.xyqb.service.register.IUserRegisterService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import cn.quantgroup.xyqb.util.PasswordUtil;
 import cn.quantgroup.xyqb.util.TenantUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
+import java.util.function.Predicate;
 
 /**
  * @author liqing
@@ -27,7 +29,7 @@ import java.util.UUID;
  */
 @Service("userRegisterService")
 @Slf4j
-    public class UserRegisterServiceImpl implements IUserRegisterService {
+public class UserRegisterServiceImpl implements IUserRegisterService {
 
     @Resource
     private ApplicationEventPublisher applicationEventPublisher;
@@ -35,6 +37,9 @@ import java.util.UUID;
     @Resource
     private IUserService userService;
 
+    @Resource
+    private IUserDeregisterService userDeregisterService;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public User register(Long registerFrom, String phoneNo) {
@@ -218,4 +223,18 @@ import java.util.UUID;
         return user;
     }
 
+
+    private void registerCheck(String phoneNo) {
+        // todo 手机号md5值
+        List<UserDeregisterRecord> deregisterRecords = userDeregisterService.queryByPhoneNo(phoneNo);
+
+        Optional<UserDeregisterRecord> lastOne = deregisterRecords.stream()
+                .max(Comparator.comparing(UserDeregisterRecord::getDeregisterTime));
+
+        if (!lastOne.isPresent()) {
+            return;
+        }
+
+        Date deregisterTime = lastOne.get().getDeregisterTime();
+    }
 }