diff --git a/nxhs-common/src/main/java/cc/yunxi/common/exception/BusinessLogicException.java b/nxhs-common/src/main/java/cc/yunxi/common/exception/BusinessLogicException.java new file mode 100644 index 0000000..5879a7f --- /dev/null +++ b/nxhs-common/src/main/java/cc/yunxi/common/exception/BusinessLogicException.java @@ -0,0 +1,17 @@ +package cc.yunxi.common.exception; + +// 业务异常类 +public class BusinessLogicException extends CommonException{ + + public BusinessLogicException(String message) { + super(message, 410); + } + + public BusinessLogicException(String message, Throwable cause) { + super(message, cause, 410); + } + + public BusinessLogicException(Throwable cause) { + super(cause, 410); + } +} diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java index 5ffc6aa..d65c9df 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java @@ -297,7 +297,7 @@ public class RecycleOrderController { Collectors.toMap(ClientAddressSimpleVO::getId, v -> v, (k1, k2) -> k1)); orderRespVOList.forEach(v -> { String clientAddressId = (String) CommonUtil.obtainField(v, "clientAddressId"); - CommonUtil.assignField(v, "clientAddressId", clientAddressId); + CommonUtil.assignField(v, "addressInfo", clientAddressMap.get(clientAddressId)); }); } } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java index e210939..a6f3a85 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java @@ -2,6 +2,7 @@ package cc.yunxi.service.impl; import cc.yunxi.common.domain.LambdaQueryWrapperX; import cc.yunxi.common.exception.BizIllegalException; +import cc.yunxi.common.exception.BusinessLogicException; import cc.yunxi.common.exception.ForbiddenException; import cc.yunxi.common.utils.BeanUtils; import cc.yunxi.common.utils.CommonUtil; @@ -140,7 +141,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl 0) { // 大于0.1km - throw new BizIllegalException("未到达!"); + throw new BusinessLogicException("未到达!"); } recycleOrder = BeanUtils.copyBean(orderReachVO, RecycleOrder.class); ; @@ -357,10 +358,10 @@ public class RecycleOrderServiceImpl extends ServiceImpl recycleOrderProductVOList = orderFinishVO.getOrderDetails(); @@ -369,7 +370,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl