diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java index 6b7385852..cbf9a9b08 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java @@ -113,20 +113,20 @@ public class OccupyOrderController extends BaseController { */ @GetMapping("/getUnPayOccupyOrder") public RestApiResponse getUnPayOccupyOrder(HttpServletRequest request) { - RestApiResponse response = null; + RestApiResponse response; + String memberId = null; try { - String memberId = getMemberIdByAuthorization(request); - logger.info("查询用户: {} 是否有未支付的占桩订单", memberId); - // OrderPileOccupy orderPileOccupy = orderPileOccupyService.queryUnPayOrderByMemberId(memberId); - // if (Objects.nonNull(orderPileOccupy)) { - // response = new RestApiResponse<>(ImmutableMap.of("occupyCode", orderPileOccupy.getOccupyCode())); - // } + memberId = getMemberIdByAuthorization(request); Map map = orderPileOccupyService.queryUnPayOrder(memberId); response = new RestApiResponse<>(map); + } catch (BusinessException e) { + logger.error("查询用户是否有未支付的占桩订单 error", e); + response = new RestApiResponse<>(e.getCode(), e.getMessage()); } catch (Exception e) { - logger.error("查询用户是否有未支付的占桩订单 error,", e); + logger.error("查询用户是否有未支付的占桩订单 error", e); + response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_UNPAY_OCCUPY_ORDER_ERROR); } - logger.info("查询用户是否有未支付的占桩订单 result:{}", response); + logger.info("查询用户是否有未支付的占桩订单, memberId:{}, result:{}", memberId, response); return response; } diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java index 23e2b77ea..ffce3f1b3 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java @@ -131,6 +131,9 @@ public enum ReturnCodeEnum { CODE_PILE_CONNECTOR_STATUS_OFF_LINE("00100062", "充电桩枪口离线,请检查充电桩联网状态或者联系管理员。"), + CODE_GET_UNPAY_OCCUPY_ORDER_ERROR("00100063", "查询用户是否有未支付的占桩订单失败"), + + /* 个人桩 start */ CODE_PILE_HAS_BEEN_BINDING_ERROR("00400001", "此桩已被绑定,请联系管理员!"),