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

update 修改逻辑卡号功能、占桩订单区分运营商和站点

Browse Source
This commit is contained in:
Lemon
2024-07-15 14:14:01 +08:00
parent 217284e272
commit 513ea9da4f
9 changed files with 183 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-admin/src/main/java/com/jsowell/service/CameraService.java
View File

@@ -165,7 +165,7 @@ public class CameraService {
.status(OccupyOrderStatusEnum.ORDER_HANG_UP.getCode()) // 2-订单挂起
.plateNumber(plateNumber)
.build();
List<OccupyOrderVO> occupyList = orderPileOccupyService.getOrderPileOccupyList(occupy);
List<OrderPileOccupy> occupyList = orderPileOccupyService.selectOrderPileOccupyList(occupy);
// todo 如果有占桩订单，则先提醒“需支付占桩订单”
if (CollectionUtils.isNotEmpty(occupyList)) {
return "需支付占桩订单";
@@ -192,7 +192,7 @@ public class CameraService {
OrderPileOccupy orderPileOccupy = OrderPileOccupy.builder()
.plateNumber(plateNumber)
.build();
List<OccupyOrderVO> orderPileOccupyList = orderPileOccupyService.getOrderPileOccupyList(orderPileOccupy);
List<OrderPileOccupy> orderPileOccupyList = orderPileOccupyService.selectOrderPileOccupyList(orderPileOccupy);
// TODO 如果有已挂起的占桩订单，则不予降锁，将“已存在有未支付的占桩订单”信息返回
if (CollectionUtils.isNotEmpty(orderPileOccupyList)) {
return "已存在有未支付的占桩订单";