客服系统修改手机号及记录接口

src/main/java/cn/quantgroup/customer/enums/ErrorCodeEnum.java

@@ -7,7 +7,9 @@ public enum ErrorCodeEnum {
     RETURN_ERROR(7001L, "返回值异常"),
     PARAM_ERROR(7002L, "参数异常"),
     NO_TOKEN(8001L,"缺少token信息"),
-    ILLEGAL_TOKEN(8002L,"token信息有误");
+    ILLEGAL_TOKEN(8002L,"token信息有误"),
+    PHONE_EQUALS(8003L, "新手机号已存在，不支持更换"),
+    ;
 
 
     public String getMessage() {

src/main/java/cn/quantgroup/customer/rest/UserModifyPhoneController.java

 package cn.quantgroup.customer.rest;
 
+import cn.quantgroup.customer.enums.ErrorCodeEnum;
 import cn.quantgroup.customer.rest.param.phone.ModifyPhoneRecord;
 import cn.quantgroup.customer.rest.vo.JsonResult;
-import cn.quantgroup.customer.util.ValidationUtil;
+import cn.quantgroup.customer.service.IUserService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 
@@ -18,16 +16,27 @@ import javax.validation.Valid;
 @RestController
 @RequestMapping("/v1")
 public class UserModifyPhoneController {
-
+    @Autowired
+    private IUserService userService;
     /**
      * 修改手机号
      */
     @PostMapping(value = "/modify/phoneNo")
     public JsonResult modifyPhoneNo(@Valid @RequestBody ModifyPhoneRecord modifyPhoneRecord) {
-        if (StringUtils.isNotBlank(modifyPhoneRecord.getCurPhoneNo()) && !ValidationUtil.validatePhoneNo(modifyPhoneRecord.getCurPhoneNo())) {
-            return JsonResult.buildErrorStateResult("手机号格式错误", null);
+        if (modifyPhoneRecord.getCurPhoneNo().equals(modifyPhoneRecord.getPrevPhoneNo())) {
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.PHONE_EQUALS.getMessage(), ErrorCodeEnum.PHONE_EQUALS.getCode());
         }
-        System.out.println(modifyPhoneRecord);
-        return JsonResult.buildSuccessResult("success", modifyPhoneRecord);
+        return userService.submitModiyPhoneNo(modifyPhoneRecord);
+    }
+
+    /**
+     *  获取修改手机号列表
+     * @return
+     */
+    @PostMapping(value = "/modifyPhoneNolist")
+    public JsonResult modifyPhoneNolist(@RequestParam Long userId,
+                                        @RequestParam(defaultValue = "1", required = false) int pageNo,
+                                        @RequestParam(defaultValue = "10", required = false) int pageSize) {
+        return userService.modifyPhoneNolist(userId, pageNo, pageSize);
     }
 }

src/main/java/cn/quantgroup/customer/rest/param/phone/ModifyPhoneRecord.java

@@ -11,15 +11,15 @@ import java.io.Serializable;
 @Data
 public class ModifyPhoneRecord implements Serializable {
 
-    @NotBlank(message = "用户ID不能为空")
-    private String userId;
+    @NotNull(message = "用户ID不能为空")
+    private Long userId;
 
     @NotBlank(message = "原手机号不能为空")
-    @Pattern(regexp = ValidationUtil.phoneRegExp, message = "当前手机号码格式错误")
+    @Pattern(regexp = ValidationUtil.phoneRegExp, message = "原手机号码格式错误")
     private String prevPhoneNo;
 
     @NotBlank(message = "新手机号不能为空")
-    @Pattern(regexp = ValidationUtil.phoneRegExp, message = "当前手机号码格式错误")
+    @Pattern(regexp = ValidationUtil.phoneRegExp, message = "新手机号码格式错误")
     private String curPhoneNo;
 
     @NotNull(message = "修改原因不能为空")

src/main/java/cn/quantgroup/customer/service/IUserService.java

@@ -5,6 +5,7 @@ import cn.quantgroup.customer.rest.param.ordermapping.OrderQueryParam;
 import cn.quantgroup.customer.rest.param.phone.ModifyPhoneAudit;
 import cn.quantgroup.customer.rest.param.phone.ModifyPhoneFeedback;
 import cn.quantgroup.customer.rest.param.phone.ModifyPhoneQuery;
+import cn.quantgroup.customer.rest.param.phone.ModifyPhoneRecord;
 import cn.quantgroup.customer.rest.param.user.UserCombinationParam;
 import cn.quantgroup.customer.rest.param.user.UserQueryParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
@@ -104,4 +105,8 @@ public interface IUserService extends UserDetailsService {
     MoResult<String> queryPointDetailByPage(UserQueryParam  userQueryParam);
 
     MoResult<String> queryUserCouponInfoByUserParam(UserQueryParam userQueryParam);
+
+    JsonResult submitModiyPhoneNo(ModifyPhoneRecord modifyPhoneRecord);
+
+    JsonResult modifyPhoneNolist(Long userId, int pageNo, int pageSize);
 }

src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java

@@ -17,6 +17,7 @@ import cn.quantgroup.customer.rest.param.ordermapping.OrderQueryParam;
 import cn.quantgroup.customer.rest.param.phone.ModifyPhoneAudit;
 import cn.quantgroup.customer.rest.param.phone.ModifyPhoneFeedback;
 import cn.quantgroup.customer.rest.param.phone.ModifyPhoneQuery;
+import cn.quantgroup.customer.rest.param.phone.ModifyPhoneRecord;
 import cn.quantgroup.customer.rest.param.user.UserCombinationParam;
 import cn.quantgroup.customer.rest.param.user.UserQueryParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
@@ -46,12 +47,15 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
+
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
+
 import static cn.quantgroup.customer.constant.Constant.GSON;
 
 @Slf4j
@@ -1227,6 +1231,63 @@ public class UserServiceImpl implements IUserService {
 
     }
 
+    @Override
+    public JsonResult submitModiyPhoneNo(ModifyPhoneRecord modifyPhoneRecord) {
+        String url = userSysUrl + "/v1/user/modify/phone_no/financial/submitModify";
+        Map param = GSON.fromJson(GSON.toJson(modifyPhoneRecord), Map.class);
+        try {
+            Map<String, String> header = Maps.newHashMap();
+            header.put("Content-type", "application/json");
+            String result = httpService.post(url, header, param);
+            System.out.println(result);
+            JSONObject userJsonObject =null;
+            if(result != null){
+                userJsonObject = JSONObject.parseObject(result);
+                String userBusinessCode = userJsonObject.getString("businessCode");
+                if("0000".equals(userBusinessCode)){
+                    return JsonResult.buildSuccessResult(userJsonObject.getString("msg"),userJsonObject.get("data"));
+                }else{
+                    return JsonResult.buildErrorStateResult(userJsonObject.getString("msg"),userJsonObject.get("data"));
+                }
+            }else{
+                return JsonResult.buildErrorStateResult(userJsonObject.getString("msg"),userJsonObject.get("data"));
+            }
+        } catch (Exception e) {
+            log.error("[user][query modify phoneNo] 网络通讯异常,modifyPhoneRecord:{},ex:{}", modifyPhoneRecord, ExceptionUtils.getStackTrace(e));
+            throw new BusinessException(ErrorCodeEnum.NET_ERROR);
+        }
+    }
+
+    @Override
+    public JsonResult modifyPhoneNolist(Long userId, int pageNo, int pageSize) {
+        String url = userSysUrl + "/v1/user/modify/phone_no/modifyPhoneNolist";
+        Map<String, String> param = new HashMap<String, String>();
+        param.put("userId", String.valueOf(userId));
+        param.put("pageNo", String.valueOf(pageNo));
+        param.put("pageSize", String.valueOf(pageSize));
+        try {
+            Map<String, String> header = Maps.newHashMap();
+            header.put("Content-type", "application/x-www-form-urlencoded");
+            String result = httpService.post(url, header, param);
+            System.out.println(result);
+            JSONObject userJsonObject =null;
+            if(result != null){
+                userJsonObject = JSONObject.parseObject(result);
+                String userBusinessCode = userJsonObject.getString("businessCode");
+                if("0000".equals(userBusinessCode)){
+                    return JsonResult.buildSuccessResult(userJsonObject.getString("msg"),userJsonObject.get("data"));
+                }else{
+                    return JsonResult.buildErrorStateResult(userJsonObject.getString("msg"),userJsonObject.get("data"));
+                }
+            }else{
+                return JsonResult.buildErrorStateResult(userJsonObject.getString("msg"),userJsonObject.get("data"));
+            }
+
+        } catch (Exception e) {
+            throw new BusinessException(ErrorCodeEnum.NET_ERROR);
+        }
+    }
+
     /**
      *根据userid和phoneNo获取基本信息
      * @param xUserUserSysResult