diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java index b9852b0..0a883f9 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java @@ -162,26 +162,4 @@ public class EbikeRefundServiceImpl extends ServiceImpl jsonResult = operationsFeignClient.openLock(bikeCode); + if (jsonResult.getCode() != Code.SUCCESS) { + throw new EbikeException("开锁失败:" + jsonResult.getMessage()); } // 开锁成功 EbikeOrder orders = EbikeOrder.builder() @@ -194,7 +192,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl jsonResult = operationsFeignClient.bikeInfo(bikeCode); if (jsonResult.getCode() != Code.SUCCESS) { - throw new EbikeException("获取车辆详情"); + throw new EbikeException("获取车辆详情失败"); } FeignEbikeUserBikeInfo source = jsonResult.getData(); return EbikeBikeInfoVo.builder() @@ -240,7 +238,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl jsonResult = operationsFeignClient.lock(ebikeLockVo); if (jsonResult.getCode() != Code.SUCCESS) { - throw new EbikeException("关锁失败"); + throw new EbikeException("关锁失败:" + jsonResult.getMessage()); } FeignEbikeUserLockDto data = jsonResult.getData(); // 订单费用计算 @@ -474,37 +472,4 @@ public class EbikeOrderServiceImpl extends ServiceImpl jsonResult = operationsFeignClient.openLock(bikeCode); - if (jsonResult == null) { - String errorMsg = "开锁服务返回结果为空"; - log.error("开锁失败 - 响应为空, bikeCode={}, userId={}", bikeCode, userId); - return new EbikeUnlockResultDto(false, errorMsg); - } - Integer code = jsonResult.getCode(); - String msg = jsonResult.getMessage() != null ? jsonResult.getMessage() : "未知错误"; - if (code != null && code == 200) { - log.info("开锁成功,用户: {}, 车辆: {}", userId, bikeCode); - return new EbikeUnlockResultDto(true, null); - } else { - log.warn("开锁失败,用户: {}, 车辆: {}, 错误码: {}, 原因: {}", - userId, bikeCode, code, msg); - return new EbikeUnlockResultDto(false, msg); - } - } catch (FeignException e) { - String errorMsg = "开锁服务调用失败"; - log.error("Feign 开锁失败, bikeCode={}, userId={}, status={}, response={}", - bikeCode, userId, e.status(), e.contentUTF8(), e); - return new EbikeUnlockResultDto(false, errorMsg); - } catch (Exception e) { - String errorMsg = "系统繁忙,请稍后重试"; - log.error("开锁过程发生未知异常, bikeCode={}, userId={}", bikeCode, userId, e); - return new EbikeUnlockResultDto(false, errorMsg); - } - } }