diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java index e69cc2c18..828683000 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java @@ -369,8 +369,12 @@ public class PersonPileController extends BaseController { try { String memberId = getMemberIdByAuthorization(request); dto.setMemberId(memberId); - pileReservationInfoService.updateReservation(dto); - response = new RestApiResponse<>(); + int i = pileReservationInfoService.updateReservation(dto); + if (i > 0) { + response = new RestApiResponse<>(); + } else { + response = new RestApiResponse<>(ReturnCodeEnum.CODE_UPDATE_RESERVED_STATUS_ERROR.getValue(), ReturnCodeEnum.CODE_UPDATE_RESERVED_STATUS_ERROR.getLabel() + ": 充电桩返回修改失败"); + } } catch (BusinessException e) { logger.error("修改预约充电信息error, params:{}", dto, e); response = new RestApiResponse<>(e.getCode(), e.getMessage()); 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 f877b4d3a..18b7650e6 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 @@ -171,7 +171,7 @@ public enum ReturnCodeEnum { CODE_CREATE_RESERVED_ERROR("00400013", "创建预约失败"), - CODE_UPDATE_RESERVED_STATUS_ERROR("00400014", "修改预约充电状态失败"), + CODE_UPDATE_RESERVED_STATUS_ERROR("00400014", "修改预约充电信息失败"), CODE_QUERY_RESERVED_LIST_ERROR("00400015", "查询预约充电列表失败"), diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservationInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservationInfoService.java index 6f04543cd..c40b6d290 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservationInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservationInfoService.java @@ -66,7 +66,7 @@ public interface PileReservationInfoService { void updateReservationStatus(PileReservationDTO dto); - void updateReservation(PileReservationDTO dto); + int updateReservation(PileReservationDTO dto); void personPileStopCharging(PersonPileStopChargingDTO dto); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java index 292b1910d..81f23b682 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java @@ -407,10 +407,10 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic * @param dto */ @Override - public void updateReservation(PileReservationDTO dto) { + public int updateReservation(PileReservationDTO dto) { PileReservationInfo pileReservationInfo = pileReservationInfoMapper.selectByPrimaryKey(Integer.valueOf(dto.getReservedId())); if (pileReservationInfo == null) { - return; + return 0; } // 操作 0x01:启动 0x02:取消 0x03:修改 @@ -473,8 +473,9 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic .build(); String result = pileRemoteService.reservationCharging(command); if (StringUtils.equals(result, Constants.ONE)) { - this.insertOrUpdateSelective(pileReservationInfo); + return this.insertOrUpdateSelective(pileReservationInfo); } + return 0; } /**