diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/neimenggu/NMGController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/neimenggu/NMGController.java index fbafee4d2..a13b21caa 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/neimenggu/NMGController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/neimenggu/NMGController.java @@ -63,7 +63,7 @@ public class NMGController extends ThirdPartyBaseController { QueryOperatorInfoDTO paramDTO = parseDto(dto, QueryOperatorInfoDTO.class); Map map = platformLogic.queryOperatorInfo(paramDTO); logger.info("内蒙古平台查询运营商信息 result:{}", JSON.toJSONString(map)); - return CommonResult.success(0, "请求令牌成功!", map.get("Data"), map.get("Sig")); + return CommonResult.success(0, "操作成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.error("内蒙古平台查询运营商信息 异常", e); return CommonResult.failed("查询运营商信息发生异常"); diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPartyReturnCodeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPartyReturnCodeEnum.java index f4a23b67c..7791d29bf 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPartyReturnCodeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPartyReturnCodeEnum.java @@ -6,33 +6,33 @@ package com.jsowell.common.enums.thirdparty; public enum ThirdPartyReturnCodeEnum { // ↓ ↓ ↓ ↓ ↓ 中电联定义 102协议 begin ↓ ↓ ↓ ↓ ↓ - SYSTEM_BUSY("-1", "系统繁忙"), - SUCCESS("0", "操作成功"), - SIGN_ERROR("4001", "签名错误"), - TOKEN_ERROR("4002", "token错误"), - PARAM_NOT_NULL_ERROR("4003", "POST参数不合法,缺少必须的字段"), - PARAM_INVALID_ERROR("4004", "请求的业务参数不合法,各接口定义自己的正确参数"), - REFUSE("403", "REFUSE"), - SYSTEM_ERROR("500", "系统错误"), + SYSTEM_BUSY(-1, "系统繁忙"), + SUCCESS(0, "操作成功"), + SIGN_ERROR(4001, "签名错误"), + TOKEN_ERROR(4002, "token错误"), + PARAM_NOT_NULL_ERROR(4003, "POST参数不合法,缺少必须的字段"), + PARAM_INVALID_ERROR(4004, "请求的业务参数不合法,各接口定义自己的正确参数"), + REFUSE(403, "REFUSE"), + SYSTEM_ERROR(500, "系统错误"), // ↑ ↑ ↑ ↑ ↑ 中电联定义 102协议 end ↑ ↑ ↑ ↑ ↑ // ↓ ↓ ↓ ↓ ↓ 内蒙古平台定义 begin ↓ ↓ ↓ ↓ ↓ - QUERY_IS_NULL_ERROR("1001", "根据消息体中的组织机构代码,获取不到商户"), - ENCRYPTION_OR_DECRYPTION_ERROR("1002", "加解密异常"), - FIELD_FORMAT_ERROR("1003", "字段格式错误"), + QUERY_IS_NULL_ERROR(1001, "根据消息体中的组织机构代码,获取不到商户"), + ENCRYPTION_OR_DECRYPTION_ERROR(1002, "加解密异常"), + FIELD_FORMAT_ERROR(1003, "字段格式错误"), // ↓ ↓ ↓ ↓ ↓ 内蒙古平台定义 end ↓ ↓ ↓ ↓ ↓ ; - private String ret; + private Integer ret; private String msg; - public String getRet() { + public Integer getRet() { return ret; } - public void setRet(String ret) { + public void setRet(Integer ret) { this.ret = ret; } @@ -44,7 +44,7 @@ public enum ThirdPartyReturnCodeEnum { this.msg = msg; } - ThirdPartyReturnCodeEnum(String ret, String msg) { + ThirdPartyReturnCodeEnum(Integer ret, String msg) { this.ret = ret; this.msg = msg; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/CommonResult.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/CommonResult.java index 71785754e..b99c9aefa 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/CommonResult.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/CommonResult.java @@ -42,29 +42,6 @@ public class CommonResult { this.sig = sig; } - /** - * 成功返回结果 - * - * @param data 获取的数据 - * @param - * @return - */ - public static CommonResult success(T data) { - return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMsg(), data, null); - } - - - /** - * 成功返回结果 - * - * @param data 获取的数据 - * @param message 提示的信息 - * @param - * @return - */ - public static CommonResult success(T data, String message) { - return new CommonResult(ResultCode.SUCCESS.getCode(), message, data, null); - } public static CommonResult success(Integer ret, String msg, T data, String sig) { return new CommonResult(ret, msg, data, sig); @@ -104,15 +81,6 @@ public class CommonResult { return failed(ResultCode.ERROR.getCode(), msg); } - /** - * 失败返回结果 - * - * @param - * @return - */ - public static CommonResult failed() { - return failed(ResultCode.ERROR); - } public String getMsg() { return msg;