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

修改占桩订单逻辑

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

31
jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java
View File

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

1
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
View File

@@ -495,6 +495,7 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
@Override @Override
public void closeOccupyPileOrder(String pileSn, String connectorCode) { public void closeOccupyPileOrder(String pileSn, String connectorCode) {
log.info("关闭占桩订单 pileSn:{}, connectorCode:{}", pileSn, connectorCode);
// 查询草稿状态的占桩订单 // 查询草稿状态的占桩订单
OrderPileOccupy draftOccupyOrder = getDraftOccupyOrder(pileSn, connectorCode); OrderPileOccupy draftOccupyOrder = getDraftOccupyOrder(pileSn, connectorCode);
// 关闭草稿订单 // 关闭草稿订单