From 3e9bc147f05ab3ce8db0afcf6272b95b543eb89a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 16 八月 2024 13:40:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 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 50e1818..d05882b 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
@@ -1,9 +1,15 @@
package com.ruoyi.order.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.api.model.TChargingOrder;
+import com.ruoyi.order.api.query.TChargingCountQuery;
+import com.ruoyi.order.service.TChargingOrderService;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -18,5 +24,45 @@
@RequestMapping("/t-charging-order")
public class TChargingOrderController {
+ @Resource
+ private TChargingOrderService chargingOrderService;
+
+ /**
+ * 查询会员在本月有多少次享受了充电折扣
+ * @param req
+ * @return
+ */
+ @PostMapping(value = "/getChargingCount")
+ public R<Integer> getChargingCount(@RequestBody TChargingCountQuery req) {
+ int size = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>()
+ .eq(TChargingOrder::getAppUserId, req.getUserId())
+ .eq(TChargingOrder::getRechargePaymentStatus,2)
+ .between(TChargingOrder::getStartTime, req.getStartTime(), req.getEndTime())).size();
+ return R.ok(size);
+ }
+ //用户订单数量
+ @PostMapping(value = "/useOrderCount")
+ 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("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