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

1
jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/PileBasicInfoController.java
View File

@@ -7,4 +7,5 @@ package com.jsowell.api.uniapp.business;
* @Date 2024/7/12 11:13:59
*/
public class PileBasicInfoController {
}

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 "已存在有未支付的占桩订单";

5
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java
View File

@@ -4,6 +4,7 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.jsowell.pile.dto.MakeOrderFreeDTO;
import com.jsowell.pile.dto.OrderPileOccupyDTO;
import com.jsowell.pile.service.OrderPileOccupyService;
import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO;
import com.jsowell.pile.vo.web.OccupyOrderVO;
@@ -41,10 +42,10 @@ public class OrderPileOccupyController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('pile:occupy:list')")
@GetMapping("/list")
public TableDataInfo list(OrderPileOccupy orderPileOccupy) {
public TableDataInfo list(OrderPileOccupyDTO dto) {
startPage();
// List<OrderPileOccupy> list = orderPileOccupyService.selectOrderPileOccupyList(orderPileOccupy);
List<OccupyOrderVO> list = orderPileOccupyService.getOrderPileOccupyList(orderPileOccupy);
List<OccupyOrderVO> list = orderPileOccupyService.getOrderPileOccupyListWithAuth(dto);
return getDataTable(list);
}