From 8579a8819537a3f8c58742b5f5173c458722dd71 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 09 十月 2024 17:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 efc5d7d..ae33132 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
@@ -160,10 +160,10 @@
* @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);
+ void chargingOrderStartupFailureWxRefund(@RequestParam("out_refund_no") String out_refund_no,
+ @RequestParam("refund_id") String refund_id,
+ @RequestParam("tradeState") String tradeState,
+ @RequestParam("success_time") String success_time);
/**
* 管理后台取消购物订单后退款回调
* @param out_refund_no
@@ -177,19 +177,26 @@
@RequestParam("out_trade_no") String tradeState,
@RequestParam("out_trade_no") String success_time);
- //todo 待监听完成后调用此方法
/**
* 修改安全检测数据
* @param securityDetection
*/
- @PostMapping("/t-shopping-order/securityDetection")
- void securityDetection(@RequestBody SecurityDetection securityDetection);
+ @PostMapping("/t-charging-order/securityDetection")
+ void securityDetection(@RequestBody SecurityDetectionVO securityDetection);
/**
* 远程启动充电应答
* @param message
*/
- @PostMapping("/t-shopping-order/startChargeSuccessfully")
- void startChargeSuccessfully(PlatformStartChargingReplyMessage message);
+ @PostMapping("/t-charging-order/startChargeSuccessfully")
+ void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message);
+
+
+ /**
+ * 停止充电应答处理
+ * @param platformStopChargingReply
+ */
+ @PostMapping("/t-charging-order/terminateSuccessfulResponse")
+ void terminateSuccessfulResponse(@RequestBody PlatformStopChargingReplyVO platformStopChargingReply);
}
--
Gitblit v1.7.1