autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-22 16:19:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化 羽信预约充电

Browse Source
This commit is contained in:
Guoqs
2026-06-18 13:21:09 +08:00
parent da1da312c7
commit a8a5f45815
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java
View File

@@ -283,13 +283,18 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic
if (!StringUtils.equals(pileReservationInfo.getMemberId(), dto.getMemberId())) { if (!StringUtils.equals(pileReservationInfo.getMemberId(), dto.getMemberId())) {
return; return;
} }
if (StringUtils.equals(pileReservationInfo.getStatus(), Constants.ONE)) {
sendReservationCommandAndAssertSuccess(pileReservationInfo, dto.getMemberId(), "02");
}
pileReservationInfo.setDelFlag(DelFlagEnum.DELETE.getValue()); pileReservationInfo.setDelFlag(DelFlagEnum.DELETE.getValue());
pileReservationInfo.setStatus(Constants.ZERO);
pileReservationInfoMapper.updateByPrimaryKey(pileReservationInfo); pileReservationInfoMapper.updateByPrimaryKey(pileReservationInfo);
} }
@Override @Override
public int createReservation(CreateReservedDTO dto) { public int createReservation(CreateReservedDTO dto) {
PileReservationInfo reservedInfo = selectByPileConnectorCode(dto.getPileConnectorCode()); PileReservationInfo reservedInfo = selectByPileConnectorCode(dto.getPileConnectorCode());
boolean activeBeforeUpdate = reservedInfo != null && StringUtils.equals(reservedInfo.getStatus(), Constants.ONE);
if (reservedInfo == null) { if (reservedInfo == null) {
reservedInfo = new PileReservationInfo(); reservedInfo = new PileReservationInfo();
reservedInfo.setCreateBy(dto.getMemberId()); reservedInfo.setCreateBy(dto.getMemberId());
@@ -320,6 +325,11 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic
reservedInfo.setReservationType("recurring"); reservedInfo.setReservationType("recurring");
reservedInfo.setFreq("daily"); reservedInfo.setFreq("daily");
if (!isTimeSlotAvailable(reservedInfo.getMemberId(), reservedInfo.getPileSn(),
reservedInfo.getStartTime(), reservedInfo.getEndTime(), reservedInfo.getId())) {
throw new BusinessException(ReturnCodeEnum.CODE_UPDATE_RESERVED_STATUS_REFUSED);
}
sendReservationCommandAndAssertSuccess(reservedInfo, dto.getMemberId(), activeBeforeUpdate ? "03" : "01");
this.insertOrUpdateSelective(reservedInfo); this.insertOrUpdateSelective(reservedInfo);
return reservedInfo.getId(); return reservedInfo.getId();
} }