添加修改手机号后台管理接口

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

@@ -3,7 +3,8 @@ package cn.quantgroup.customer.enums;
 public enum ErrorCodeEnum {
 
     NET_ERROR(6001L, "网络通讯异常"),
-    RETURN_ERROR(7001L, "返回值异常");
+    RETURN_ERROR(7001L, "返回值异常"),
+    PARAM_ERROR(7002L, "参数异常");
 
 
     public String getMessage() {

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

 package cn.quantgroup.customer.rest;
 
 import cn.quantgroup.customer.enums.ErrorCodeEnum;
+import cn.quantgroup.customer.rest.enums.user.ModifyPhoneAuditStatus;
 import cn.quantgroup.customer.rest.param.LoginParam;
 import cn.quantgroup.customer.rest.param.ModifyPhoneAudit;
 import cn.quantgroup.customer.rest.param.ModifyPhoneFeedback;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import javax.validation.Valid;
+import java.time.LocalDate;
 
 import static cn.quantgroup.customer.constant.Constant.*;
 
@@ -62,6 +64,14 @@ public class UserRest {
      */
     @GetMapping(value = "/modify/phone_no")
     public JsonResult modifyPhoneQuery(ModifyPhoneQuery modifyPhoneQuery) {
+        LocalDate startAt = modifyPhoneQuery.getStartAt();
+        LocalDate endAt = modifyPhoneQuery.getEndAt();
+        if (startAt == null && endAt != null) {
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.PARAM_ERROR.getMessage(), ErrorCodeEnum.PARAM_ERROR.getCode());
+        }
+        if (startAt != null && endAt != null && startAt.isAfter(endAt)) {
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.PARAM_ERROR.getMessage(), ErrorCodeEnum.PARAM_ERROR.getCode());
+        }
         String response = userService.modifyPhoneQuery(modifyPhoneQuery);
         if (StringUtils.isEmpty(response)) {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
@@ -76,7 +86,11 @@ public class UserRest {
      * @return
      */
     @PostMapping(value = "/modify/phone_no/audit")
-    public JsonResult modifyPhoneAudit(ModifyPhoneAudit modifyPhoneAudit) {
+    public JsonResult modifyPhoneAudit(@Valid ModifyPhoneAudit modifyPhoneAudit) {
+        String applyStatus = modifyPhoneAudit.getApplyStatus();
+        if (ModifyPhoneAuditStatus.REJECT.getCode().equals(applyStatus) && StringUtils.isEmpty(modifyPhoneAudit.getApplyStatusReason())) {
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.PARAM_ERROR.getMessage(), ErrorCodeEnum.PARAM_ERROR.getCode());
+        }
         String response = userService.modifyPhoneAudit(modifyPhoneAudit);
         if (StringUtils.isEmpty(response)) {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
@@ -91,7 +105,7 @@ public class UserRest {
      * @return
      */
     @PostMapping(value = "/modify/phone_no/feedback")
-    public JsonResult modifyPhoneFeedback(ModifyPhoneFeedback modifyPhoneFeedback) {
+    public JsonResult modifyPhoneFeedback(@Valid ModifyPhoneFeedback modifyPhoneFeedback) {
         String response = userService.modifyPhoneFeedback(modifyPhoneFeedback);
         if (StringUtils.isEmpty(response)) {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());

src/main/java/cn/quantgroup/customer/rest/enums/user/ModifyPhoneAuditStatus.java

+package cn.quantgroup.customer.rest.enums.user;
+
+public enum ModifyPhoneAuditStatus {
+    PASS("1", "通过"),
+    REJECT("2", "不通过");
+
+
+    public String getMessage() {
+        return message;
+    }
+
+
+    public String getCode() {
+        return code;
+    }
+
+    private String code;
+    private String message;
+
+    ModifyPhoneAuditStatus(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

src/main/java/cn/quantgroup/customer/rest/param/ModifyPhoneAudit.java

 package cn.quantgroup.customer.rest.param;
 
-import cn.quantgroup.customer.rest.enums.user.ModifyPhoneApplyStatus;
 import lombok.Data;
 import lombok.ToString;
 
@@ -10,7 +9,7 @@ import javax.validation.constraints.NotNull;
 @ToString
 public class ModifyPhoneAudit {
     @NotNull(message = "审核状态不能为空")
-    private ModifyPhoneApplyStatus applyStatus;
+    private String applyStatus;
     private String applyStatusReason;
     @NotNull(message = "id不能为空")
     private String id;

src/main/java/cn/quantgroup/customer/rest/param/ModifyPhoneQuery.java

 package cn.quantgroup.customer.rest.param;
 
-import cn.quantgroup.customer.rest.enums.user.ModifyPhoneApplyStatus;
-import cn.quantgroup.customer.rest.enums.user.ModifyPhoneProcessingStatus;
 import lombok.Data;
 import lombok.ToString;
 
@@ -13,8 +11,8 @@ public class ModifyPhoneQuery {
     private String phoneNo;
     private LocalDate startAt;
     private LocalDate endAt;
-    private ModifyPhoneApplyStatus applyStatus;
-    private ModifyPhoneProcessingStatus processingStatus;
+    private String applyStatus;
+    private String processingStatus;
     private String page;
     private String size;
 }