autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-03 01:20:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 占桩订单逻辑

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-18 16:03:19 +08:00
parent 29a60ec560
commit d82ece35ca
3 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,7 +187,7 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
@Override
public void stopOccupyPileOrder(String pileSn, String connectorCode) {
// 根据充电站sn和枪口号，查询占桩中的占桩订单
OrderPileOccupy orderPileOccupy = orderPileOccupyMapper.queryOccupiedOrder(pileSn, connectorCode);
OrderPileOccupy orderPileOccupy = getOccupiedOrder(pileSn, connectorCode);
if (orderPileOccupy == null) {
return;
}
@@ -321,13 +321,31 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
*/
@Override
public OrderPileOccupy getDraftOccupyOrder(String pileSn, String connectorCode) {
List<OrderPileOccupy> list = orderPileOccupyMapper.getDraftOccupyOrder(pileSn, connectorCode);
List<OrderPileOccupy> list = orderPileOccupyMapper.queryDraftOccupyOrder(pileSn, connectorCode);
if (CollectionUtils.isEmpty(list)) {
return null;
}
if (list.size() > 1) {
List<Integer> collect = list.stream().map(OrderPileOccupy::getId).collect(Collectors.toList());
log.info("根据pileSn:{}, connectorCode:{}, 查询出多条占桩订单, ids:{}", pileSn, connectorCode, collect);
log.info("根据pileSn:{}, connectorCode:{}, 查询出多条草稿状态的占桩订单, ids:{}", pileSn, connectorCode, collect);
}
return list.get(0);
}
/**
* 查询占桩中的订单
* @param pileSn
* @param connectorCode
* @return
*/
public OrderPileOccupy getOccupiedOrder(String pileSn, String connectorCode) {
List<OrderPileOccupy> list = orderPileOccupyMapper.queryOccupiedOrder(pileSn, connectorCode);
if (CollectionUtils.isEmpty(list)) {
return null;
}
if (list.size() > 1) {
List<Integer> collect = list.stream().map(OrderPileOccupy::getId).collect(Collectors.toList());
log.info("根据pileSn:{}, connectorCode:{}, 查询出多条占桩中的占桩订单, ids:{}", pileSn, connectorCode, collect);
}
return list.get(0);
}