From f4c9281d1b7f19fef0d8ee7cb03e166a218b33f2 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 05 九月 2024 17:50:33 +0800
Subject: [PATCH] 完善功能
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 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 8417bef..5958408 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,15 +2,17 @@
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 com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery;
+import com.ruoyi.order.api.vo.GetChargingOrderByLicensePlate;
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 org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* 充电订单服务
@@ -23,6 +25,16 @@
@PostMapping(value = "/t-charging-order/detail")
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);
+
+
+
/**
* 查询会员在本月有多少次享受了充电折扣
@@ -56,4 +68,37 @@
*/
@PostMapping(value = "/t-charging-order/chargeMonitoring")
void chargeMonitoring(@RequestBody UploadRealTimeMonitoringDataQuery query);
+
+ /**
+ * 通过流水号查询订单
+ * @param code
+ * @return
+ */
+ @PostMapping(value = "/t-charging-order/getOrderByCode/{code}")
+ R<TChargingOrder> getOrderByCode(@PathVariable("code") String code);
+
+
+ /**
+ * 充电解释后处理逻辑
+ * @param code
+ */
+ @PostMapping("/t-charging-order/endCharge")
+ void endCharge(@RequestParam("code") String code);
+
+
+ /**
+ * 硬件异常结束充电后的处理逻辑
+ * @param code
+ */
+ @PostMapping("/t-charging-order/excelEndCharge")
+ void excelEndCharge(@RequestParam("code") String code);
+
+
+ /**
+ * 根据车牌号和时间查询有效的充电数据
+ * @param query
+ * @return
+ */
+ @PostMapping("/t-charging-order/getChargingOrderByLicensePlate")
+ R<TChargingOrder> getChargingOrderByLicensePlate(@RequestBody GetChargingOrderByLicensePlate query);
}
--
Gitblit v1.7.1