From 67aa40955df674f33fbf5972c738ee1bfd50d2b0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 31 八月 2024 17:01:03 +0800
Subject: [PATCH] 8.31
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java | 3 +++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 4 ++--
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java | 15 ++++++++++++++-
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
index 9148387..889907b 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
@@ -41,6 +41,9 @@
private String licensePlate;
@TableField(exist = false)
private String name;
+ @TableField(exist = false)
+
+ private String uid;
@ApiModelProperty(value = "订单编号")
@TableField("code")
private String code;
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
index 78b4ddd..433728e 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
@@ -31,7 +31,7 @@
private TParkingLotService parkingLotService;
@ApiOperation(tags = {"后台-订单管理-停车记录"},value = "列表")
- @GetMapping(value = "/page")
+ @PostMapping(value = "/page")
public R<Page<TParkingRecord>> page(@RequestBody ParkingRecordPageQuery query) {
Page<TParkingRecord> page = parkingRecordService.lambdaQuery().ge(query.getStart() != null, TParkingRecord::getCreateTime, query.getStart())
.le(query.getEnd() != null, TParkingRecord::getCreateTime, query.getEnd())
@@ -42,9 +42,22 @@
for (TParkingRecord record : page.getRecords()) {
record.setName(parkingLotService.getById(record.getParkingLotId()).getName());
+ record.setUid(record.getId().toString());
}
return R.ok(page);
}
+ @ApiOperation(tags = {"后台-订单管理-停车记录"},value = "出场")
+ @GetMapping(value = "/out")
+ public R out(Long id) {
+ TParkingRecord byId = parkingRecordService.getById(id);
+ byId.setStatus(2);
+ parkingRecordService.updateById(byId);
+ return R.ok();
+
+ }
+
+
+
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 85ba284..d7df288 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -102,6 +102,8 @@
private AliPaymentClient aliPaymentClient;
@Resource
private TShoppingOrderService shoppingOrderService;
+ @Resource
+ private AppUserClient appUserClient;
@Resource
@@ -128,8 +130,6 @@
- @Resource
- private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
@ResponseBody
@PostMapping(value = "/pay/order/list")
--
Gitblit v1.7.1