From 55eb16784ac152ef0d6b070f721d829622c02ae1 Mon Sep 17 00:00:00 2001 From: Guoqs Date: Fri, 19 Apr 2024 16:00:19 +0800 Subject: [PATCH] =?UTF-8?q?update=E5=8F=82=E6=95=B0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdparty/neimenggu/NMGController.java | 3 ++ .../thirdparty/ThirdPartyReturnCodeEnum.java | 30 +++++++++---------- 2 files changed, 18 insertions(+), 15 deletions(-) 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 a13b21caa..07b461c46 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 @@ -2,6 +2,7 @@ package com.jsowell.web.controller.thirdparty.neimenggu; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Anonymous; +import com.jsowell.common.exception.BusinessException; import com.jsowell.pile.dto.QueryOperatorInfoDTO; import com.jsowell.pile.dto.QueryStationInfoDTO; import com.jsowell.pile.thirdparty.CommonParamsDTO; @@ -64,6 +65,8 @@ public class NMGController extends ThirdPartyBaseController { Map map = platformLogic.queryOperatorInfo(paramDTO); logger.info("内蒙古平台查询运营商信息 result:{}", JSON.toJSONString(map)); return CommonResult.success(0, "操作成功！", map.get("Data"), map.get("Sig")); + } catch (BusinessException e) { + return CommonResult.failed(Integer.parseInt(e.getCode()), e.getMessage()); } 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 7791d29bf..5b5c62867 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", "请求的业务参数不合法，各接口定义自己的正确参数"), + SYSTEM_ERROR("500", "系统错误"), // ↑ ↑ ↑ ↑ ↑ 中电联定义 102协议 end ↑ ↑ ↑ ↑ ↑ // ↓ ↓ ↓ ↓ ↓ 内蒙古平台定义 begin ↓ ↓ ↓ ↓ ↓ - QUERY_IS_NULL_ERROR(1001, "根据消息体中的组织机构代码，获取不到商户"), - ENCRYPTION_OR_DECRYPTION_ERROR(1002, "加解密异常"), - FIELD_FORMAT_ERROR(1003, "字段格式错误"), + REFUSE("403", "REFUSE"), + QUERY_IS_NULL_ERROR("1001", "根据消息体中的组织机构代码，获取不到商户"), + ENCRYPTION_OR_DECRYPTION_ERROR("1002", "加解密异常"), + FIELD_FORMAT_ERROR("1003", "字段格式错误"), // ↓ ↓ ↓ ↓ ↓ 内蒙古平台定义 end ↓ ↓ ↓ ↓ ↓ ; - private Integer ret; + private String ret; private String msg; - public Integer getRet() { + public String getRet() { return ret; } - public void setRet(Integer ret) { + public void setRet(String ret) { this.ret = ret; } @@ -44,7 +44,7 @@ public enum ThirdPartyReturnCodeEnum { this.msg = msg; } - ThirdPartyReturnCodeEnum(Integer ret, String msg) { + ThirdPartyReturnCodeEnum(String ret, String msg) { this.ret = ret; this.msg = msg; }