修改手机号联调问题修复

src/main/java/cn/quantgroup/xyqb/controller/modifyphoneno/ModifyPhoneNoController.java

@@ -2,6 +2,7 @@ package cn.quantgroup.xyqb.controller.modifyphoneno;
 
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.controller.modifyphoneno.req.*;
+import cn.quantgroup.xyqb.controller.modifyphoneno.req.ModifyPhoneRecord.UserClient;
 import cn.quantgroup.xyqb.controller.modifyphoneno.resp.ModifyPhoneNoResp;
 import cn.quantgroup.xyqb.controller.modifyphoneno.resp.ProgressResp;
 import cn.quantgroup.xyqb.controller.modifyphoneno.resp.UserModifyPhoneRecordResp;
@@ -13,6 +14,7 @@ import cn.quantgroup.xyqb.service.user.IModifyPhoneNoService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.Page;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -141,7 +143,7 @@ public class ModifyPhoneNoController implements IBaseController {
      * @return
      */
     @PostMapping("/client/submitModify")
-    public JsonResult clientSubmitModify(@RequestBody ModifyPhoneRecord modifyPhoneRecord) {
+    public JsonResult clientSubmitModify(@Validated(value = UserClient.class) @RequestBody ModifyPhoneRecord modifyPhoneRecord) {
         modifyPhoneNoService.clientSubmitModify(modifyPhoneRecord);
         return JsonResult.buildSuccessResult();
     }

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

@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.controller.modifyphoneno.req;
 import cn.quantgroup.xyqb.entity.enums.ApplySource;
 import cn.quantgroup.xyqb.entity.enums.Reason;
 import cn.quantgroup.xyqb.util.ValidationUtil;
+import feign.Client.Default;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotBlank;
 
@@ -16,12 +17,12 @@ public class ModifyPhoneRecord implements Serializable {
 //    @NotNull(message = "用户ID不能为空")
     private Long userId;
 
-    @NotBlank(message = "原手机号不能为空")
-    @Pattern(regexp = ValidationUtil.phoneRegExp, message = "原手机号码格式错误")
+    @NotBlank(message = "原手机号不能为空", groups = {Default.class, UserClient.class})
+    @Pattern(regexp = ValidationUtil.phoneRegExp, message = "原手机号码格式错误", groups = {Default.class, UserClient.class})
     private String prevPhoneNo;
 
-    @NotBlank(message = "新手机号不能为空")
-    @Pattern(regexp = ValidationUtil.phoneRegExp, message = "新手机号码格式错误")
+    @NotBlank(message = "新手机号不能为空", groups = {Default.class, UserClient.class})
+    @Pattern(regexp = ValidationUtil.phoneRegExp, message = "新手机号码格式错误", groups = {Default.class, UserClient.class})
     private String curPhoneNo;
 
     @NotNull(message = "修改原因不能为空")
@@ -38,4 +39,7 @@ public class ModifyPhoneRecord implements Serializable {
      */
     private ApplySource applySource;
 
+    public interface Background{}
+    public interface UserClient{}
+    public interface Finance{}
 }

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

@@ -396,6 +396,10 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
         try {
             if (lock.lock()) {
                 if (modifyPhoneRecord.getCurPhoneNo().equals(modifyPhoneRecord.getPrevPhoneNo())) {
+                    throw new DataException("新手机号与原手机号相同");
+                }
+                User userByCurPhoneNo = userService.findByPhoneInDb(modifyPhoneRecord.getCurPhoneNo());
+                if (Objects.nonNull(userByCurPhoneNo)){
                     throw new DataException("新手机号已存在，不支持更换");
                 }
                 User user = userService.findByPhoneInDb(modifyPhoneRecord.getPrevPhoneNo());