Merge remote-tracking branch 'origin/feature/modify-phone-no-20221117' into...

Merge remote-tracking branch 'origin/feature/modify-phone-no-20221117' into feature/modify-phone-no-20221117

src/main/java/cn/quantgroup/xyqb/controller/modifyphoneno/req/ModifyPhoneRecord.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
 @Data
 public class ModifyPhoneRecord implements Serializable {
 
-    @NotNull(message = "用户ID不能为空")
+//    @NotNull(message = "用户ID不能为空")
     private Long userId;
 
     @NotBlank(message = "原手机号不能为空")
@@ -29,7 +29,7 @@ public class ModifyPhoneRecord implements Serializable {
     @NotBlank(message = "操作人不能为空")
     private String operator;
 
-    @NotBlank(message = "备注不能为空")
+//    @NotBlank(message = "备注不能为空")
     private String remark;
 
 }

src/main/java/cn/quantgroup/xyqb/service/user/impl/ModifyPhoneNoServiceImpl.java

@@ -6,6 +6,7 @@ import cn.quantgroup.xyqb.controller.modifyphoneno.resp.ProgressResp;
 import cn.quantgroup.xyqb.entity.ModifyPhoneNo;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.entity.UserModifyPhoneRecord;
+import cn.quantgroup.xyqb.exception.AppletException;
 import cn.quantgroup.xyqb.exception.DataException;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.ModifyPhoneNoApplyStatusEnum;
@@ -15,6 +16,7 @@ import cn.quantgroup.xyqb.repository.IModifyPhoneRecordRepository;
 import cn.quantgroup.xyqb.repository.IUserDetailRepository;
 import cn.quantgroup.xyqb.repository.IUserRepository;
 import cn.quantgroup.xyqb.service.http.IHttpService;
+import cn.quantgroup.xyqb.service.session.ISessionService;
 import cn.quantgroup.xyqb.service.sms.ISmsService;
 import cn.quantgroup.xyqb.service.user.IModifyPhoneNoService;
 import cn.quantgroup.xyqb.service.user.IUserService;
@@ -48,6 +50,7 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Date: 2019/11/4
@@ -88,6 +91,9 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
 
     @Resource
     private IModifyPhoneRecordRepository modifyPhoneRecordRepository;
+    @Autowired
+    private ISessionService sessionService;
+
 
     /**
      * @param userId   user.id
@@ -249,6 +255,9 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
                 if (modifyPhoneRecord.getCurPhoneNo().equals(modifyPhoneRecord.getPrevPhoneNo())) {
                     throw new DataException("新手机号已存在，不支持更换");
                 }
+                if (Objects.isNull(modifyPhoneRecord.getUserId())){
+                    throw new DataException("用户ID不能为空");
+                }
                 User user = userService.findById(modifyPhoneRecord.getUserId());
                 if (user == null) {
                     throw new DataException("用户不存在");
@@ -279,6 +288,8 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
                     BeanUtils.copyProperties(modifyPhoneRecord, record);
                     record.setFinancialResponse(JSONObject.toJSONString(resultStrJson));
                     modifyPhoneRecordRepository.saveAndFlush(record);
+                    //登出此用户
+                    sessionService.deleteByUserId(user.getId());
                 } else {
                     throw new DataException("金融返回失败");
                 }
@@ -303,9 +314,9 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
                 if (modifyPhoneRecord.getCurPhoneNo().equals(modifyPhoneRecord.getPrevPhoneNo())) {
                     throw new DataException("新手机号已存在，不支持更换");
                 }
-                User user = userService.findById(modifyPhoneRecord.getUserId());
+                User user = userService.findByPhoneInDb(modifyPhoneRecord.getPrevPhoneNo());
                 if (user == null) {
-                    throw new DataException("用户不存在");
+                    throw new AppletException("用户不存在", "1001");
                 }
 
 
@@ -317,6 +328,8 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
                 UserModifyPhoneRecord record = new UserModifyPhoneRecord();
                 BeanUtils.copyProperties(modifyPhoneRecord, record);
                 modifyPhoneRecordRepository.saveAndFlush(record);
+                //登出此用户
+                sessionService.deleteByUserId(user.getId());
             }
 
         } catch (Exception e) {