From 65745e49e9255e1e043c1ee2d6122c789fd69e83 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 16 八月 2024 14:22:06 +0800
Subject: [PATCH] 管理后台优惠券新增封面图 详情图
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
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 f93fba8..075ac4a 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
@@ -10,6 +10,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -26,6 +27,25 @@
@Resource
private TChargingOrderService chargingOrderService;
+ /**
+ * 查询用户最近一次充电记录使用的车辆
+ * @param
+ * @return
+ */
+ @PostMapping(value = "/getCar")
+ public R<Long> getCar() {
+ // todo 获取用户id
+ List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>()
+ .eq(TChargingOrder::getAppUserId, 11)
+ .isNotNull(TChargingOrder::getAppUserCarId));
+ if (!list.isEmpty()){
+ // 最近使用的车辆id
+ Long size = list.get(0).getAppUserCarId();
+ return R.ok(size);
+ }else{
+ return R.ok(-1L);
+ }
+ }
/**
* 查询会员在本月有多少次享受了充电折扣
@@ -42,16 +62,27 @@
}
//用户订单数量
@PostMapping(value = "/useOrderCount")
- public R<Long> useOrderCount(@RequestParam Long userId) {
+ public R<Long> useOrderCount(@RequestParam("userId") Long userId) {
Long count = chargingOrderService.lambdaQuery().eq(TChargingOrder::getAppUserId, userId).count();
return R.ok(count);
}
//订单详情
@PostMapping(value = "/detail")
- public R<TChargingOrder> detail(@RequestParam Long orderId) {
+ public R<TChargingOrder> detail(@RequestParam("orderId") Long orderId) {
return R.ok(chargingOrderService.getById(orderId));
}
-
+
+ /**
+ * 根据充电枪id获取正在进行中的订单
+ * @param chargingGunId 充电枪id
+ * @return
+ */
+ @GetMapping(value = "/getOrderDetailByGunId")
+ public R<TChargingOrder> getOrderDetailByGunId(@RequestParam("chargingGunId") Integer chargingGunId){
+ TChargingOrder one = chargingOrderService.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, chargingGunId)
+ .eq(TChargingOrder::getDelFlag, 0).eq(TChargingOrder::getStatus, 3));
+ return R.ok(one);
+ }
}
--
Gitblit v1.7.1