From c0e2c9648db918a665cea114aff4ceeb31587c13 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 19 Mar 2024 15:51:29 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E6=9C=AA=E6=94=AF=E4=BB=98=E7=9A=84?= =?UTF-8?q?=E5=8D=A0=E6=A1=A9=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=82=E5=B8=B8=E7=9A=84=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/uniapp/OccupyOrderController.java | 18 +++++++++--------- .../common/enums/ykc/ReturnCodeEnum.java | 3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) 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", "此桩已被绑定，请联系管理员！"),