From 2e43d137c7832e149f3df4145aa7fcca2153ef9c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 31 八月 2024 16:52:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
index 3765568..8576cd9 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
@@ -2,13 +2,18 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.ChargingOrderGroup;
+import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.query.TChargingCountQuery;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
/**
* 充电订单服务
@@ -17,10 +22,20 @@
@FeignClient(contextId = "ChargingOrderClient", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = ChargingOrderFallbackFactory.class)
public interface ChargingOrderClient {
@PostMapping(value = "/t-charging-order/useOrderCount")
- R<Long> useOrderCount(@RequestParam Long userId);
+ R<Long> useOrderCount(@RequestParam("userId") Long userId);
@PostMapping(value = "/t-charging-order/detail")
- R<TChargingOrder> orderDetail(@RequestParam Long orderId);
+ R<TChargingOrder> orderDetail(@RequestParam("orderId") Long orderId);
+
+
+ @PostMapping(value = "/t-charging-order/getList")
+ R<List<TChargingOrder>> getList(@RequestParam("siteId") Integer siteId);
+
+ @PostMapping(value = "/t-charging-order/getBySiteIdAndTime")
+ R<List<ChargingOrderGroup>> getBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto);
+
+
+
/**
* 查询会员在本月有多少次享受了充电折扣
@@ -29,4 +44,20 @@
*/
@PostMapping(value = "/t-charging-order/getChargingCount")
public R<Integer> getChargingCount(@RequestBody TChargingCountQuery req);
+
+
+ /**
+ * 根据充电枪获取正在充电的订单
+ * @param chargingGunId 充电枪id
+ * @return
+ */
+ @PostMapping(value = "/t-charging-order/getOrderDetailByGunId")
+ R<TChargingOrder> getOrderDetailByGunId(@RequestParam("chargingGunId") Integer chargingGunId);
+
+ /**
+ * 获取用户最近使用车辆充电的车辆id
+ * @return
+ */
+ @GetMapping(value = "/t-charging-order/getCar")
+ public R<Long> getCar();
}
--
Gitblit v1.7.1