Merge remote-tracking branch 'origin/master'

lb-common/src/main/java/com/ydd/common/core/domain/ResponseResult.java

@@ -1,6 +1,7 @@
 package com.ydd.common.core.domain;
 
 import com.ydd.common.enums.ResponseResultCodeEnum;
+import com.ydd.common.utils.StringUtils;
 
 import java.io.Serializable;
 
@@ -72,12 +73,15 @@ public class ResponseResult<T> implements Serializable {
         return error(resultCodeEnum, null);
     }
 
-    public static <T> ResponseResult<T> emptyError(ResponseResultCodeEnum resultCodeEnum, T data, String message) {
-        return new ResponseResult<T>(resultCodeEnum.getCode(), message.concat(resultCodeEnum.getMessage()), data);
+    public static <T> ResponseResult<T> error(ResponseResultCodeEnum resultCodeEnum, T data, String message) {
+        String errorMessage;
+        if (StringUtils.isNotBlank(message)) {
+            errorMessage = message.concat(resultCodeEnum.getMessage());
+        }else {
+            errorMessage = resultCodeEnum.getMessage();
+        }
+        return new ResponseResult<T>(resultCodeEnum.getCode(), errorMessage, data);
     }
 
-    public static <T> ResponseResult<T> emptyError(ResponseResultCodeEnum resultCodeEnum, String message) {
-        return emptyError(resultCodeEnum, null, message);
-    }
 
 }

lb-common/src/main/java/com/ydd/common/enums/ResponseResultCodeEnum.java

@@ -27,7 +27,7 @@ public enum ResponseResultCodeEnum {
     SHOP_NOT_EXIST(2001, "门店不存在"),
 
     // 字段不能为空状态码
-    FIELD_NOT_EMPTY(3001, "不能为空"),
+    FIELD_NOT_EMPTY(3001, "参数不能为空"),
     ;
 
     private final int code;