From 3c405fc02791950579360078a0facea172c94770 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 九月 2024 16:25:15 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 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 366a8c3..c92882a 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
@@ -4,12 +4,17 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
+import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
import com.ruoyi.order.api.model.ChargingListQuery;
import com.ruoyi.order.api.model.TChargingOrder;
+import com.ruoyi.order.api.model.TSettlementConfirm;
import com.ruoyi.order.api.query.TChargingCountQuery;
import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery;
import com.ruoyi.order.api.vo.ChargingBillVO;
+import com.ruoyi.order.api.vo.SettlementTotalVO;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import com.ruoyi.order.api.vo.GetChargingOrderByLicensePlate;
import org.springframework.cloud.openfeign.FeignClient;
@@ -96,8 +101,8 @@
*/
@PostMapping("/t-charging-order/excelEndCharge")
void excelEndCharge(@RequestParam("code") String code);
-
-
+
+
/**
* 根据车牌号和时间查询有效的充电数据
* @param query
@@ -105,4 +110,57 @@
*/
@PostMapping("/t-charging-order/getChargingOrderByLicensePlate")
R<TChargingOrder> getChargingOrderByLicensePlate(@RequestBody GetChargingOrderByLicensePlate query);
+
+ /**
+ * 获取充电结算记录
+ * @param uid
+ * @return
+ */
+ @GetMapping(value = "/financial/settlement/downloadSettlement/{uid}")
+ public R<TSettlementConfirm> downloadSettlement(@PathVariable("uid") String uid);
+
+ @GetMapping(value = "/financial/settlement/settlementTotalR")
+ public R<SettlementTotalVO> settlementTotalR(String time);
+
+ /**
+ * 修改充电订单
+ * @param chargingOrder
+ * @return
+ */
+ @PostMapping("/t-charging-order/updateChargingOrder")
+ R<String> updateChargingOrder(@RequestBody TChargingOrder chargingOrder);
+
+ /**
+ * 手动停止充电
+ * @param id
+ * @return
+ */
+ @PutMapping(value = "/t-charging-order/stopCharging/{id}")
+ R<String> stopCharging(@PathVariable("id") String id);
+
+
+ /**
+ * 充电支付成功回调通知
+ * @param out_trade_no
+ * @param transaction_id
+ * @param attach
+ */
+ @PostMapping("/t-charging-order/chargingOrderWXCallback")
+ void chargingOrderWXCallback(@RequestParam("out_trade_no") String out_trade_no,
+ @RequestParam("transaction_id") String transaction_id,
+ @RequestParam("attach") String attach);
+
+
+ /**
+ * 远程启动失败后退款回调
+ * @param out_refund_no
+ * @param refund_id
+ * @param tradeState
+ * @param success_time
+ */
+ @PostMapping("/t-charging-order/chargingOrderStartupFailureWxRefund")
+ void chargingOrderStartupFailureWxRefund(@RequestParam("out_trade_no") String out_refund_no,
+ @RequestParam("out_trade_no") String refund_id,
+ @RequestParam("out_trade_no") String tradeState,
+ @RequestParam("out_trade_no") String success_time);
}
--
Gitblit v1.7.1