修改占桩订单逻辑

This commit is contained in:
Lemon
2023-09-20 14:29:29 +08:00
parent 8dbae418ff
commit 5953973437
2 changed files with 16 additions and 16 deletions

View File

@@ -162,25 +162,24 @@ public class GroundLockDataUploadHandler extends AbstractHandler{
*/
private void raiseTheGroundLock(String pileSn, String connectorCode) {
// 两种情况 1是没有停车地锁自动升起2是停车完成地锁升起
boolean stopCarFlag = true;
// boolean stopCarFlag = true;
// 获取现在缓存中的状态
String redisKey = CacheConstants.GROUND_LOCK_DATA + pileSn + connectorCode;
GroundLockData data = redisCache.getCacheObject(redisKey);
if (data != null) {
String parkingStatus = data.getParkingStatus();
if (StringUtils.equals(parkingStatus, "00")) {
// 无车辆
stopCarFlag = false;
}
// 获取现在缓存中占桩订单编号
String redisKey = CacheConstants.GROUND_LOCK_OCCUPY_ORDER + pileSn + connectorCode;
String occupyCode = redisCache.getCacheObject(redisKey);
if (StringUtils.isBlank(occupyCode)) {
log.info("桩号:{} 枪口:{}未查询到占桩订单", pileSn, connectorCode);
return;
}
if (stopCarFlag) {
// 停止占桩订单计时
orderPileOccupyService.stopOccupyPileOrder(pileSn, connectorCode);
} else {
// 关闭占桩订单
// 根据占桩订单号查询订单信息
OrderPileOccupy orderPileOccupy = orderPileOccupyService.queryByOccupyCode(occupyCode);
String orderStatus = orderPileOccupy.getStatus();
if (StringUtils.equals(OccupyOrderStatusEnum.DRAFT_ORDER.getCode(), orderStatus)) {
// 草稿单,关闭占桩订单
orderPileOccupyService.closeOccupyPileOrder(pileSn, connectorCode);
}else {
// 占桩订单,停止占桩订单计时
orderPileOccupyService.stopOccupyPileOrder(pileSn, connectorCode);
}
String occupyOrderKey = CacheConstants.GROUND_LOCK_OCCUPY_ORDER + pileSn + connectorCode;