aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-21 17:49:21 +08:00
parent 89ac1679ec
commit 10114f84ef
8 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -266,7 +266,7 @@ public class EmisCommonController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
@ -287,7 +287,7 @@ public class EmisCommonController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
@ -308,7 +308,7 @@ public class EmisCommonController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
@ -367,7 +367,7 @@ public class EmisCommonController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
@ -408,7 +408,7 @@ public class EmisCommonController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
}

6
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java
View File

@ -119,7 +119,7 @@ public class EmisElectronicPagApplyController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
@ -154,7 +154,7 @@ public class EmisElectronicPagApplyController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
@ -182,7 +182,7 @@ public class EmisElectronicPagApplyController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");

4
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuotePriceController.java
View File

@ -136,7 +136,7 @@ public class EmisQuotePriceController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
}
@ -158,7 +158,7 @@ public class EmisQuotePriceController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
}

4
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSitePrepaidRechargeController.java
View File

@ -158,7 +158,7 @@ public class EmisSitePrepaidRechargeController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("审核异常，联系客服");
@ -188,7 +188,7 @@ public class EmisSitePrepaidRechargeController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("审核异常，联系客服");

4
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSpecialCalcWeightController.java
View File

@ -99,7 +99,7 @@ public class EmisSpecialCalcWeightController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
@ -120,7 +120,7 @@ public class EmisSpecialCalcWeightController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
View File

@ -137,7 +137,7 @@ public class EmisTmsScanRecordController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("扫描异常，联系客服");

14
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -134,7 +134,7 @@ public class EmisWaybillController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
@ -215,7 +215,7 @@ public class EmisWaybillController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
@ -240,7 +240,7 @@ public class EmisWaybillController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
@ -272,7 +272,7 @@ public class EmisWaybillController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
@ -297,7 +297,7 @@ public class EmisWaybillController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
@ -322,7 +322,7 @@ public class EmisWaybillController extends EmisBaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
@ -837,6 +837,8 @@ public class EmisWaybillController extends EmisBaseController
if(!StringUtils.isEmpty(billCode)){
try {
emisBaseService.updatePrintStatus(billCode);
return AjaxResult.success("处理成功");

27
emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/EmisBizErrorType.java
View File

@ -5,28 +5,25 @@ import lombok.Getter;
@Getter
public enum EmisBizErrorType {
PARAM_ERROR1("E001", "参数不完整"),
CALC_FEE_ERROR("E002", "运费计算错误"),
CALC_WEIGHT_ERROR("E003", "重量计算错误"),
CALC_QUOTE_ERROR("E004", "报价未配置"),
SUCCESS("0000", "成功"),
FAIL("9999", "失败"),
BILL_LOCK("E901", "已锁定"),
NOT_EXISTS("E902","不存在"),
EXISTS("E903","已存在"),
PARAM_ERROR1("1001", "参数不完整"),
CALC_FEE_ERROR("1002", "运费计算错误"),
CALC_WEIGHT_ERROR("1003", "重量计算错误"),
CALC_QUOTE_ERROR("1004", "报价未配置"),
PARSE_ADDRESS_ERROR("E980","地址解析错误"),
BILL_LOCK("1901", "已锁定"),
NOT_EXISTS("1902","不存在"),
EXISTS("1903","已存在"),
PARSE_ADDRESS_ERROR("1980","地址解析错误"),
// 面单 Not enough
NOT_ENOUGH_PAG("E501","面单不足"),
NOT_ENOUGH_PAG("1501","面单不足"),
SUCCESS("0000", "成功"),
SYS_EXCEPTION("9998", "系统异常"),
FAIL("9999", "失败"),
;
private String errorCode;